Slackware 13.37slackware-13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!

164 files changed, 79568 insertions, 75550 deletions

diff --git a/source/n/biff+comsat/biff+comsat.SlackBuild b/source/n/biff+comsat/biff+comsat.SlackBuild
index b50da5aa6..f177bfc17 100755
--- a/source/n/biff+comsat/biff+comsat.SlackBuild
+++ b/source/n/biff+comsat/biff+comsat.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-biff+comsat
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild
index 73b7d2ff2..dc7014a35 100755
--- a/source/n/bind/bind.SlackBuild
+++ b/source/n/bind/bind.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,8 @@
 
 
 PKGNAM=bind
-VERSION=${VERSION:-9.4.3-P4}
-NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-9.7.3}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -36,11 +35,13 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 CWD=$(pwd)
 TMP=/bind-$(mcookie)
 PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
-mkdir -p $TMP $PKG
+mkdir -p $TMP $PKG/etc/default
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -58,19 +59,11 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.gz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
-# Remove use of SO_BSDCOMPAT which has been obsolete since the 2.2.x kernel series,
-# and generates warnings under 2.6.x kernels:
+# Remove use of SO_BSDCOMPAT which has been obsolete since the 2.2.x kernel
+# series, and generates warnings under 2.6.x kernels.  This _might_ be fixed
+# upstream already, but an explicit #undef SO_BSDCOMPAT does not hurt:
 zcat $CWD/bind.so_bsdcompat.diff.gz | patch -p1 --verbose || exit
 
-# We want to use /var/run/named/, not just /var/run/.
-# This allows changing the ownership of that directory if we want to run
-# named as a non-root user.
-zcat $CWD/bind.var.run.named.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-# Threads break '-u' on Linux (for now)
-
-# The man pages should reflect /var/run/named:
-zcat $CWD/bind.man.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -87,6 +80,7 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --with-libtool \
+  --with-idn=/usr \
   --mandir=/usr/man \
   --enable-shared \
   --disable-static \
diff --git a/source/n/bind/bind.man.diff b/source/n/bind/bind.man.diff
deleted file mode 100644
index 6bcf19219..000000000
--- a/source/n/bind/bind.man.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./bin/named/named.8.orig	2007-01-29 18:23:44.000000000 -0600
-+++ ./bin/named/named.8	2007-06-07 23:17:33.000000000 -0500
-@@ -202,7 +202,7 @@
- The default configuration file.
- .RE
- .PP
--\fI/var/run/named.pid\fR
-+\fI/var/run/named/named.pid\fR
- .RS 4
- The default process\-id file.
- .RE
---- ./bin/named/lwresd.8.orig	2007-01-29 18:23:44.000000000 -0600
-+++ ./bin/named/lwresd.8	2007-06-07 23:17:18.000000000 -0500
-@@ -155,7 +155,7 @@
- The default configuration file.
- .RE
- .PP
--\fI/var/run/lwresd.pid\fR
-+\fI/var/run/named/lwresd.pid\fR
- .RS 4
- The default process\-id file.
- .RE
diff --git a/source/n/bind/bind.var.run.named.diff b/source/n/bind/bind.var.run.named.diff
deleted file mode 100644
index 53cc8bd62..000000000
--- a/source/n/bind/bind.var.run.named.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./bin/named/include/named/globals.h.orig	Sat Nov 24 17:47:59 2001
-+++ ./bin/named/include/named/globals.h	Tue Feb 26 18:51:18 2002
-@@ -102,9 +102,9 @@
- EXTERN isc_boolean_t		ns_g_logstderr		INIT(ISC_FALSE);
- 
- EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
--							     "/run/named.pid");
-+							     "/run/named/named.pid");
- EXTERN const char *		lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR
--							    "/run/lwresd.pid");
-+							    "/run/named/lwresd.pid");
- EXTERN const char *		ns_g_username		INIT(NULL);
- 
- #undef EXTERN
diff --git a/source/n/bind/caching-example/named.local b/source/n/bind/caching-example/named.local
index 8bfc435fb..8f40bcf36 100644
--- a/source/n/bind/caching-example/named.local
+++ b/source/n/bind/caching-example/named.local
@@ -1,6 +1,6 @@
 $TTL	86400
 @       IN      SOA     localhost. root.localhost.  (
-                                      1997022700 ; Serial
+                                      2011032500 ; Serial
                                       28800      ; Refresh
                                       14400      ; Retry
                                       3600000    ; Expire
diff --git a/source/n/bind/caching-example/named.root b/source/n/bind/caching-example/named.root
index 902a7047f..d081faaf5 100644
--- a/source/n/bind/caching-example/named.root
+++ b/source/n/bind/caching-example/named.root
@@ -5,12 +5,12 @@
 ;
 ;       This file is made available by InterNIC 
 ;       under anonymous FTP as
-;           file                /domain/named.root
+;           file                /domain/named.cache
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
 ;
-;       last update:    Feb 04, 2008
-;       related version of root zone:   2008020400
+;       last update:    Jun 17, 2010
+;       related version of root zone:   2010061700
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -18,68 +18,70 @@
 A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
 A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:BA3E::2:30
 ;
-; formerly NS1.ISI.EDU
+; FORMERLY NS1.ISI.EDU
 ;
 .                        3600000      NS    B.ROOT-SERVERS.NET.
 B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
 ;
-; formerly C.PSI.NET
+; FORMERLY C.PSI.NET
 ;
 .                        3600000      NS    C.ROOT-SERVERS.NET.
 C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
 ;
-; formerly TERP.UMD.EDU
+; FORMERLY TERP.UMD.EDU
 ;
 .                        3600000      NS    D.ROOT-SERVERS.NET.
 D.ROOT-SERVERS.NET.      3600000      A     128.8.10.90
 ;
-; formerly NS.NASA.GOV
+; FORMERLY NS.NASA.GOV
 ;
 .                        3600000      NS    E.ROOT-SERVERS.NET.
 E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
 ;
-; formerly NS.ISC.ORG
+; FORMERLY NS.ISC.ORG
 ;
 .                        3600000      NS    F.ROOT-SERVERS.NET.
 F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
-F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2f::f
+F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2F::F
 ;
-; formerly NS.NIC.DDN.MIL
+; FORMERLY NS.NIC.DDN.MIL
 ;
 .                        3600000      NS    G.ROOT-SERVERS.NET.
 G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
 ;
-; formerly AOS.ARL.ARMY.MIL
+; FORMERLY AOS.ARL.ARMY.MIL
 ;
 .                        3600000      NS    H.ROOT-SERVERS.NET.
 H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
-H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803f:235
+H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803F:235
 ;
-; formerly NIC.NORDU.NET
+; FORMERLY NIC.NORDU.NET
 ;
 .                        3600000      NS    I.ROOT-SERVERS.NET.
 I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
+I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FE::53
 ;
-; operated by VeriSign, Inc.
+; OPERATED BY VERISIGN, INC.
 ;
 .                        3600000      NS    J.ROOT-SERVERS.NET.
 J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
 J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:C27::2:30
 ;
-; operated by RIPE NCC
+; OPERATED BY RIPE NCC
 ;
 .                        3600000      NS    K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129 
-K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fd::1
+K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
+K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FD::1
 ;
-; operated by ICANN
+; OPERATED BY ICANN
 ;
 .                        3600000      NS    L.ROOT-SERVERS.NET.
 L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
+L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
 ;
-; operated by WIDE
+; OPERATED BY WIDE
 ;
 .                        3600000      NS    M.ROOT-SERVERS.NET.
 M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
-M.ROOT-SERVERS.NET.      3600000      AAAA  2001:dc3::35
+M.ROOT-SERVERS.NET.      3600000      AAAA  2001:DC3::35
 ; End of File
diff --git a/source/n/bind/rc.bind b/source/n/bind/rc.bind
index 966670e3b..6d77d73d9 100644
--- a/source/n/bind/rc.bind
+++ b/source/n/bind/rc.bind
@@ -1,35 +1,35 @@
 #!/bin/sh
 # Start/stop/restart the BIND name server daemon (named).
 
-# Start bind.  In the past it was more secure to run BIND
-# as a non-root user (for example, with '-u daemon'), but
-# the modern version of BIND knows how to use the kernel's
-# capability mechanism to drop all root privileges except
-# the ability to bind() to a privileged port and set process
-# resource limits, so -u should not be needed.  If you wish
-# to use it anyway, chown the /var/run/named directory to
-# the non-root user.
-#
+
+# Start bind. In the past it was more secure to run BIND as a non-root
+# user (for example, with '-u daemon'), but the modern version of BIND
+# knows how to use the kernel's capability mechanism to drop all root
+# privileges except the ability to bind() to a privileged port and set
+# process resource limits, so -u should not be needed.  If you wish to
+# use it anyway, chown the /var/run/named and /var/named directories to
+# the non-root user. The command options can be set like this in
+# /etc/default/named :
+#       NAMED_OPTIONS="-u daemon"
+# So you will not have to edit this script.
 
 # You might also consider running BIND in a "chroot jail",
 # a discussion of which may be found in
 # /usr/doc/Linux-HOWTOs/Chroot-BIND-HOWTO.
  
-# One last note:  rndc has a lot of other nice features that
-# it is not within the scope of this start/stop/restart script
-# to support.  For more details, see "man rndc" or just type
-# "rndc" to see the options.
+# One last note:  rndc has a lot of other nice features that it is not
+# within the scope of this start/stop/restart script to support.
+# For more details, see "man rndc" or just type "rndc" to see the options.
 
+# Load command defaults:
+if [ -f /etc/default/named ] ; then . /etc/default/named ; fi
+if [ -f /etc/default/rndc ] ; then . /etc/default/rndc ; fi
 
-# Sanity check.  If either /usr/sbin/named or /etc/named.conf
-# aren't ready, it doesn't make much sense to try to run this
-# script:
+# Sanity check.  If /usr/sbin/named is missing then it
+# doesn't make much sense to try to run this script:
 if [ ! -x /usr/sbin/named ]; then
   echo "/etc/rc.d/rc.bind:  no /usr/sbin/named found (or not executable); cannot start."
   exit 1
-elif [ ! -f /etc/named.conf ]; then
-  echo "/etc/rc.d/rc.bind:  no /etc/named.conf found; cannot start /usr/sbin/named."
-  exit 1
 fi
 
 # Start BIND.  As many times as you like.  ;-)
@@ -37,14 +37,14 @@ fi
 # running or you'll get more than one copy running.
 bind_start() {
   if [ -x /usr/sbin/named ]; then
-    echo "Starting BIND:  /usr/sbin/named"
-    /usr/sbin/named
+    echo "Starting BIND:  /usr/sbin/named $NAMED_OPTIONS"
+    /usr/sbin/named $NAMED_OPTIONS
     sleep 1
   fi
   if ! ps axc | grep -q named ; then
     echo "WARNING:  named did not start."
-    echo "Attempting to start named again:  /usr/sbin/named"
-    /usr/sbin/named
+    echo "Attempting to start named again:  /usr/sbin/named $NAMED_OPTIONS"
+    /usr/sbin/named $NAMED_OPTIONS
     sleep 1
     if ps axc | grep -q named ; then
       echo "SUCCESS:  named started."
@@ -57,8 +57,8 @@ bind_start() {
 
 # Stop all running copies of BIND (/usr/sbin/named):
 bind_stop() {
-  echo "Stopping BIND:  /usr/sbin/rndc stop"
-  /usr/sbin/rndc stop
+  echo "Stopping BIND:  /usr/sbin/rndc $RDNC_OPTIONS stop"
+  /usr/sbin/rndc $RDNC_OPTIONS stop
   # A problem with using "/usr/sbin/rndc stop" is that if you
   # managed to get multiple copies of named running it will
   # only stop one of them and then can't stop the others even
@@ -76,7 +76,7 @@ bind_stop() {
 
 # Reload BIND:
 bind_reload() {
-  /usr/sbin/rndc reload
+  /usr/sbin/rndc $RDNC_OPTIONS reload
 }
 
 # Restart BIND:
@@ -87,7 +87,7 @@ bind_restart() {
 
 # Get BIND status:
 bind_status() {
-  /usr/sbin/rndc status
+  /usr/sbin/rndc $RDNC_OPTIONS status
 }
 
 case "$1" in
diff --git a/source/n/bluez-firmware/bluez-firmware.SlackBuild b/source/n/bluez-firmware/bluez-firmware.SlackBuild
index 2fba9d2cb..26a9051b5 100755
--- a/source/n/bluez-firmware/bluez-firmware.SlackBuild
+++ b/source/n/bluez-firmware/bluez-firmware.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,18 @@
 
 PKGNAM=bluez-firmware
 VERSION=${VERSION:-1.2}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -34,6 +43,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
@@ -91,9 +102,17 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README \
+  AUTHORS COPYING* INSTALL NEWS README* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 #zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/n/bluez-hcidump/bluez-hcidump.SlackBuild b/source/n/bluez-hcidump/bluez-hcidump.SlackBuild
index ac2a8442c..e03037ab4 100755
--- a/source/n/bluez-hcidump/bluez-hcidump.SlackBuild
+++ b/source/n/bluez-hcidump/bluez-hcidump.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 
 
 PKGNAM=bluez-hcidump
-VERSION=${VERSION:-1.42}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.0}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -59,7 +59,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
 # Make sure ownerships and permissions are sane:
@@ -70,9 +70,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Patch to build with bluez+>4.61
-zcat $CWD/hci.c_for_bluez-4.61.patch.gz | patch -p1 || exit 1
-
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch b/source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch
deleted file mode 100644
index bcd6b4a0a..000000000
--- a/source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur bluez-hcidump-1.42.orig//parser/hci.c bluez-hcidump-1.42/parser/hci.c
---- bluez-hcidump-1.42.orig//parser/hci.c	2008-06-15 07:46:13.000000000 -0500
-+++ bluez-hcidump-1.42/parser/hci.c	2010-03-02 23:15:35.171713301 -0600
-@@ -1973,7 +1973,7 @@
- 
- static inline void read_inquiry_transmit_power_level_dump(int level, struct frame *frm)
- {
--	read_inquiry_transmit_power_level_rp *rp = frm->ptr;
-+	read_inq_response_tx_power_level_rp *rp = frm->ptr;
- 
- 	p_indent(level, frm);
- 	printf("status 0x%2.2x level %d\n", rp->status, rp->level);
-@@ -2325,7 +2325,7 @@
- 		case OCF_READ_EXT_INQUIRY_RESPONSE:
- 			read_ext_inquiry_response_dump(level, frm);
- 			return;
--		case OCF_READ_INQUIRY_TRANSMIT_POWER_LEVEL:
-+		case OCF_READ_INQ_RESPONSE_TX_POWER_LEVEL:
- 			read_inquiry_transmit_power_level_dump(level, frm);
- 			return;
- 		case OCF_READ_DEFAULT_ERROR_DATA_REPORTING:
diff --git a/source/n/bluez/bluez-4.91.tar.sign b/source/n/bluez/bluez-4.91.tar.sign
new file mode 100644
index 000000000..bb9b05b69
--- /dev/null
+++ b/source/n/bluez/bluez-4.91.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBNkiAFyGugalF9Dw4RAqa6AJ9bxkhDm2sW6JqVMT8JwSa/5eFZaQCbBuKA
+27f95iFeuRTVrhRkoFiTOto=
+=u4px
+-----END PGP SIGNATURE-----
diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild
index ec5cba262..0403c932b 100755
--- a/source/n/bluez/bluez.SlackBuild
+++ b/source/n/bluez/bluez.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for bluez-utils - http://www.bluez.org
+# Slackware build script for bluez - http://www.bluez.org
 
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=bluez
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
+tar xvf $CWD/${PKGNAM}-${VERSION}.tar.xz || exit 1
 cd $PKGNAM-$VERSION
 
 chown -R root:root .
@@ -92,7 +92,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-gstreamer \
   --enable-alsa \
   --enable-usb \
-  --enable-netlink \
   --enable-tools\
   --enable-bccmd \
   --enable-hid2hci \
@@ -108,7 +107,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG
+make install DESTDIR=$PKG || exit 1
 
 # I'm don't think we need this, but I'll leave it commented just in case:
 # http://bugs.archlinux.org/task/4930
@@ -136,6 +135,10 @@ cp -a serial/serial.conf $PKG/etc/bluetooth
 cp -a tools/rfcomm.conf $PKG/etc/bluetooth
 chmod 644 $PKG/etc/bluetooth/*.conf
 
+mkdir -p $PKG/etc/alsa
+mv $PKG/usr/share/alsa/bluetooth.conf $PKG/etc/alsa
+( cd $PKG/usr/share/alsa ; ln -s ../../../etc/alsa/bluetooth.conf . )
+
 # Do not overwrite configuration
 # Well, let the dbus file be overwritten, as it is not usually user-edited.
 ( cd $PKG
diff --git a/source/n/bluez/doinst.sh b/source/n/bluez/doinst.sh
index 1711435e0..0d4dde1da 100644
--- a/source/n/bluez/doinst.sh
+++ b/source/n/bluez/doinst.sh
@@ -17,8 +17,8 @@ if [ -e etc/rc.d/rc.bluetooth ]; then
   mv etc/rc.d/rc.bluetooth.new.incoming etc/rc.d/rc.bluetooth.new
 fi
 
-config etc/alsa/bluetooth.conf.new
 config etc/rc.d/rc.bluetooth.new
+config etc/alsa/bluetooth.conf.new
 config etc/bluetooth/audio.conf.new
 config etc/bluetooth/input.conf.new
 config etc/bluetooth/main.conf.new
diff --git a/source/n/bluez/patches/bluez-dbus-config.patch b/source/n/bluez/patches/bluez-dbus-config.patch
index 4160600a5..0d0fb4620 100644
--- a/source/n/bluez/patches/bluez-dbus-config.patch
+++ b/source/n/bluez/patches/bluez-dbus-config.patch
@@ -1,25 +1,22 @@
-Use the plugdev group for bluetooth on Slackware, and allow this to
-  work as expected with our current setup.
-
-diff -Nur bluez-4.61.orig//src/bluetooth.conf bluez-4.61/src/bluetooth.conf
---- bluez-4.61.orig//src/bluetooth.conf	2010-02-18 17:48:50.434527785 -0600
-+++ bluez-4.61/src/bluetooth.conf	2010-02-18 17:47:30.727431004 -0600
-@@ -11,11 +11,16 @@
+--- ./src/bluetooth.conf.orig	2010-10-04 06:41:01.000000000 -0500
++++ ./src/bluetooth.conf	2010-11-07 19:50:47.229999322 -0600
+@@ -11,13 +11,18 @@
      <allow own="org.bluez"/>
      <allow send_destination="org.bluez"/>
      <allow send_interface="org.bluez.Agent"/>
 +    <allow send_interface="org.bluez.Adapter"/>
      <allow send_interface="org.bluez.HandsfreeAgent"/>
+     <allow send_interface="org.bluez.MediaEndpoint"/>
+     <allow send_interface="org.bluez.Watcher"/>
    </policy>
  
 -  <policy at_console="true">
--    <allow send_destination="org.bluez"/>
 +  <policy group="plugdev">
-+     <allow send_destination="org.bluez"/>
-+     <allow send_interface="org.bluez.Agent"/>
-+     <allow send_interface="org.bluez.Adapter"/>
-+     <allow send_destination="org.bluez"
-+            send_interface="org.freedesktop.DBus.Introspectable"/>
+     <allow send_destination="org.bluez"/>
++    <allow send_interface="org.bluez.Agent"/>
++    <allow send_interface="org.bluez.Adapter"/>
++    <allow send_destination="org.bluez"
++           send_interface="org.freedesktop.DBus.Introspectable"/>
    </policy>
  
    <!-- allow users of lp group (printing subsystem) to 
diff --git a/source/n/bootp/bootp.SlackBuild b/source/n/bootp/bootp.SlackBuild
index 2d12ab061..b3d74cf8a 100755
--- a/source/n/bootp/bootp.SlackBuild
+++ b/source/n/bootp/bootp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,11 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 VERSION=${VERSION:-2.4.3}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
diff --git a/source/n/bridge-utils/bridge-utils.SlackBuild b/source/n/bridge-utils/bridge-utils.SlackBuild
index 0772a887a..eb31d6ef7 100755
--- a/source/n/bridge-utils/bridge-utils.SlackBuild
+++ b/source/n/bridge-utils/bridge-utils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-VERSION=1.2
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+PKGNAM=bridge-utils
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -36,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -83,13 +95,21 @@ gzip -9 $PKG/usr/man/man8/*.8
 
 mkdir -p $PKG/usr/doc/bridge-utils-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog README THANKS TODO  \
+  AUTHORS COPYING* README* THANKS TODO  \
   doc \
   $PKG/usr/doc/bridge-utils-$VERSION
 ( cd $PKG/usr/doc/bridge-utils-$VERSION/doc
   rm -f Makefile Makefile.in RPM-GPG-KEY brctl.8
 )
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 # Finish up the package:
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/n/ca-certificates/ca-certificates.SlackBuild b/source/n/ca-certificates/ca-certificates.SlackBuild
new file mode 100755
index 000000000..fc455b14e
--- /dev/null
+++ b/source/n/ca-certificates/ca-certificates.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# Slackware build script for ca-certificates
+
+# Copyright 2009  Robby Workman  Northport, AL, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ca-certificates
+VERSION=${VERSION:-20090814}
+ARCH=noarch
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+zcat $CWD/cacerts-$VERSION-remove_debconf.diff.gz | patch -p1 || exit 1
+zcat $CWD/cacerts-$VERSION-fixup_DESTDIR.diff.gz | patch -p1 || exit 1
+zcat $CWD/cacerts-$VERSION-fixup_update-ca-certificates.diff.gz | patch -p1 || exit 1
+
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/etc/ca-certificates/update.d
+printf "# Automatically generated by $PRGNAM-$VERSION \n#\n" \
+  > $PKG/etc/ca-certificates.conf.new
+( cd $PKG/usr/share/ca-certificates
+  find . -name '*.crt' | sort | cut -b3-
+) >> $PKG/etc/ca-certificates.conf.new
+
+mkdir -p $PKG/usr/man/man8
+gzip -9c sbin/update-ca-certificates.8 > \
+  $PKG/usr/man/man8/update-ca-certificates.8.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv debian/NEWS debian/NEWS.Debian
+cp -a debian/NEWS.Debian debian/README.Debian $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff b/source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff
new file mode 100644
index 000000000..b70ca654b
--- /dev/null
+++ b/source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff
@@ -0,0 +1,94 @@
+diff -Nur ca-certificates-20090814.orig/Makefile ca-certificates-20090814/Makefile
+--- ca-certificates-20090814.orig/Makefile	2009-07-08 16:18:57.000000000 -0500
++++ ca-certificates-20090814/Makefile	2009-12-17 00:48:14.499550845 -0600
+@@ -17,7 +17,7 @@
+ 
+ install:
+ 	for dir in $(SUBDIRS); do \
+-	  mkdir $(DESTDIR)/$(CERTSDIR)/$$dir; \
++	  mkdir -p $(DESTDIR)/$(CERTSDIR)/$$dir; \
+ 	  $(MAKE) -C $$dir install CERTSDIR=$(DESTDIR)/$(CERTSDIR)/$$dir; \
+ 	done
+ 	for dir in sbin; do \
+diff -Nur ca-certificates-20090814.orig/brasil.gov.br/Makefile ca-certificates-20090814/brasil.gov.br/Makefile
+--- ca-certificates-20090814.orig/brasil.gov.br/Makefile	2007-02-02 00:23:19.000000000 -0600
++++ ca-certificates-20090814/brasil.gov.br/Makefile	2009-12-17 00:48:14.499550845 -0600
+@@ -8,5 +8,6 @@
+ 
+ install:
+ 	for p in *.crt; do \
++	 mkdir -p $(CERTSDIR) ; \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+diff -Nur ca-certificates-20090814.orig/cacert.org/Makefile ca-certificates-20090814/cacert.org/Makefile
+--- ca-certificates-20090814.orig/cacert.org/Makefile	2009-07-08 16:19:37.000000000 -0500
++++ ca-certificates-20090814/cacert.org/Makefile	2009-12-17 00:48:14.499550845 -0600
+@@ -9,5 +9,6 @@
+ 
+ install:
+ 	cat root.crt class3.crt > cacert.org.crt
++	mkdir -p $(CERTSDIR)
+ 	install -m 644 cacert.org.crt $(CERTSDIR)/cacert.org.crt
+ 
+diff -Nur ca-certificates-20090814.orig/gouv.fr/Makefile ca-certificates-20090814/gouv.fr/Makefile
+--- ca-certificates-20090814.orig/gouv.fr/Makefile	2008-06-23 13:57:45.000000000 -0500
++++ ca-certificates-20090814/gouv.fr/Makefile	2009-12-17 00:48:14.500550426 -0600
+@@ -8,6 +8,7 @@
+ 
+ install:
+ 	for p in *.crt; do \
++	 mkdir -p $(CERTSDIR) ; \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+ 
+diff -Nur ca-certificates-20090814.orig/mozilla/Makefile ca-certificates-20090814/mozilla/Makefile
+--- ca-certificates-20090814.orig/mozilla/Makefile	2009-06-24 05:56:54.000000000 -0500
++++ ca-certificates-20090814/mozilla/Makefile	2009-12-17 00:48:14.500550426 -0600
+@@ -10,5 +10,6 @@
+ 
+ install:
+ 	for p in *.crt; do \
++	 mkdir -p $(CERTSDIR) ; \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+diff -Nur ca-certificates-20090814.orig/sbin/Makefile ca-certificates-20090814/sbin/Makefile
+--- ca-certificates-20090814.orig/sbin/Makefile	2007-02-02 00:23:19.000000000 -0600
++++ ca-certificates-20090814/sbin/Makefile	2009-12-17 00:49:05.976571309 -0600
+@@ -8,4 +8,5 @@
+ clean:
+ 
+ install:
++	mkdir -p $(DESTDIR)/usr/sbin
+ 	install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/
+diff -Nur ca-certificates-20090814.orig/signet.pl/Makefile ca-certificates-20090814/signet.pl/Makefile
+--- ca-certificates-20090814.orig/signet.pl/Makefile	2007-02-02 00:23:19.000000000 -0600
++++ ca-certificates-20090814/signet.pl/Makefile	2009-12-17 00:48:14.501550915 -0600
+@@ -8,5 +8,6 @@
+ 
+ install:
+ 	for p in *.crt; do \
++	 mkdir -p $(CERTSDIR) ; \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+diff -Nur ca-certificates-20090814.orig/spi-inc.org/Makefile ca-certificates-20090814/spi-inc.org/Makefile
+--- ca-certificates-20090814.orig/spi-inc.org/Makefile	2007-02-02 00:23:19.000000000 -0600
++++ ca-certificates-20090814/spi-inc.org/Makefile	2009-12-17 00:48:14.501550915 -0600
+@@ -8,6 +8,7 @@
+ 
+ install:
+ 	for p in *.crt; do \
++	 mkdir -p $(CERTSDIR) ; \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+ 
+diff -Nur ca-certificates-20090814.orig/telesec.de/Makefile ca-certificates-20090814/telesec.de/Makefile
+--- ca-certificates-20090814.orig/telesec.de/Makefile	2008-03-19 09:03:09.000000000 -0500
++++ ca-certificates-20090814/telesec.de/Makefile	2009-12-17 00:48:14.566586954 -0600
+@@ -8,6 +8,7 @@
+ 
+ install:
+ 	for p in *.crt; do \
++	 mkdir -p $(CERTSDIR) ; \
+ 	 install -m 644 $$p $(CERTSDIR)/$$p ; \
+ 	done
+ 
diff --git a/source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff b/source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff
new file mode 100644
index 000000000..3c9e08b41
--- /dev/null
+++ b/source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff
@@ -0,0 +1,14 @@
+diff -Nur ca-certificates-20090814.orig/sbin/update-ca-certificates ca-certificates-20090814/sbin/update-ca-certificates
+--- ca-certificates-20090814.orig/sbin/update-ca-certificates	2009-07-08 16:23:12.000000000 -0500
++++ ca-certificates-20090814/sbin/update-ca-certificates	2009-12-17 00:42:41.760550636 -0600
+@@ -148,9 +148,7 @@
+ 
+ HOOKSDIR=/etc/ca-certificates/update.d
+ echo -n "Running hooks in $HOOKSDIR...."
+-VERBOSE_ARG=
+-[ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
+-eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook
++eval run-parts $HOOKSDIR | while read hook
+ do
+   ( cat $ADDED
+     cat $REMOVED ) | $hook || echo E: $hook exited with code $?.
diff --git a/source/n/ca-certificates/cacerts-20090814-remove_debconf.diff b/source/n/ca-certificates/cacerts-20090814-remove_debconf.diff
new file mode 100644
index 000000000..c99aa2fa2
--- /dev/null
+++ b/source/n/ca-certificates/cacerts-20090814-remove_debconf.diff
@@ -0,0 +1,12 @@
+diff -Nur ca-certificates-20090814.orig/Makefile ca-certificates-20090814/Makefile
+--- ca-certificates-20090814.orig/Makefile	2009-07-08 16:18:57.000000000 -0500
++++ ca-certificates-20090814/Makefile	2009-12-17 00:44:30.540551055 -0600
+@@ -3,7 +3,7 @@
+ #
+ 
+ CERTSDIR = /usr/share/ca-certificates
+-SUBDIRS = spi-inc.org debconf.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr
++SUBDIRS = spi-inc.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr
+ 
+ all:
+ 	for dir in $(SUBDIRS); do \
diff --git a/source/n/ca-certificates/doinst.sh b/source/n/ca-certificates/doinst.sh
new file mode 100644
index 000000000..e8cd8cced
--- /dev/null
+++ b/source/n/ca-certificates/doinst.sh
@@ -0,0 +1,17 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/ca-certificates.conf.new
+
+chroot . usr/sbin/update-ca-certificates --fresh 1>/dev/null 2>/dev/null
+
diff --git a/source/n/ca-certificates/slack-desc b/source/n/ca-certificates/slack-desc
new file mode 100644
index 000000000..c302e8283
--- /dev/null
+++ b/source/n/ca-certificates/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+               |-----handy-ruler-----------------------------------------------------|
+ca-certificates: ca-certificates (PEM Files of CA Certificates)
+ca-certificates:
+ca-certificates: This package includes PEM files of CA certificates to allow SSL-based
+ca-certificates: applications to check for the authenticity of SSL connections.
+ca-certificates:
+ca-certificates: Homepage: http://packages.qa.debian.org/c/ca-certificates.html
+ca-certificates:
+ca-certificates:
+ca-certificates:
+ca-certificates:
+ca-certificates:
diff --git a/source/n/curl/cacert.pem b/source/n/curl/cacert.pem
index d7d20b626..af135450d 100644
--- a/source/n/curl/cacert.pem
+++ b/source/n/curl/cacert.pem
@@ -1,7 +1,7 @@
 ##
-## ca-bundle.crt -- Bundle of CA Root Certificates
+## lib/ca-bundle.crt -- Bundle of CA Root Certificates
 ##
-## Converted at: Tue Sep 22 09:25:27 2009 UTC
+## Converted at: Tue Mar 29 19:30:29 2011 UTC
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -49,36 +49,7 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.53 $ $Date: 2009/05/21 19:50:28 $
-
-Verisign/RSA Secure Server CA
-=============================
------BEGIN CERTIFICATE-----
-MIICNDCCAaECEAKtZn5ORf5eV288mBle3cAwDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx
-IDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2VydmVy
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk0MTEwOTAwMDAwMFoXDTEwMDEwNzIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQL
-EyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGbMA0GCSqGSIb3DQEBAQUA
-A4GJADCBhQJ+AJLOesGugz5aqomDV6wlAXYMra6OLDfO6zV4ZFQD5YRAUcm/jwjiioII0haGN1Xp
-sSECrXZogZoFokvJSyVmIlZsiAeP94FZbYQHZXATcXY+m3dM41CJVphIuR2nKRoTLkoRWZweFdVJ
-VCxzOmmCsZc5nG1wZ0jl3S3WyB57AgMBAAEwDQYJKoZIhvcNAQECBQADfgBl3X7hsuyw4jrg7HFG
-mhkRuNPHoLQDQCYCPgmc4RKz0Vr2N6W3YQO2WxZpO8ZECAyIUwxrl0nHPjXcbLm7qt9cuzovk2C2
-qUtN8iD3zV9/ZHuO3ABc1/p3yjkWWW8O6tO1g39NTUJWdrTJXwT4OPjr0l91X817/OWOgHz8UA==
------END CERTIFICATE-----
-
-GTE CyberTrust Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIB+jCCAWMCAgGjMA0GCSqGSIb3DQEBBAUAMEUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg
-Q29ycG9yYXRpb24xHDAaBgNVBAMTE0dURSBDeWJlclRydXN0IFJvb3QwHhcNOTYwMjIzMjMwMTAw
-WhcNMDYwMjIzMjM1OTAwWjBFMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9u
-MRwwGgYDVQQDExNHVEUgQ3liZXJUcnVzdCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQC45k+625h8cXyvRLfTD0bZZOWTwUKOx7pJjTUteueLveUFMVnGsS8KDPufpz+iCWaEVh43KRuH
-6X4MypqfpX/1FZSj1aJGgthoTNE3FQZor734sLPwKfWVWgkWYXcKIiXUT0Wqx73llt/51KiOQswk
-wB6RJ0q1bQaAYznEol44AwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBABKzdcZfHeFhVYAA1IFLezEP
-I2PnPfMD+fQ2qLvZ46WXTeorKeDWanOB5sCJo9Px4KWlIjeaY8JIILTbcuPI9tl8vrGvU9oUtCG4
-1tWW4/5ODFlitppK+ULdjG+BqXH/9ApybW1EDp3zdHSo1TRJ6V6e6bR64eVaH4QwnNOfpSXY
------END CERTIFICATE-----
+# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.70 $ $Date: 2010/12/02 23:26:19 $
 
 GTE CyberTrust Global Root
 ==========================
@@ -96,46 +67,6 @@ M4ETCJ57NE7fQMh017l93PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OF
 NMQkpw0PlZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
 -----END CERTIFICATE-----
 
-Thawte Personal Basic CA
-========================
------BEGIN CERTIFICATE-----
-MIIDITCCAoqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCByzELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYDVQQKExFUaGF3dGUgQ29uc3Vs
-dGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMY
-VGhhd3RlIFBlcnNvbmFsIEJhc2ljIENBMSgwJgYJKoZIhvcNAQkBFhlwZXJzb25hbC1iYXNpY0B0
-aGF3dGUuY29tMB4XDTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgcsxCzAJBgNVBAYTAlpB
-MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UEChMRVGhh
-d3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24x
-ITAfBgNVBAMTGFRoYXd0ZSBQZXJzb25hbCBCYXNpYyBDQTEoMCYGCSqGSIb3DQEJARYZcGVyc29u
-YWwtYmFzaWNAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvLyTU23AUE+C
-FeZIlDWmWr5vQvoPR+53dXLdjUmbllegeNTKP1GzaQuRdhciB5dqxFGTS+CN7zeVoQxN2jSQHReJ
-l+A1OFdKwPQIcOk8RHtQfmGakOMj04gRRif1CwcOu93RfyAKiLlWCy4cgNrx454p7xS9CkT7G1sY
-0b8jkyECAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAt4plrsD16
-iddZopQBHyvdEktTwq1/qqcAXJFAVyVKOKqEcLnZgA+le1z7c8a914phXAPjLSeoF+CEhULcXpvG
-t7Jtu3Sv5D/Lp7ew4F2+eIMllNLbgQ95B21P9DkVWlIBe94y1k049hJcBlDfBVu9FEuh3ym6O0GN
-92NWod8isQ==
------END CERTIFICATE-----
-
-Thawte Personal Premium CA
-==========================
------BEGIN CERTIFICATE-----
-MIIDKTCCApKgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBzzELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYDVQQKExFUaGF3dGUgQ29uc3Vs
-dGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEjMCEGA1UEAxMa
-VGhhd3RlIFBlcnNvbmFsIFByZW1pdW0gQ0ExKjAoBgkqhkiG9w0BCQEWG3BlcnNvbmFsLXByZW1p
-dW1AdGhhd3RlLmNvbTAeFw05NjAxMDEwMDAwMDBaFw0yMDEyMzEyMzU5NTlaMIHPMQswCQYDVQQG
-EwJaQTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xGjAYBgNVBAoT
-EVRoYXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlz
-aW9uMSMwIQYDVQQDExpUaGF3dGUgUGVyc29uYWwgUHJlbWl1bSBDQTEqMCgGCSqGSIb3DQEJARYb
-cGVyc29uYWwtcHJlbWl1bUB0aGF3dGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJ
-Ztn4B0TPuYwu8KHvE0VsBd/eJxZRNkERbGw77f4QfRKe5ZtCmv5gMcNmt3M6SK5O0DI3lIi1DbbZ
-8/JE2dWIEt12TfIa/G8jHnrx2JhFTgcQ7xZC0EN1bUre4qrJMf8fAHB8Zs8QJQi6+u4A6UYDZicR
-FTuqW/KY3TZCstqIdQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AGk2ifc0KjNyL2071CKyuG+axTZmDhs8obF1Wub9NdP4qPIHb4Vnjt4rueIXsDqg8A6iAJrf8xQV
-brvIhVqYgPn/vnQdPfP+MCXRNzRn+qVxeTBhKXLA4CxM+1bkOqhv5TJZUtt1KFBZDPgLGeSs2a+W
-jS9Q2wfD6h+rM+D1KzGJ
------END CERTIFICATE-----
-
 Thawte Personal Freemail CA
 ===========================
 -----BEGIN CERTIFICATE-----
@@ -215,28 +146,6 @@ BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
 70+sB3c4
 -----END CERTIFICATE-----
 
-ABAecom (sub., Am. Bankers Assn.) Root CA
-=========================================
------BEGIN CERTIFICATE-----
-MIIDtTCCAp2gAwIBAgIRANAeQJAAAEZSAAAAAQAAAAQwDQYJKoZIhvcNAQEFBQAwgYkxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJEQzETMBEGA1UEBxMKV2FzaGluZ3RvbjEXMBUGA1UEChMOQUJBLkVD
-T00sIElOQy4xGTAXBgNVBAMTEEFCQS5FQ09NIFJvb3QgQ0ExJDAiBgkqhkiG9w0BCQEWFWFkbWlu
-QGRpZ3NpZ3RydXN0LmNvbTAeFw05OTA3MTIxNzMzNTNaFw0wOTA3MDkxNzMzNTNaMIGJMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCREMxEzARBgNVBAcTCldhc2hpbmd0b24xFzAVBgNVBAoTDkFCQS5F
-Q09NLCBJTkMuMRkwFwYDVQQDExBBQkEuRUNPTSBSb290IENBMSQwIgYJKoZIhvcNAQkBFhVhZG1p
-bkBkaWdzaWd0cnVzdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx0xHgeVVD
-BwhMywVCAOINg0Y95JO6tgbTDVm9PsHOQ2cBiiGo77zM0KLMsFWWU4RmBQDaREmA2FQKpSWGlO1j
-Vv9wbKOhGdJ4vmgqRF4vz8wYXke8OrFGPR7wuSw0X4x8TAgpnUBV6zx9g9618PeKgw6hTLQ6pbNf
-WiKX7BmbwQVo/ea3qZGULOR4SCQaJRk665WcOQqKz0Ky8BzVX/tr7WhWezkscjiw7pOp03t3POtx
-A6k4ShZsiSrK2jMTecJVjO2cu/LLWxD4LmE1xilMKtAqY9FlWbT4zfn0AIS2V0KFnTKo+SpU+/94
-Qby9cSj0u5C8/5Y0BONFnqFGKECBAgMBAAGjFjAUMBIGA1UdEwEB/wQIMAYBAf8CAQgwDQYJKoZI
-hvcNAQEFBQADggEBAARvJYbk5pYntNlCwNDJALF/VD6Hsm0kqS8Kfv2kRLD4VAe9G52dyntQJHsR
-W0mjpr8SdNWJt7cvmGQlFLdh6X9ggGvTZOirvRrWUfrAtF13Gn9kCF55xgVM8XrdTX3O5kh7VNJh
-koHWG9YA8A6eKHegTYjHInYZw8eeG6Z3ePhfm1bR8PIXrI6dWeYf/le22V7hXZ9F7GFoGUHhsiAm
-/lowdiT/QHI8eZ98IkirRs3bs4Ysj78FQdPB4xTjQRcm0HyncUwZ6EoPclgxfexgeqMiKL0ZJGA/
-O4dzwGvky663qyVDslUte6sGDnVdNOVdc22esnVApVnJTzFxiNmIf1Q=
------END CERTIFICATE-----
-
 Digital Signature Trust Co. Global CA 1
 =======================================
 -----BEGIN CERTIFICATE-----
@@ -277,52 +186,6 @@ up/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVLB3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1
 mPnHfxsb1gYgAlihw6ID
 -----END CERTIFICATE-----
 
-Digital Signature Trust Co. Global CA 2
-=======================================
------BEGIN CERTIFICATE-----
-MIID2DCCAsACEQDQHkCLAAACfAAAAAIAAAABMA0GCSqGSIb3DQEBBQUAMIGpMQswCQYDVQQGEwJ1
-czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0RpZ2l0
-YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgWDExFjAUBgNVBAMTDURTVCBS
-b290Q0EgWDExITAfBgkqhkiG9w0BCQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTAeFw05ODEyMDExODE4
-NTVaFw0wODExMjgxODE4NTVaMIGpMQswCQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UE
-BxMOU2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjER
-MA8GA1UECxMIRFNUQ0EgWDExFjAUBgNVBAMTDURTVCBSb290Q0EgWDExITAfBgkqhkiG9w0BCQEW
-EmNhQGRpZ3NpZ3RydXN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANLGJrbn
-pT3BxGjVUG9TxW9JEwm4ryxIjRRqoxdfWvnTLnUv2Chi0ZMv/E3Uq4flCMeZ55I/db3rJbQVwZsZ
-PdJEjdd0IG03Ao9pk1uKxBmd9LIO/BZsubEFkoPRhSxglD5FVaDZqwgh5mDoO3TymVBRaNADLbGA
-vqPYUrBEzUNKcI5YhZXhTizWLUFv1oTnyJhEykfbLCSlaSbPa7gnYsP0yXqSI+0TZ4KuRS5F5X5y
-P4WdlGIQ5jyRoa13AOAV7POEgHJ6jm5gl8ckWRA0g1vhpaRptlc1HHhZxtMvOnNn7pTKBBMFYgZw
-I7P0fO5F2WQLW0mqpEPOJsREEmy43XkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAojeyP2n714Z5
-VEkxlTMr89EJFEliYIalsBHiUMIdBlc+LegzZL6bqq1fG03UmZWii5rJYnK1aerZWKs17RWiQ9a2
-vAd5ZWRzfdd5ynvVWlHG4VMElo04z6MXrDlxawHDi1M8Y+nuecDkvpIyZHqzH5eUYr3qsiAVlfuX
-8ngvYzZAOONGDx3drJXK50uQe7FLqdTF65raqtWjlBRGjS0f8zrWkzr2Pnn86Oawde3uPclwx12q
-gUtGJRzHbBXjlU4PqjI3lAoXJJIThFjSY28r9+ZbYgsTF7ANUkz+/m9c4pFuHf2kYtdo+o56T9II
-2pPc8JIRetDccpMMc5NihWjQ9A==
------END CERTIFICATE-----
-
-Digital Signature Trust Co. Global CA 4
-=======================================
------BEGIN CERTIFICATE-----
-MIID2DCCAsACEQDQHkCLAAB3bQAAAAEAAAAEMA0GCSqGSIb3DQEBBQUAMIGpMQswCQYDVQQGEwJ1
-czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0RpZ2l0
-YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgWDIxFjAUBgNVBAMTDURTVCBS
-b290Q0EgWDIxITAfBgkqhkiG9w0BCQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTAeFw05ODExMzAyMjQ2
-MTZaFw0wODExMjcyMjQ2MTZaMIGpMQswCQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UE
-BxMOU2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjER
-MA8GA1UECxMIRFNUQ0EgWDIxFjAUBgNVBAMTDURTVCBSb290Q0EgWDIxITAfBgkqhkiG9w0BCQEW
-EmNhQGRpZ3NpZ3RydXN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANx18IzA
-dZaawGIfJvfE4Zrq4FZzW5nNAUSoCLbVp9oaBBg5kkp4o4HC9Xd6ULRw/5qrxsfKboNPQpj7Jgva
-3G3WqZlVUmfpKAOS3OWwBZoPFflrWXJW8vo5/Kpo7g8fEIMv/J36F5bdguPmRX3AS4BEH+0s4IT9
-kVySVGkl5WJp3OXuAFK9MwutdQKFp2RQLcUZGTDAJtvJ0/0uma1ZtQtN1EGuhUhDWdy3qOKi3sOP
-17ihYqZoUFLkzzGnlIXan0YyF1bl8utmPRL/Q9uY73fPy4GNNLHGUEom0eQ+QVCvbK4iNC7Va26D
-unm4dmVI2gkpZGMiuftHdoWMhkTLCdsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAtTYOXeFhKFoR
-ZcA/gwN5Tb4opgsHAlKFzfiR0BBstWogWxyQ2TA8xkieil5k+aFxd+8EJx8H6+Qm93N0yUQYGmbT
-4EOvkTvRyyzYdFQ6HE3K1GjNI3wdEJ5F6fYAbqbNGf9PLCmPV03Ed5K+4EwJ+11EhmYhqLkyolbV
-6YyDfFk/xPEL553snr2cGA4+wjl5KLcDDQjLxufZATdQEOzMYRZA1K8xdHv8PzGn0EdzMzkbzE5q
-10mDEQb+64JYMzJM8FasHpwvVpp7wUocpf1VNs78lk30sPDst2yC7S8xmUJMqbINuBVd8d+6ybVK
-1GSYsyapMMj9puyrliGtf8J4tg==
------END CERTIFICATE-----
-
 Verisign Class 1 Public Primary Certification Authority
 =======================================================
 -----BEGIN CERTIFICATE-----
@@ -798,56 +661,6 @@ jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia
 V+GRMOrN
 -----END CERTIFICATE-----
 
-Visa International Global Root 2
-================================
------BEGIN CERTIFICATE-----
-MIIDgDCCAmigAwIBAgICAx4wDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCVVMxDTALBgNVBAoT
-BFZJU0ExLzAtBgNVBAsTJlZpc2EgSW50ZXJuYXRpb25hbCBTZXJ2aWNlIEFzc29jaWF0aW9uMRIw
-EAYDVQQDEwlHUCBSb290IDIwHhcNMDAwODE2MjI1MTAwWhcNMjAwODE1MjM1OTAwWjBhMQswCQYD
-VQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZp
-Y2UgQXNzb2NpYXRpb24xEjAQBgNVBAMTCUdQIFJvb3QgMjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKkBcLWqxEDwq2omYXkZAPy/mzdZDK9vZBv42pWUJGkzEXDK41Z0ohdXZFwgBuHW
-73G3O/erwWnQSaSxBNf0V2KJXLB1LRckaeNCYOTudNargFbYiCjh+20i/SN8RnNPflRzHqgsVVh1
-t0zzWkWlAhr62p3DRcMiXvOL8WAp0sdftAw6UYPvMPjU58fy+pmjIlC++QU3o63tmsPm7Igbthkn
-GziLgE3sucfFicv8GjLtI/C1AVj59o/ghalMCXI5Etuz9c9OYmTaxhkVOmMd6RdVoUwiPDQyRvhl
-V7or7zaMavrZ2UT0qt2E1w0cslSsMoW0ZA3eQbuxNMYBhjJk1Z8CAwEAAaNCMEAwHQYDVR0OBBYE
-FJ59SzS/ca3CBfYDdYDOqU8axCRMMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0G
-CSqGSIb3DQEBBQUAA4IBAQAhpXYUVfmtJ3CPPPTVbMjMCqujmAuKBiPFyWHbmQdpNSYx/scuhMKZ
-YdQN6X0uEyt8joW2hcdLzzW2LEc9zikv2G+fiRxkk78IvXbQkIqUs38oW26sTTMs7WXcFsziza6k
-PWKSBpUmv9+55CCmc2rBvveURNZNbyoLaxhNdBA2aGpawWqn3TYpjLgwi08hPwAuVDAHOrqK5MOe
-yti12HvOdUVmB/RtLdh6yumJivIj2C/LbgA2T/vwLwHMD8AiZfSr4k5hLQOCfZEWtTDVFN5ex5D8
-ofyrEK9ca3CnB+8phuiyJccg/ybdd+95RBTEvd07xQObdyPsoOy7Wjm1zK0G
------END CERTIFICATE-----
-
-beTRUSTed Root CA
-=================
------BEGIN CERTIFICATE-----
-MIIFLDCCBBSgAwIBAgIEOU99hzANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJXVzESMBAGA1UE
-ChMJYmVUUlVTVGVkMRswGQYDVQQDExJiZVRSVVNUZWQgUm9vdCBDQXMxGjAYBgNVBAMTEWJlVFJV
-U1RlZCBSb290IENBMB4XDTAwMDYyMDE0MjEwNFoXDTEwMDYyMDEzMjEwNFowWjELMAkGA1UEBhMC
-V1cxEjAQBgNVBAoTCWJlVFJVU1RlZDEbMBkGA1UEAxMSYmVUUlVTVGVkIFJvb3QgQ0FzMRowGAYD
-VQQDExFiZVRSVVNUZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS0
-c3oTCjhVAb6JVuGUntS+WutKNHUbYSnE4a0IYCF4SP+00PpeQY1hRIfo7clY+vyTmt9P6j41ffgz
-eubx181vSUs9Ty1uDoM6GHh3o8/n9E1z2Jo7Gh2+lVPPIJfCzz4kUmwMjmVZxXH/YgmPqsWPzGCg
-c0rXOD8Vcr+il7dw6K/ifhYGTPWqZCZyByWtNfwYsSbX2P8ZDoMbjNx4RWc0PfSvHI3kbWvtILNn
-mrRhyxdviTX/507AMhLn7uzf/5cwdO2NR47rtMNE5qdMf1ZD6Li8tr76g5fmu/vEtpO+GRg+jIG5
-c4gW9JZDnGdzF5DYCW5jrEq2I8QBoa2k5MUCAwEAAaOCAfgwggH0MA8GA1UdEwEB/wQFMAMBAf8w
-ggFZBgNVHSAEggFQMIIBTDCCAUgGCisGAQQBsT4BAAAwggE4MIIBAQYIKwYBBQUHAgIwgfQagfFS
-ZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFu
-Y2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBv
-ZiB1c2UsIGFuZCBjZXJ0aWZpY2F0aW9uIHByYWN0aWNlIHN0YXRlbWVudCwgd2hpY2ggY2FuIGJl
-IGZvdW5kIGF0IGJlVFJVU1RlZCdzIHdlYiBzaXRlLCBodHRwczovL3d3dy5iZVRSVVNUZWQuY29t
-L3ZhdWx0L3Rlcm1zMDEGCCsGAQUFBwIBFiVodHRwczovL3d3dy5iZVRSVVNUZWQuY29tL3ZhdWx0
-L3Rlcm1zMDQGA1UdHwQtMCswKaAnoCWkIzAhMRIwEAYDVQQKEwliZVRSVVNUZWQxCzAJBgNVBAYT
-AldXMB0GA1UdDgQWBBQquZtpLjub2M3eKjEENGvKBxirZzAfBgNVHSMEGDAWgBQquZtpLjub2M3e
-KjEENGvKBxirZzAOBgNVHQ8BAf8EBAMCAf4wDQYJKoZIhvcNAQEFBQADggEBAHlh26Nebhax6nZR
-+csVm8tpvuaBa58oH2U+3RGFktToQb9+M70j5/Egv6S0phkBxoyNNXxlpE8JpNbYIxUFE6dDea/b
-ow6be3ga8wSGWsb2jCBHOElQBp1yZzrwmAOtlmdE/D8QDYZN5AA7KXvOOzuZhmElQITcE2K3+spZ
-1gMe1lMBzW1MaFVA4e5rxyoAAEiCswoBw2AqDPeCNe5IhpbkdNQ96gFxugR1QKepfzk5mlWXKWWu
-GVUlBXJH0+gY3Ljpr0NzARJ0o+FcXxVdJPP55PS2Z2cS52QiivalQaYctmBjRYoQtLpGEK5BV2Vs
-PyMQPyEQWbfkQN0mDCP2qq4=
------END CERTIFICATE-----
-
 AddTrust Low-Value Services Root
 ================================
 -----BEGIN CERTIFICATE-----
@@ -944,29 +757,6 @@ RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
 iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
 -----END CERTIFICATE-----
 
-Verisign Time Stamping Authority CA
-===================================
------BEGIN CERTIFICATE-----
-MIIDzTCCAzagAwIBAgIQU2GyYK7bcY6nlLMTM/QHCTANBgkqhkiG9w0BAQUFADCBwTELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTwwOgYDVQQLEzNDbGFzcyAzIFB1YmxpYyBQ
-cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIxOjA4BgNVBAsTMShjKSAxOTk4IFZl
-cmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAsTFlZlcmlTaWdu
-IFRydXN0IE5ldHdvcmswHhcNMDAwOTI2MDAwMDAwWhcNMTAwOTI1MjM1OTU5WjCBpTEXMBUGA1UE
-ChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNV
-BAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTAwMSww
-KgYDVQQDEyNWZXJpU2lnbiBUaW1lIFN0YW1waW5nIEF1dGhvcml0eSBDQTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEA0hmdZ8IAIVlizrQJIkRpivglWtvtDbc2fk7gu5Q+kCWHwmFHKdm9VLhj
-zCx9abQzNvQ3B5rB3UBU/OB4naCTuQk9I1F/RMIUdNsKvsvJMDRAmD7Q1yUQgZS9B0+c1lQn3y6o
-v8uQjI11S7zi6ESHzeZBCiVu6PQkAsVSD27smHUCAwEAAaOB3zCB3DAPBgNVHRMECDAGAQH/AgEA
-MEUGA1UdIAQ+MDwwOgYMYIZIAYb4RQEHFwEDMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZl
-cmlzaWduLmNvbS9ycGEwMQYDVR0fBCowKDAmoCSgIoYgaHR0cDovL2NybC52ZXJpc2lnbi5jb20v
-cGNhMy5jcmwwCwYDVR0PBAQDAgEGMEIGCCsGAQUFBwEBBDYwNDAyBggrBgEFBQcwAaYmFiRodHRw
-Oi8vb2NzcC52ZXJpc2lnbi5jb20vb2NzcC9zdGF0dXMwDQYJKoZIhvcNAQEFBQADgYEAgnBold+2
-DcIBcBlK0lRWHqzyRUyHuPU163hLBanInTsZIS5wNEqi9YngFXVF5yg3ADQnKeg3S/LvRJdrF1Ea
-w1adPBqK9kpGRjeM+sv1ZFo4aC4cw+9wzrhGBha/937ntag+RaypJXUie28/sJyU58dzq6wf7iWb
-wBbtt8pb8BQ=
------END CERTIFICATE-----
-
 Thawte Time Stamping CA
 =======================
 -----BEGIN CERTIFICATE-----
@@ -1117,100 +907,6 @@ GKQWDzH9OmwjkyB24f0HhdFbP9IcczLd+rn4jM8Ch3qaluTtT4mNU0OrDhPAARW0eTjb/G49nlG2
 uBOLZ8/5fNkiHfZdxRwBL5joeiQYvITX+txyW/fBOmg=
 -----END CERTIFICATE-----
 
-beTRUSTed Root CA-Baltimore Implementation
-==========================================
------BEGIN CERTIFICATE-----
-MIIFajCCBFKgAwIBAgIEPLU9RjANBgkqhkiG9w0BAQUFADBmMRIwEAYDVQQKEwliZVRSVVNUZWQx
-GzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEzMDEGA1UEAxMqYmVUUlVTVGVkIFJvb3QgQ0Et
-QmFsdGltb3JlIEltcGxlbWVudGF0aW9uMB4XDTAyMDQxMTA3Mzg1MVoXDTIyMDQxMTA3Mzg1MVow
-ZjESMBAGA1UEChMJYmVUUlVTVGVkMRswGQYDVQQLExJiZVRSVVNUZWQgUm9vdCBDQXMxMzAxBgNV
-BAMTKmJlVFJVU1RlZCBSb290IENBLUJhbHRpbW9yZSBJbXBsZW1lbnRhdGlvbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALx+xDmcjOPWHIb/ymKt4H8wRXqOGrO4x/nRNv8i805qX4QQ
-+2aBw5R5MdKR4XeOGCrDFN5R9U+jK7wYFuK13XneIviCfsuBH/0nLI/6l2Qijvj/YaOcGx6Sj8Co
-Cd8JEey3fTGaGuqDIQY8n7pc/5TqarjDa1U0Tz0yH92BFODEPM2dMPgwqZfT7syj0B9fHBOB1Bir
-lNFjw55/NZKeX0Tq7PQiXLfoPX2k+YmpkbIq2eszh+6l/ePazIjmiSZuxyuC0F6dWdsU7JGDBcNe
-DsYq0ATdcT0gTlgn/FP7eHgZFLL8kFKJOGJgB7Sg7KxrUNb9uShr71ItOrL/8QFArDcCAwEAAaOC
-Ah4wggIaMA8GA1UdEwEB/wQFMAMBAf8wggG1BgNVHSAEggGsMIIBqDCCAaQGDysGAQQBsT4AAAEJ
-KIORMTCCAY8wggFIBggrBgEFBQcCAjCCAToaggE2UmVsaWFuY2Ugb24gb3IgdXNlIG9mIHRoaXMg
-Q2VydGlmaWNhdGUgY3JlYXRlcyBhbiBhY2tub3dsZWRnbWVudCBhbmQgYWNjZXB0YW5jZSBvZiB0
-aGUgdGhlbiBhcHBsaWNhYmxlIHN0YW5kYXJkIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHVzZSwg
-dGhlIENlcnRpZmljYXRpb24gUHJhY3RpY2UgU3RhdGVtZW50IGFuZCB0aGUgUmVseWluZyBQYXJ0
-eSBBZ3JlZW1lbnQsIHdoaWNoIGNhbiBiZSBmb3VuZCBhdCB0aGUgYmVUUlVTVGVkIHdlYiBzaXRl
-LCBodHRwOi8vd3d3LmJldHJ1c3RlZC5jb20vcHJvZHVjdHNfc2VydmljZXMvaW5kZXguaHRtbDBB
-BggrBgEFBQcCARY1aHR0cDovL3d3dy5iZXRydXN0ZWQuY29tL3Byb2R1Y3RzX3NlcnZpY2VzL2lu
-ZGV4Lmh0bWwwHQYDVR0OBBYEFEU9w6nR3D8kVpgccxiIav+DR+22MB8GA1UdIwQYMBaAFEU9w6nR
-3D8kVpgccxiIav+DR+22MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEASZK8o+6s
-vfoNyYt5hhwjdrCAWXf82n+0S9/DZEtqTg6t8n1ZdwWtColzsPq8y9yNAIiPpqCy6qxSJ7+hSHyX
-EHu67RMdmgduyzFiEuhjA6p9beP4G3YheBufS0OM00mG9htc9i5gFdPp43t1P9ACg9AYgkHNZTfq
-jjJ+vWuZXTARyNtIVBw74acT02pIk/c9jH8F6M7ziCpjBLjqflh8AXtb4cV97yHgjQ5dUX2xZ/2j
-vTg2xvI4hocalmhgRvsoFEdV4aeADGvi6t9NfJBIoDa9CReJf8Py05yc493EG931t3GzUwWJBtDL
-SoDByFOQtTwxiBdQn8nEDovYqAJjDQ==
------END CERTIFICATE-----
-
-beTRUSTed Root CA - Entrust Implementation
-==========================================
------BEGIN CERTIFICATE-----
-MIIGUTCCBTmgAwIBAgIEPLVPQDANBgkqhkiG9w0BAQUFADBmMRIwEAYDVQQKEwliZVRSVVNUZWQx
-GzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEzMDEGA1UEAxMqYmVUUlVTVGVkIFJvb3QgQ0Eg
-LSBFbnRydXN0IEltcGxlbWVudGF0aW9uMB4XDTAyMDQxMTA4MjQyN1oXDTIyMDQxMTA4NTQyN1ow
-ZjESMBAGA1UEChMJYmVUUlVTVGVkMRswGQYDVQQLExJiZVRSVVNUZWQgUm9vdCBDQXMxMzAxBgNV
-BAMTKmJlVFJVU1RlZCBSb290IENBIC0gRW50cnVzdCBJbXBsZW1lbnRhdGlvbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALr0RAOqEmq1Q+xVkrYwfTVXDNvzDSduTPdQqJtOK2/b9a0c
-S12zqcH+e0TrW6MFDR/FNCswACnxeECypP869AGIF37m1CbTukzqMvtDd5eHI8XbQ6P1KqNRXuE7
-0mVpflUVm3rnafdE4Fe1FehmYA8NA/uCjqPoEXtsvsdjDheT389Lrm5zdeDzqrmkwAkbhepxKYhB
-MvnwKg5sCfJ0a2ZsUhMfGLzUPvfYbiCeyv78IZTuEyhL11xeDGbu6bsPwTSxfwh28z0mcMmLJR1i
-JAzqHHVOwBLkuhMdMCktVjMFu5dZfsZJT4nXLySotohAtWSSU1Yk5KKghbNekLQSM80CAwEAAaOC
-AwUwggMBMIIBtwYDVR0gBIIBrjCCAaowggGmBg8rBgEEAbE+AAACCSiDkTEwggGRMIIBSQYIKwYB
-BQUHAgIwggE7GoIBN1JlbGlhbmNlIG9uIG9yIHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNyZWF0
-ZXMgYW4gYWNrbm93bGVkZ21lbnQgYW5kIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
-ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIHRoZSBDZXJ0aWZpY2F0aW9u
-IFByYWN0aWNlIFN0YXRlbWVudCBhbmQgdGhlIFJlbHlpbmcgUGFydHkgQWdyZWVtZW50LCB3aGlj
-aCBjYW4gYmUgZm91bmQgYXQgdGhlIGJlVFJVU1RlZCB3ZWIgc2l0ZSwgaHR0cHM6Ly93d3cuYmV0
-cnVzdGVkLmNvbS9wcm9kdWN0c19zZXJ2aWNlcy9pbmRleC5odG1sMEIGCCsGAQUFBwIBFjZodHRw
-czovL3d3dy5iZXRydXN0ZWQuY29tL3Byb2R1Y3RzX3NlcnZpY2VzL2luZGV4Lmh0bWwwEQYJYIZI
-AYb4QgEBBAQDAgAHMIGJBgNVHR8EgYEwfzB9oHugeaR3MHUxEjAQBgNVBAoTCWJlVFJVU1RlZDEb
-MBkGA1UECxMSYmVUUlVTVGVkIFJvb3QgQ0FzMTMwMQYDVQQDEypiZVRSVVNUZWQgUm9vdCBDQSAt
-IEVudHJ1c3QgSW1wbGVtZW50YXRpb24xDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMjAwMjA0
-MTEwODI0MjdagQ8yMDIyMDQxMTA4NTQyN1owCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFH1w5a44
-iwY/qhwaj/nPJDCqhIQWMB0GA1UdDgQWBBR9cOWuOIsGP6ocGo/5zyQwqoSEFjAMBgNVHRMEBTAD
-AQH/MB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEAKrgX
-zh8QlOu4mre5X+za95IkrNySO8cgjfKZ5V04ocI07cUTWVwFtStPYZuR+0H8/NU8TZh2BvWBfevd
-kObRVlTa4y0MnxEylCIBevZsLHRnBMylj44ss0O1lKLQfelifwa+JwGDnjr9iu6YQ0pr17WXOzq/
-T220Y/ozADQuLW2WyXvKmWO6vvT2MKAtmJbpVkQFqUSjYRDrgqFnXbxdJ3Wqiig2KjiS2d2kXgCl
-zMx8KSreKJCrt+G2/30lC0DYqjSjLd4H61/OCt3Kfjp9JsFiaDrmLzfzgYYhxKlkqu9FNtEaZnz4
-6TfW1mG+oq1I59/mdP7TbX3SJdysYlep9w==
------END CERTIFICATE-----
-
-beTRUSTed Root CA - RSA Implementation
-======================================
------BEGIN CERTIFICATE-----
-MIIFaDCCBFCgAwIBAgIQO1nHe81bV569N1KsdrSqGjANBgkqhkiG9w0BAQUFADBiMRIwEAYDVQQK
-EwliZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEvMC0GA1UEAxMmYmVUUlVT
-VGVkIFJvb3QgQ0EgLSBSU0EgSW1wbGVtZW50YXRpb24wHhcNMDIwNDExMTExODEzWhcNMjIwNDEy
-MTEwNzI1WjBiMRIwEAYDVQQKEwliZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENB
-czEvMC0GA1UEAxMmYmVUUlVTVGVkIFJvb3QgQ0EgLSBSU0EgSW1wbGVtZW50YXRpb24wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkujQwCY5X0LkGLG9uJIAiv11DpvpPrILnHGhwhRuj
-brWqeNluB0s/6d/16uhUoWGKDi9pdRi3DOUUjXFumLhV/AyV0Jtu4S2I1DpAa5LxmZZk3tv/ePTu
-lh1HiXzUvrmIdyM6CeYEnm2qXtLIvZpOGd+J6lsOfsPktPDgaTuID0GQ+NRxQyTBjyZLO1bp/4xs
-N+lFrYWMU8NghpBKlsmzVLC7F/AcRdnUGxlkVgoZ98zh/4avflherHqQH8koOUV7orbHnB/ahdQh
-hlkwk75TMzf270HPM8ercmsl9fNTGwxMLvF1S++gh/f+ihXQbNXL+WhTuXAVE8L1LvtDNXUtAgMB
-AAGjggIYMIICFDAMBgNVHRMEBTADAQH/MIIBtQYDVR0gBIIBrDCCAagwggGkBg8rBgEEAbE+AAAD
-CSiDkTEwggGPMEEGCCsGAQUFBwIBFjVodHRwOi8vd3d3LmJldHJ1c3RlZC5jb20vcHJvZHVjdHNf
-c2VydmljZXMvaW5kZXguaHRtbDCCAUgGCCsGAQUFBwICMIIBOhqCATZSZWxpYW5jZSBvbiBvciB1
-c2Ugb2YgdGhpcyBDZXJ0aWZpY2F0ZSBjcmVhdGVzIGFuIGFja25vd2xlZGdtZW50IGFuZCBhY2Nl
-cHRhbmNlIG9mIHRoZSB0aGVuIGFwcGxpY2FibGUgc3RhbmRhcmQgdGVybXMgYW5kIGNvbmRpdGlv
-bnMgb2YgdXNlLCB0aGUgQ2VydGlmaWNhdGlvbiBQcmFjdGljZSBTdGF0ZW1lbnQgYW5kIHRoZSBS
-ZWx5aW5nIFBhcnR5IEFncmVlbWVudCwgd2hpY2ggY2FuIGJlIGZvdW5kIGF0IHRoZSBiZVRSVVNU
-ZWQgd2ViIHNpdGUsIGh0dHA6Ly93d3cuYmV0cnVzdGVkLmNvbS9wcm9kdWN0c19zZXJ2aWNlcy9p
-bmRleC5odG1sMAsGA1UdDwQEAwIBBjAfBgNVHSMEGDAWgBSp7BR++dlDzFMrFK3P9/BZiUHNGTAd
-BgNVHQ4EFgQUqewUfvnZQ8xTKxStz/fwWYlBzRkwDQYJKoZIhvcNAQEFBQADggEBANuXsHXqDMTB
-mMpWBcCorSZIry0g6IHHtt9DwSwddUvUQo3neqh03GZCWYez9Wlt2ames30cMcH1VOJZJEnl7r05
-pmuKmET7m9cqg5c0Lcd9NUwtNLg+DcTsiCevnpL9UGGCqGAHFFPMZRPB9kdEadIxyKbdLrML3kqN
-Wz2rDcI1UqJWN8wyiyiFQpyRQHpwKzg21eFzGh/l+n5f3NacOzDq28BbJ1zTcwfBwvNMm2+fG8oe
-qqg4MwlYsq78B+g23FW6L09A/nq9BqaBwZMifIYRCgZ3SK41ty8ymmFei74pnykkiFY5LKjSq5YD
-WtRIn7lAhAuYaPsBQ9Yb4gmxlxw=
------END CERTIFICATE-----
-
 RSA Security 2048 v3
 ====================
 -----BEGIN CERTIFICATE-----
@@ -1232,22 +928,6 @@ nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA
 pKnXwiJPZ9d37CAFYd4=
 -----END CERTIFICATE-----
 
-RSA Security 1024 v3
-====================
------BEGIN CERTIFICATE-----
-MIICXDCCAcWgAwIBAgIQCgEBAQAAAnwAAAALAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK
-ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMTAyNCBWMzAeFw0wMTAy
-MjIyMTAxNDlaFw0yNjAyMjIyMDAxNDlaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb
-BgNVBAsTFFJTQSBTZWN1cml0eSAxMDI0IFYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDV
-3f5mCc8kPD6ugU5OisRpgFtZO9+5TUzKtS3DJy08rwBCbbwoppbPf9dYrIMKo1W1exeQFYRMiu4m
-mdxY78c4pqqv0I5CyGLXq6yp+0p9v+r+Ek3d/yYtbzZUaMjShFbuklNhCbM/OZuoyZu9zp9+1Blq
-FikYvtc6adwlWzMaUQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAf
-BgNVHSMEGDAWgBTEwBykB5T9zU0B1FTapQxf3q4FWjAdBgNVHQ4EFgQUxMAcpAeU/c1NAdRU2qUM
-X96uBVowDQYJKoZIhvcNAQEFBQADgYEAPy1q4yZDlX2Jl2X7deRyHUZXxGFraZ8SmyzVWujAovBD
-leMf6XbN3Ou8k6BlCsdNT1+nr6JGFLkM88y9am63nd4lQtBU/55oc2PcJOsiv6hy8l4A4Q1OOkNu
-mU4/iXgDmMrzVcydro7BqkWY+o8aoI2II/EVQQ2lRj6RP4vr93E=
------END CERTIFICATE-----
-
 GeoTrust Global CA
 ==================
 -----BEGIN CERTIFICATE-----
@@ -1790,24 +1470,6 @@ Oi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAEo9IEca2on0eisxeewBwMwB9dbB/MjD
 KcJQrSRE7SOzSMtEQMEDlQwKeAYSAfWRMS1Jjbs/RU4s4OjNtckUFQzjB4ObJnXv
 -----END CERTIFICATE-----
 
-IPS Servidores root
-===================
------BEGIN CERTIFICATE-----
-MIICtzCCAiACAQAwDQYJKoZIhvcNAQEEBQAwgaMxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCQVJD
-RUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcGA1UEChMQSVBTIFNlZ3VyaWRhZCBDQTEYMBYG
-A1UECxMPQ2VydGlmaWNhY2lvbmVzMRcwFQYDVQQDEw5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3
-DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTk4MDEwMTIzMjEwN1oXDTA5MTIyOTIzMjEwN1owgaMx
-CzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCQVJDRUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcG
-A1UEChMQSVBTIFNlZ3VyaWRhZCBDQTEYMBYGA1UECxMPQ2VydGlmaWNhY2lvbmVzMRcwFQYDVQQD
-Ew5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQCsT1J0nznqjtwlxLyYXZhkJAk8IbPMGbWOlI6H0fg3PqHILVik
-gDVboXVsHUUMH2Fjal5vmwpMwci4YSM1gf/+rHhwLWjhOgeYlQJU3c0jt4BT18g3RXIGJBK6E2Eh
-im51KODFDzT9NthFf+G4Nu+z4cYgjui0OLzhPvYR3oydAQIDAQABMA0GCSqGSIb3DQEBBAUAA4GB
-ACzzw3lYJN7GO9HgQmm47mSzPWIBubOE3yN93ZjPEKn+ANgilgUTB1RXxafey9m4iEL2mdsUdx+2
-/iU94aI+A6mB0i1sR/WWRowiq8jMDQ6XXotBtDvECgZAHd1G9AHduoIuPD14cJ58GNCr+Lh3B0Zx
-8coLY1xq+XKU1QFPoNtC
------END CERTIFICATE-----
-
 IPS Timestamping root
 =====================
 -----BEGIN CERTIFICATE-----
@@ -2440,34 +2102,6 @@ KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
 QBFGmh95DmK/D5fs4C8fF5Q=
 -----END CERTIFICATE-----
 
-StartCom Ltd.
-=============
------BEGIN CERTIFICATE-----
-MIIFFjCCBH+gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBsDELMAkGA1UEBhMCSUwxDzANBgNVBAgT
-BklzcmFlbDEOMAwGA1UEBxMFRWlsYXQxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xGjAYBgNVBAsT
-EUNBIEF1dGhvcml0eSBEZXAuMSkwJwYDVQQDEyBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eTEhMB8GCSqGSIb3DQEJARYSYWRtaW5Ac3RhcnRjb20ub3JnMB4XDTA1MDMxNzE3Mzc0OFoX
-DTM1MDMxMDE3Mzc0OFowgbAxCzAJBgNVBAYTAklMMQ8wDQYDVQQIEwZJc3JhZWwxDjAMBgNVBAcT
-BUVpbGF0MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMRowGAYDVQQLExFDQSBBdXRob3JpdHkgRGVw
-LjEpMCcGA1UEAxMgRnJlZSBTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAfBgkqhkiG9w0B
-CQEWEmFkbWluQHN0YXJ0Y29tLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7YRgACOe
-yEpRKSfeOqE5tWmrCbIvNP1h3D3TsM+x18LEwrHkllbEvqoUDufMOlDIOmKdw6OsWXuO7lUaHEe+
-o5c5s7XvIywI6Nivcy+5yYPo7QAPyHWlLzRMGOh2iCNJitu27Wjaw7ViKUylS7eYtAkUEKD4/mJ2
-IhULpNYILzUCAwEAAaOCAjwwggI4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgHmMB0GA1Ud
-DgQWBBQcicOWzL3+MtUNjIExtpidjShkjTCB3QYDVR0jBIHVMIHSgBQcicOWzL3+MtUNjIExtpid
-jShkjaGBtqSBszCBsDELMAkGA1UEBhMCSUwxDzANBgNVBAgTBklzcmFlbDEOMAwGA1UEBxMFRWls
-YXQxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xGjAYBgNVBAsTEUNBIEF1dGhvcml0eSBEZXAuMSkw
-JwYDVQQDEyBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS
-YWRtaW5Ac3RhcnRjb20ub3JnggEAMB0GA1UdEQQWMBSBEmFkbWluQHN0YXJ0Y29tLm9yZzAdBgNV
-HRIEFjAUgRJhZG1pbkBzdGFydGNvbS5vcmcwEQYJYIZIAYb4QgEBBAQDAgAHMC8GCWCGSAGG+EIB
-DQQiFiBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAyBglghkgBhvhCAQQEJRYjaHR0
-cDovL2NlcnQuc3RhcnRjb20ub3JnL2NhLWNybC5jcmwwKAYJYIZIAYb4QgECBBsWGWh0dHA6Ly9j
-ZXJ0LnN0YXJ0Y29tLm9yZy8wOQYJYIZIAYb4QgEIBCwWKmh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9y
-Zy9pbmRleC5waHA/YXBwPTExMTANBgkqhkiG9w0BAQQFAAOBgQBscSXhnjSRIe/bbL0BCFaPiNhB
-OlP1ct8nV0t2hPdopP7rPwl+KLhX6h/BquL/lp9JmeaylXOWxkjHXo0Hclb4g4+fd68p00UOpO6w
-NnQt8M2YI3s3S9r+UZjEHjQ8iP2ZO1CnwYszx8JSFhKVU2Ui77qLzmLbcCOxgN8aIDjnfg==
------END CERTIFICATE-----
-
 StartCom Certification Authority
 ================================
 -----BEGIN CERTIFICATE-----
@@ -3309,8 +2943,8 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
 WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
 -----END CERTIFICATE-----
 
-AC Ra+¡z Certic+ímara S.A.
-==========================
+AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.
+======================================
 -----BEGIN CERTIFICATE-----
 MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT
 AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg
@@ -3507,3 +3141,770 @@ hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
 X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
 WL1WMRJOEcgh4LMRkWXbtKaIOM5V
 -----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
+=============================================================================================================================
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
+DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
+aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
+b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
+BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
+S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
+MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
+IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
+n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
+IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
+dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
+cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
+Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
+xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
+6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
+BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
+N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
+y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
+LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
+dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+Buypass Class 2 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2
+MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M
+cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83
+0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4
+0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R
+uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV
+1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt
+7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2
+fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
+wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+
+Buypass Class 3 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
+MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
+ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
+n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
+AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
+1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
+pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
+EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
+htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
+el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
+-----END CERTIFICATE-----
+
+EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
+==========================================================================
+-----BEGIN CERTIFICATE-----
+MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VCRyBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMTcwNQYDVQQKDC5FQkcg
+QmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAe
+Fw0wNjA4MTcwMDIxMDlaFw0xNjA4MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25p
+ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2lt
+IFRla25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h4fuXd7hxlugTlkaDT7by
+X3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAktiHq6yOU/im/+4mRDGSaBUorzAzu8T2b
+gmmkTPiab+ci2hC6X5L8GCcKqKpE+i4stPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfr
+eYteIAbTdgtsApWjluTLdlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZ
+TqNGFav4c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8UmTDGy
+Y5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z+kI2sSXFCjEmN1Zn
+uqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0OLna9XvNRiYuoP1Vzv9s6xiQFlpJI
+qkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMWOeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vm
+ExH8nYQKE3vwO9D8owrXieqWfo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0
+Nokb+Clsi7n2l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgwFoAU587GT/wW
+Z5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+8ygjdsZs93/mQJ7ANtyVDR2t
+FcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgm
+zJNSroIBk5DKd8pNSe/iWtkqvTDOTLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64k
+XPBfrAowzIpAoHMEwfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqT
+bCmYIai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJnxk1Gj7sU
+RT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4QDgZxGhBM/nV+/x5XOULK
+1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9qKd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt
+2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11thie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQ
+Y9iJSrSq3RZj9W6+YKH47ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9
+AahH3eU7QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+CNNIC ROOT
+==========
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
+ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
+OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
+o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
+VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
+VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
+czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
+y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
+wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
+lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
+Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
+O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
+BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
+G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
+mxE=
+-----END CERTIFICATE-----
+
+ApplicationCA - Japanese Government
+===================================
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
+SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
+MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
+cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
+fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
+wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
+jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
+nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
+WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
+BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
+vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
+o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
+/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
+io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
+dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+============================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
+5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
+vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
+CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
+e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
+OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
+CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
+48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
+trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
+qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
+AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
+ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
+A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
++51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
+f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
+kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
+CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
+URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
+CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
+oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
+IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
+66+KAQ==
+-----END CERTIFICATE-----
+
+CA Disig
+========
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
+QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
+MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
+bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
+GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
+Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
+hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
+ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
+gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
+AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
+aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
+ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
+BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
+WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
+mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
+ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
+4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+
+Juur-SK
+=======
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA
+c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw
+DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG
+SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy
+aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf
+TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC
++Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw
+UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa
+Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF
+MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD
+HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh
+AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA
+cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr
+AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw
+cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G
+A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo
+ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL
+abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678
+IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh
+Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2
+yyqcjg==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+ACEDICOM Root
+=============
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UEAwwNQUNFRElD
+T00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMB4XDTA4
+MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEWMBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoG
+A1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHk
+WLn709gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7XBZXehuD
+YAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5PGrjm6gSSrj0RuVFCPYew
+MYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAKt0SdE3QrwqXrIhWYENiLxQSfHY9g5QYb
+m8+5eaA9oiM/Qj9r+hwDezCNzmzAv+YbX79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbk
+HQl/Sog4P75n/TSW9R28MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTT
+xKJxqvQUfecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI2Sf2
+3EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyHK9caUPgn6C9D4zq9
+2Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEaeZAwUswdbxcJzbPEHXEUkFDWug/Fq
+TYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz
+4SsrSbbXc6GqlPUB53NlTKxQMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU
+9QHnc2VMrFAwRAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
+bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWImfQwng4/F9tqg
+aHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3gvoFNTPhNahXwOf9jU8/kzJP
+eGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKeI6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1Pwk
+zQSulgUV1qzOMPPKC8W64iLgpq0i5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1
+ThCojz2GuHURwCRiipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oI
+KiMnMCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZo5NjEFIq
+nxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6zqylfDJKZ0DcMDQj3dcE
+I2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacNGHk0vFQYXlPKNFHtRQrmjseCNj6nOGOp
+MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o
+tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA==
+-----END CERTIFICATE-----
+
+Verisign Class 1 Public Primary Certification Authority
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
+XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAx
+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDlGb9to1ZhLZlIcfZn3rmN67eehoAKkQ76OCWvRoiC5XOooJskXQ0fzGVuDLDQ
+VoQYh5oGmxChc9+0WDlrbsH2FdWoqD+qEgaNMax/sDTXjzRniAnNFBHiTkVWaR94AoDa3EeRKbs2
+yWNcxeDXLYd7obcysHswuiovMaruo2fa2wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFgVKTk8d6Pa
+XCUDfGD67gmZPCcQcMgMCeazh88K4hiWNWLMv5sneYlfycQJ9M61Hd8qveXbhpxoJeUwfLaJFf5n
+0a3hUKw8fGJLj7qE1xIVGx/KXQ/BUpQqEZnae88MNhPVNdwQGVnqlMEAv3WP2fr9dgTbYruQagPZ
+RjXZ+Hxb
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
+XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
+f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
+hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABByUqkFFBky
+CEHwxWsKzH4PIRnN5GfcX6kb5sroc50i2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWX
+bj9T/UWZYB2oK0z5XqcJ2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/
+D/xwzoiQ
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
+===================================================
+-----BEGIN CERTIFICATE-----
+MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz
+ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3
+MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0
+cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u
+aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY
+8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y
+jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI
+JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk
+9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD
+AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG
+SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d
+F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq
+D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4
+Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
+fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+TC TrustCenter Universal CA III
+===============================
+-----BEGIN CERTIFICATE-----
+MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
+IFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAe
+Fw0wOTA5MDkwODE1MjdaFw0yOTEyMzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNU
+QyBUcnVzdENlbnRlciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0Ex
+KDAmBgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF5+cvAqBNLaT6hdqbJYUt
+QCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYvDIRlzg9uwliT6CwLOunBjvvya8o84pxO
+juT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8vzArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+Eut
+CHnNaYlAJ/Uqwa1D7KRTyGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1
+M4BDj5yjdipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBhMB8G
+A1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI4jANBgkqhkiG9w0BAQUFAAOCAQEA
+g8ev6n9NCjw5sWi+e22JLumzCecYV42FmhfzdkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+
+KGwWaODIl0YgoGhnYIg5IFHYaAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhK
+BgePxLcHsU0GDeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV
+CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPHLQNjO9Po5KIq
+woIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg==
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
+EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
+MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
+QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
+03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
+ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
+PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
+OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
+F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
+0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
+leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
+AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
+SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
+NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
+Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
+kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
+hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
+g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
+aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
+nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
+ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
+Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
+WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
diff --git a/source/n/curl/curl.SlackBuild b/source/n/curl/curl.SlackBuild
index 1249dcb82..39f632c52 100755
--- a/source/n/curl/curl.SlackBuild
+++ b/source/n/curl/curl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,6 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+PKGNAM=curl
 VERSION=${VERSION:-$(echo curl-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
@@ -98,14 +99,22 @@ strip -g $PKG/usr/lib${LIBDIRSUFFIX}/libcurl.a
 
 mkdir -p $PKG/usr/doc/curl-$VERSION
 cp -a \
-  CHANGES COPYING README UPGRADE \
+  COPYING* README* UPGRADE \
   $PKG/usr/doc/curl-$VERSION
 ( cd docs
   rm -rf Makefile* curl-config.1 curl-config.html curl.1 curl.html libcurl
   cp -a \
-    BUGS CONTRIBUTE FAQ FEATURES INSTALL INTERNALS MANUAL README.win32 RESOURCES THANKS TODO examples \
+    BUGS CONTRIBUTE FAQ FEATURES INSTALL INTERNALS MANUAL README* RESOURCES THANKS TODO examples \
     $PKG/usr/doc/curl-$VERSION )
 
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGES | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r CHANGES $DOCSDIR/ChangeLog
+fi
+
 # Compress and if needed symlink the man pages:
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man
diff --git a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild
index c4aebb481..27512039e 100755
--- a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild
+++ b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=2.1.23
-ARCH=${ARCH:-x86_64}
+PKGNAM=cyrus-sasl
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-cyrus-sasl
@@ -37,14 +47,17 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf cyrus-sasl-$VERSION
-tar xvf $CWD/cyrus-sasl-$VERSION.tar.?z*
-cd cyrus-sasl-$VERSION
+tar xvf $CWD/cyrus-sasl-$VERSION.tar.?z* || exit 1
+cd cyrus-sasl-$VERSION || exit 1
 chown -R root:root .
 find . -perm 777 -exec chmod 755 {} \;
 find . -perm 664 -exec chmod 644 {} \;
@@ -66,8 +79,8 @@ CFLAGS="$SLKCFLAGS" \
 # How stupid that I need to specify 'sasldir' again for 'make' or else you get
 # the warning "Plugins are being installed into /usr/lib/sasl2, but the library
 # will look for them in /usr/lib64/sasl2" and advised to create a symlink...
-make sasldir=/usr/lib${LIBDIRSUFFIX}/sasl2
-make sasldir=/usr/lib${LIBDIRSUFFIX}/sasl2 install DESTDIR=$PKG
+make sasldir=/usr/lib${LIBDIRSUFFIX}/sasl2 || exit 1
+make sasldir=/usr/lib${LIBDIRSUFFIX}/sasl2 install DESTDIR=$PKG || exit 1
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -81,7 +94,7 @@ cat saslauthd/saslauthd.mdoc > $PKG/usr/man/man8/saslauthd.8
 gzip -9 $PKG/usr/man/man?/*.?
 mkdir -p $PKG/usr/doc/cyrus-sasl-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS README README.andrew \
+  AUTHORS COPYING* INSTALL NEWS README* \
   doc \
   $PKG/usr/doc/cyrus-sasl-$VERSION
 find $PKG/usr/doc/cyrus-sasl-$VERSION -type f -exec chmod 644 {} \;
diff --git a/source/n/dhcp/dhcp-remove-bind-tarball.sh b/source/n/dhcp/dhcp-remove-bind-tarball.sh
new file mode 100755
index 000000000..5249f9679
--- /dev/null
+++ b/source/n/dhcp/dhcp-remove-bind-tarball.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=dhcp
+VERSION=${VERSION:-4.2.1-P1}
+BUILD=${BUILD:-1}
+
+# This is not yet used, but eventually we would like to be able to purge
+# the bundled BIND and use the system's instead.  Maybe wishful thinking.
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+
+cd $TMP
+rm -rf dhcp-$VERSION
+tar xvf $CWD/dhcp-$VERSION.tar.?z* || exit 1
+cd dhcp-$VERSION || exit 1
+
+# good "bob" why? ...
+rm -rf bind/*
+
+# Generate a new .xz compressed tarball in /tmp:
+cd $TMP
+rm -f dhcp-$VERSION.tar*
+tar cf dhcp-$VERSION.tar dhcp-$VERSION
+xz -9 dhcp-$VERSION.tar
+
+echo "$TMP/dhcp-$VERSION.tar.xz created"
+
diff --git a/source/n/dhcp/dhcp.SlackBuild b/source/n/dhcp/dhcp.SlackBuild
index 6baf041a7..c328b3cba 100755
--- a/source/n/dhcp/dhcp.SlackBuild
+++ b/source/n/dhcp/dhcp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-$(echo dhcp-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+PKGNAM=dhcp
+# Leave this one .gz as other compressors do not help much and we can keep
+# the original upstream .asc
+VERSION=${VERSION:-$(basename $(echo $PKGNAM-*.tar.gz | cut -f 2- -d -) .tar.gz)}
+BUILD=${BUILD:-1}
+
+PKG_VERSION=$(echo $VERSION | tr - _)
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -59,7 +64,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf dhcp-$VERSION
-tar xvf $CWD/dhcp-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/dhcp-$VERSION.tar.gz || exit 1
 cd dhcp-$VERSION || exit 1
 
 chown -R root:root .
@@ -102,12 +107,12 @@ mv $PKG/usr/sbin/dhclient $PKG/sbin
 cat client/scripts/linux > $PKG/sbin/dhclient-script
 chmod 700 $PKG/sbin/dhclient-script
 
+# Create the initial *.leases files:
 mkdir -p $PKG/var/state/dhcp
-# The daemon should create these automatically as needed
-#touch $PKG/var/state/dhcp/dhcpd.leases.new
-#touch $PKG/var/state/dhcp/dhcpd6.leases.new
-#touch $PKG/var/state/dhcp/dhclient.leases.new
-#touch $PKG/var/state/dhcp/dhclient6.leases.new
+touch $PKG/var/state/dhcp/dhcpd.leases.new
+touch $PKG/var/state/dhcp/dhcpd6.leases.new
+touch $PKG/var/state/dhcp/dhclient.leases.new
+touch $PKG/var/state/dhcp/dhclient6.leases.new
 
 cat << EOF > $PKG/etc/dhcpd.conf.new
 # dhcpd.conf
@@ -153,10 +158,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/dhcp-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/dhcp-$PKG_VERSION-$ARCH-$BUILD.txz
 
-# Clean up the extra stuff:
-if [ "$1" = "--cleanup" ]; then
- rm -rf $TMP/dhcp-$VERSION
- rm -rf $PKG
-fi
diff --git a/source/n/dhcp/doinst.sh b/source/n/dhcp/doinst.sh
index 88d284f65..a376034a5 100644
--- a/source/n/dhcp/doinst.sh
+++ b/source/n/dhcp/doinst.sh
@@ -13,9 +13,9 @@ config() {
 
 config etc/dhcpd.conf.new
 config etc/dhclient.conf.new
-#config var/state/dhcp/dhcpd.leases.new
-#config var/state/dhcp/dhcpd6.leases.new
-#config var/state/dhcp/dhclient.leases.new
-#config var/state/dhcp/dhclient6.leases.new
-#rm -f var/state/dhcp/*.leases.new
+config var/state/dhcp/dhcpd.leases.new
+config var/state/dhcp/dhcpd6.leases.new
+config var/state/dhcp/dhclient.leases.new
+config var/state/dhcp/dhclient6.leases.new
+rm -f var/state/dhcp/*.leases.new
 
diff --git a/source/n/dhcpcd/50-ntp.conf.diff b/source/n/dhcpcd/50-ntp.conf.diff
index d86c299e2..63fd914b4 100644
--- a/source/n/dhcpcd/50-ntp.conf.diff
+++ b/source/n/dhcpcd/50-ntp.conf.diff
@@ -1,19 +1,29 @@
-diff -Nur dhcpcd-5.1.0.orig/dhcpcd-hooks/50-ntp.conf dhcpcd-5.1.0/dhcpcd-hooks/50-ntp.conf
---- dhcpcd-5.1.0.orig/dhcpcd-hooks/50-ntp.conf	2009-09-02 15:21:11.000000000 -0500
-+++ dhcpcd-5.1.0/dhcpcd-hooks/50-ntp.conf	2009-09-12 00:36:04.447859980 -0500
-@@ -8,14 +8,8 @@
+--- ./dhcpcd-hooks/50-ntp.conf.orig	2010-11-19 04:17:14.000000000 -0600
++++ ./dhcpcd-hooks/50-ntp.conf	2010-12-29 16:07:48.000000000 -0600
+@@ -8,6 +8,26 @@
  #   NTP_CONF=/usr/pkg/etc/ntpd.conf
  # to use openntpd from pkgsrc instead of the system provided ntp.
  
--# Detect OpenRC or BSD rc
--# Distributions may want to just have their command here instead of this
--if type rc-service >/dev/null 2>&1 && rc-service --exists ntpd; then
--	ntpd_restart_cmd="rc-service ntpd -- -Ds restart"
--elif [ -x /etc/rc.d/ntpd ]; then
-+if [ -x /etc/rc.d/ntpd ]; then
- 	ntpd_restart_cmd="/etc/rc.d/ntpd status >/dev/null 2>&1 && /etc/rc.d/ntpd restart"
--elif [ -x /usr/local/etc/rc.d/ntpd ]; then
--	ntpd_restart_cmd="/usr/local/etc/rc.d/ntpd status >/dev/null 2>&1 && /usr/local/etc/rc.d/ntpd restart"
- fi
- 
- ntp_conf_dir="$state_dir/ntp.conf"
++# Detect OpenRC, Debian or BSD rc
++# Distributions may want to just have their command here instead of this
++if type rc-service >/dev/null 2>&1 && rc-service --exists ntpd; then
++        ntpd_restart_cmd="rc-service ntpd -- -Ds restart"
++elif type invoke-rc.d >/dev/null 2>&1; then
++        if [ -x /etc/init.d/ntp ]; then
++                ntpd_restart_cmd="invoke-rc.d ntp try-restart"
++        fi
++        # Debian as a seperate file for DHCP config to avoid stamping on
++        # the master.
++        [ -e /var/lib/ntp ] || mkdir /var/lib/ntp
++        : ${NTP_DHCP_CONF:=/var/lib/ntp/ntp.conf.dhcp}
++elif [ -x /etc/rc.d/ntpd ]; then
++        ntpd_restart_cmd="/etc/rc.d/ntpd status >/dev/null 2>&1 && /etc/rc.d/ntpd restart"
++elif [ -x /usr/local/etc/rc.d/ntpd ]; then
++        ntpd_restart_cmd="/usr/local/etc/rc.d/ntpd status >/dev/null 2>&1 && /usr/local/etc/rc.d/ntpd restart"
++elif [ -x /etc/rc.d/rc.ntpd ]; then
++        ntpd_restart_cmd="/etc/rc.d/rc.ntpd status >/dev/null 2>&1 && /etc/rc.d/rc.ntpd restart"
++fi
++
+ : ${ntpd_restart_cmd:=service_condcommand ntpd restart}
+ if type invoke-rc.d >/dev/null 2>&1; then
+ 	# Debian has a seperate file for DHCP config to avoid stamping on
diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild
index 3ee95a902..c50048ae9 100755
--- a/source/n/dhcpcd/dhcpcd.SlackBuild
+++ b/source/n/dhcpcd/dhcpcd.SlackBuild
@@ -104,7 +104,7 @@ mv $PKG/etc/dhcpcd.conf $PKG/etc/dhcpcd.conf.new
 )
 
 mkdir -p $PKG/usr/doc/dhcpcd-$VERSION
-cp -a README $PKG/usr/doc/dhcpcd-$VERSION
+cp -a README* $PKG/usr/doc/dhcpcd-$VERSION
 zcat $CWD/COPYRIGHT.gz > $PKG/usr/doc/dhcpcd-$VERSION/COPYRIGHT
 
 mkdir -p $PKG/install
@@ -113,3 +113,4 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/dhcpcd-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/n/dirmngr/dirmngr.SlackBuild b/source/n/dirmngr/dirmngr.SlackBuild
index 1fb2e89c0..4c1b4a72d 100755
--- a/source/n/dirmngr/dirmngr.SlackBuild
+++ b/source/n/dirmngr/dirmngr.SlackBuild
@@ -24,7 +24,7 @@
 
 PKGNAM=dirmngr
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -79,8 +79,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --enable-static=no \
-  --enable-shared=yes \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux
 
diff --git a/source/n/elm/elm.SlackBuild b/source/n/elm/elm.SlackBuild
index 8aabca000..6ce92b466 100755
--- a/source/n/elm/elm.SlackBuild
+++ b/source/n/elm/elm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=2.5.8
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
diff --git a/source/n/ethtool/ethtool.SlackBuild b/source/n/ethtool/ethtool.SlackBuild
index ebe0919fd..388f46e8e 100755
--- a/source/n/ethtool/ethtool.SlackBuild
+++ b/source/n/ethtool/ethtool.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.6.33
+PKGNAM=ethtool
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -43,7 +44,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ethtool-$VERSION
-tar xzf $CWD/ethtool-$VERSION.tar.gz || exit 1
+tar xvf $CWD/ethtool-$VERSION.tar.?z* || exit 1
 cd ethtool-$VERSION || exit 1
 chown -R root:root .
 ./configure \
@@ -55,10 +56,18 @@ strip $PKG/usr/sbin/ethtool
 gzip -9 $PKG/usr/man/man8/ethtool.8
 mkdir -p $PKG/usr/doc/ethtool-$VERSION
 cp -a \
-  AUTHORS COPYING* ChangeLog LICENSE NEWS README* \
+  AUTHORS COPYING* LICENSE NEWS README* \
   $PKG/usr/doc/ethtool-$VERSION
 chmod 644 $PKG/usr/doc/ethtool-$VERSION/*
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 # Finish up the package:
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/n/fetchmail/fetchmail.SlackBuild b/source/n/fetchmail/fetchmail.SlackBuild
index a69cef4d4..16cc31230 100755
--- a/source/n/fetchmail/fetchmail.SlackBuild
+++ b/source/n/fetchmail/fetchmail.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=fetchmail
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -55,7 +55,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf fetchmail-$VERSION
-tar xvf $CWD/fetchmail-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/fetchmail-$VERSION.tar.xz || exit 1
 cd fetchmail-$VERSION || exit 1
 
 # this is the sloppiest source tarball ever
diff --git a/source/n/gnupg/gnupg.SlackBuild b/source/n/gnupg/gnupg.SlackBuild
index 3a0a5b8ab..2a0bce570 100755
--- a/source/n/gnupg/gnupg.SlackBuild
+++ b/source/n/gnupg/gnupg.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.4.10
+VERSION=1.4.11
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -83,11 +83,12 @@ gzip -9 $PKG/usr/man/*/*
 
 mkdir -p $PKG/usr/doc/gnupg-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS README THANKS TODO VERSION \
+  ABOUT-NLS AUTHORS BUGS COPYING* INSTALL NEWS PROJECTS README* THANKS TODO VERSION \
   $PKG/usr/doc/gnupg-$VERSION
-( cd $PKG/usr/doc/gnupg-$VERSION
-  ln -sf /usr/share/gnupg/FAQ .
-  ln -sf /usr/share/gnupg/faq.html . )
+if [ -r $PKG/usr/share/gnupg/FAQ ]; then
+  ( cd $PKG/usr/doc/gnupg-$VERSION
+    ln -sf /usr/share/gnupg/FAQ . )
+fi
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
diff --git a/source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch b/source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch
deleted file mode 100644
index 26c798ee6..000000000
--- a/source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch
+++ /dev/null
@@ -1,65 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-NotDashEscaped: You need GnuPG to verify this message
-
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-agent/
-2010-01-26  Werner Koch  <wk@g10code.com>
-
-	* protect.c (do_encryption): Encode the s2kcount and do not use a
-	static value of 96.
-
---- agent/protect.c	(revision 5231)
-+++ agent/protect.c	(working copy)
-@@ -360,19 +360,25 @@
-        
-      in canoncical format of course.  We use asprintf and %n modifier
-      and dummy values as placeholders.  */
--  p = xtryasprintf
--    ("(9:protected%d:%s((4:sha18:%n_8bytes_2:96)%d:%n%*s)%d:%n%*s)",
--     (int)strlen (modestr), modestr,
--     &saltpos, 
--     blklen, &ivpos, blklen, "",
--     enclen, &encpos, enclen, "");
--  if (!p)
--    {
--      gpg_error_t tmperr = out_of_core ();
--      xfree (iv);
--      xfree (outbuf);
--      return tmperr;
--    }
-+  {
-+    char countbuf[35];
-+
-+    snprintf (countbuf, sizeof countbuf, "%lu", get_standard_s2k_count ());
-+    p = xtryasprintf
-+      ("(9:protected%d:%s((4:sha18:%n_8bytes_%u:%s)%d:%n%*s)%d:%n%*s)",
-+       (int)strlen (modestr), modestr,
-+       &saltpos, 
-+       (unsigned int)strlen (countbuf), countbuf,
-+       blklen, &ivpos, blklen, "",
-+       enclen, &encpos, enclen, "");
-+    if (!p)
-+      {
-+        gpg_error_t tmperr = out_of_core ();
-+        xfree (iv);
-+        xfree (outbuf);
-+        return tmperr;
-+      }
-+  }
-   *resultlen = strlen (p);
-   *result = (unsigned char*)p;
-   memcpy (p+saltpos, iv+2*blklen, 8);
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1.0-svn5201 (GNU/Linux)
-
-iJwEAQECAAYFAktmpLoACgkQU7Yg0BzgxjCj5wQAyZjQbZM77wdcXIgPgeLsG99W
-esWR89/5VM34dY5tOG+McCAiA4/0hl6CYUkkK/394wcfUXbvbZYARPjJg5wMoZsG
-VufEL+Uz+eLgkejYPVakOWzK00i7MHqDSjttOqHg0d8wSiy3LKk6CN6N19uPqxbI
-/1Io5f3gcroLGfEZlN0=
-=oP/V
------END PGP SIGNATURE-----
diff --git a/source/n/gnupg2/gnupg2.SlackBuild b/source/n/gnupg2/gnupg2.SlackBuild
index 1faf1666d..54cdbb3b2 100755
--- a/source/n/gnupg2/gnupg2.SlackBuild
+++ b/source/n/gnupg2/gnupg2.SlackBuild
@@ -24,7 +24,7 @@
 
 PKGNAM=gnupg2
 VERSION=${VERSION:-$(echo gnupg-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -64,8 +64,6 @@ rm -rf gnupg-$VERSION
 tar xvf $CWD/gnupg-$VERSION.tar.?z* || exit 1
 cd gnupg-$VERSION
 
-zcat $CWD/gnupg-2.0.14-encode-s2k.patch.gz | patch -p0 --verbose || exit 1
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/n/gpa/gpa.SlackBuild b/source/n/gpa/gpa.SlackBuild
index e0e67e40e..9c6c0e5f9 100755
--- a/source/n/gpa/gpa.SlackBuild
+++ b/source/n/gpa/gpa.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2006-2007  Robby Workman  (http://rlworkman.net) 
-# Copyright 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,16 +22,25 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PRGNAM=gpa
-VERSION=0.7.5
-ARCH=${ARCH:-x86_64}
+PKGNAM=gpa
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/pkg-$PRGNAM
+PKG=$TMP/pkg-$PKGNAM
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -42,15 +51,18 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG 
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -74,16 +86,24 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING INSTALL NEWS README* THANKS TODO VERSION \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS TODO VERSION \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/n/gpgme/gpgme.SlackBuild b/source/n/gpgme/gpgme.SlackBuild
index a83c158d0..59b9a047e 100755
--- a/source/n/gpgme/gpgme.SlackBuild
+++ b/source/n/gpgme/gpgme.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=gpgme
-VERSION=1.2.0
+VERSION=1.3.0
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/n/htdig/htdig.SlackBuild b/source/n/htdig/htdig.SlackBuild
index 1451b4c29..b915314b2 100755
--- a/source/n/htdig/htdig.SlackBuild
+++ b/source/n/htdig/htdig.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,19 @@
 
 PKGNAM=htdig
 VERSION=${VERSION:-3.2.0b6}
-ARCH=${ARCH:-x86_64}
 NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild
index 009537769..a97ccf362 100755
--- a/source/n/httpd/httpd.SlackBuild
+++ b/source/n/httpd/httpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 
 
 PKGNAM=httpd
-VERSION=${VERSION:-2.2.15}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -83,6 +83,9 @@ find . \
 
 zcat $CWD/config.layout.diff.gz | sed -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" | patch --verbose -p1 || exit 1
 
+# Patch to fix aliasing issue exposed by gcc-4.5.1:
+zcat $CWD/httpd.brigade_move.__noinline__.gcc451.diff.gz | patch --verbose -p1 || exit 1
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -125,7 +128,7 @@ rmdir $PKG/usr/bin
 ( cd $PKG
   zcat $CWD/httpd.nossldefault.diff.gz | sed -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" | patch -p1 --verbose || exit 1
   zcat $CWD/httpd.runasapache.diff.gz | patch -p1 --verbose || exit 1
-  rm -f $PKG/etc/httpd/httpd.conf~
+  rm -f $PKG/etc/httpd/httpd.conf~ $PKG/etc/httpd/httpd.conf.orig
 ) || exit 1
 # Change config files to .new:
 ( cd $PKG/etc/httpd
diff --git a/source/n/httpd/httpd.brigade_move.__noinline__.gcc451.diff b/source/n/httpd/httpd.brigade_move.__noinline__.gcc451.diff
new file mode 100644
index 000000000..e8915ae43
--- /dev/null
+++ b/source/n/httpd/httpd.brigade_move.__noinline__.gcc451.diff
@@ -0,0 +1,10 @@
+--- ./server/core_filters.c.orig	2010-02-26 03:32:15.000000000 -0600
++++ ./server/core_filters.c	2011-02-12 13:23:22.000000000 -0600
+@@ -83,6 +83,7 @@
+  *
+  * XXXX: Should this function be added to APR-Util?
+  */
++__attribute__((__noinline__))
+ static void brigade_move(apr_bucket_brigade *b, apr_bucket_brigade *a,
+                          apr_bucket *e)
+ {
diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url
new file mode 100644
index 000000000..8b8a17686
--- /dev/null
+++ b/source/n/httpd/httpd.url
@@ -0,0 +1,2 @@
+http://www.apache.org/dist/httpd/httpd-2.2.17.tar.bz2
+http://www.apache.org/dist/httpd/httpd-2.2.17.tar.bz2.asc
diff --git a/source/n/httpd/logrotate.httpd b/source/n/httpd/logrotate.httpd
index 30cee8a23..cc6383674 100644
--- a/source/n/httpd/logrotate.httpd
+++ b/source/n/httpd/logrotate.httpd
@@ -1,6 +1,7 @@
 /var/log/httpd/*_log {
   rotate 10
   notifempty
+  missingok
   size=5M
   compress
   delaycompress
diff --git a/source/n/icmpinfo/icmpinfo.SlackBuild b/source/n/icmpinfo/icmpinfo.SlackBuild
index 685bc7ad6..c783e78fe 100755
--- a/source/n/icmpinfo/icmpinfo.SlackBuild
+++ b/source/n/icmpinfo/icmpinfo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.11
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
diff --git a/source/n/idnkit/idnkit.SlackBuild b/source/n/idnkit/idnkit.SlackBuild
new file mode 100755
index 000000000..c4603bc0f
--- /dev/null
+++ b/source/n/idnkit/idnkit.SlackBuild
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=idnkit
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 2 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+fi
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION-src.tar.?z* || exit 1
+cd ${PKGNAM}-$VERSION-src || exit 1
+
+# Make sure ownerships and permissions are sane:
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-shared \
+  --disable-static \
+  --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Fix library perms:
+chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Since idnkit appears to work here without configuration files installed,
+# we will only install these as *.sample:
+rm -f $PKG/etc/*.conf
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.* 2> /dev/null
+      )
+    done
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  COPYING* INSTALL* LICENSE* NEWS README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
+
diff --git a/source/n/idnkit/slack-desc b/source/n/idnkit/slack-desc
new file mode 100644
index 000000000..7c4cdf0c4
--- /dev/null
+++ b/source/n/idnkit/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+idnkit: idnkit (Internationalized domain names toolkit)
+idnkit:
+idnkit: idnkit is a toolkit for handling internationalized domain names.
+idnkit: It includes a library for handling internationalized domain names
+idnkit: (libidnkit, libidnkitlite), a codeset conversion utility (idnconv),
+idnkit: and a command which adds IDN dynamically to applications (runidn).
+idnkit:
+idnkit:
+idnkit:
+idnkit: Homepage: http://www.nic.ad.jp/en/idn/
+idnkit:
diff --git a/source/n/imapd b/source/n/imapd
new file mode 120000
index 000000000..0120374ca
--- /dev/null
+++ b/source/n/imapd
@@ -0,0 +1 @@
+alpine
\ No newline at end of file
diff --git a/source/n/inetd/inetd.SlackBuild b/source/n/inetd/inetd.SlackBuild
index 8a86a3509..479b5ebbb 100755
--- a/source/n/inetd/inetd.SlackBuild
+++ b/source/n/inetd/inetd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.79s
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-8}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-inetd
diff --git a/source/n/iproute2/iproute2.SlackBuild b/source/n/iproute2/iproute2.SlackBuild
index d9e8622cd..929aa7b91 100755
--- a/source/n/iproute2/iproute2.SlackBuild
+++ b/source/n/iproute2/iproute2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 # Build this against 2.6.x kernel source and headers...
 
-VERSION=2.6.33
+VERSION=2.6.37
 BUILD=${BUILD:-1}
 
 #NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -70,7 +70,7 @@ find . \
   -exec chmod 644 {} \;
 
 # Fix up path to bdb and iptables libs
-zcat $CWD/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff.gz | sed \
+zcat $CWD/iproute2.fixup_dbpath_and_iptablespath.diff.gz | sed \
   -e "s,@LIBDIR@,/usr/lib${LIBDIRSUFFIX},g" \
   -e "s,@VERSION@,$VERSION,g" | patch -p1 || exit 1
 
@@ -134,6 +134,14 @@ mkdir -p $PKG/usr/doc/iproute2-$VERSION
 cp -a COPYING RE* \
   $PKG/usr/doc/iproute2-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/n/iproute2/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff b/source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff
index fe5b1abc4..fe5b1abc4 100644
--- a/source/n/iproute2/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff
+++ b/source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff
diff --git a/source/n/iptables/iptables.SlackBuild b/source/n/iptables/iptables.SlackBuild
index a9dc37bd5..0d191b3c7 100755
--- a/source/n/iptables/iptables.SlackBuild
+++ b/source/n/iptables/iptables.SlackBuild
@@ -80,26 +80,11 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Strip binaries:
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null
 
-# Compress and link manpages, if any:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/iptables-$VERSION
 cp -a \
diff --git a/source/n/iptraf-ng/iptraf-ng.SlackBuild b/source/n/iptraf-ng/iptraf-ng.SlackBuild
new file mode 100755
index 000000000..c2841c069
--- /dev/null
+++ b/source/n/iptraf-ng/iptraf-ng.SlackBuild
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=iptraf-ng
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+cd $TMP
+rm -rf $PKG
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/var/lib/iptraf
+mkdir -p $PKG//var/run/iptraf
+mkdir -p $PKG/var/log/iptraf
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  Documentation \
+  FAQ INSTALL LICENSE README* RELEASE-NOTES \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES
+  touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
+# crud removal
+( cd $PKG/usr/doc/$PKGNAM-$VERSION/Documentation
+  rm -rf manual.aux manual.dvi *.log manual.rtf manual.sgml manual.template* .xvpics .log
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/n/iptraf-ng/slack-desc b/source/n/iptraf-ng/slack-desc
new file mode 100644
index 000000000..3d7e4470d
--- /dev/null
+++ b/source/n/iptraf-ng/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+iptraf-ng: iptraf-ng (console-based network monitoring program)
+iptraf-ng:
+iptraf-ng: IPTraf is a console-based network monitoring program for Linux that
+iptraf-ng: displays information about IP traffic such as:
+iptraf-ng:
+iptraf-ng:   Current TCP connections, types of IP packets, packet and byte
+iptraf-ng:   counts, TCP/UDP counts by ports, packet counts by packet sizes,
+iptraf-ng:   packet and byte counts by IP address, interface activity, flag
+iptraf-ng:   statuses on TCP packets, and other LAN station statistics.
+iptraf-ng:
+iptraf-ng: iptraf-ng was written by Gerard Paul Java.
diff --git a/source/n/iptraf/iptraf.SlackBuild b/source/n/iptraf/iptraf.SlackBuild
deleted file mode 100755
index a4bb452b9..000000000
--- a/source/n/iptraf/iptraf.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-VERSION=${VERSION:-3.0.0}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-3}
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-iptraf
-
-cd $TMP
-rm -rf $PKG
-rm -rf iptraf-$VERSION
-tar xvf $CWD/iptraf-$VERSION.tar.gz || exit 1
-cd iptraf-$VERSION
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-zcat $CWD/iptraf_3.0.0-6.diff.gz | patch -p1 || exit 1
-zcat $CWD/iptraf.paths.diff.gz | patch -p1 || exit 1
-cd src
-
-make -j2 || exit 1
-
-mkdir -p $PKG/usr/sbin
-cp iptraf rawtime rvnamed $PKG/usr/sbin
-chmod 755 $PKG/usr/sbin/*
-
-cd ..
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/var/cache/iptraf
-mkdir -p $PKG//var/run/iptraf
-mkdir -p $PKG/var/log/iptraf
-
-mkdir -p $PKG/usr/doc/iptraf-$VERSION
-cp -a \
-  CHANGES Documentation FAQ INSTALL LICENSE README* RELEASE-NOTES \
-  $PKG/usr/doc/iptraf-$VERSION
-
-mkdir -p $PKG/usr/man/man8
-mv $PKG/usr/doc/iptraf-$VERSION/Documentation/iptraf.8 $PKG/usr/man/man8
-if [ -r $PKG/usr/doc/iptraf-$VERSION/Documentation/rawtime.8 ]; then
-  mv $PKG/usr/doc/iptraf-$VERSION/Documentation/rawtime.8 $PKG/usr/man/man8
-fi
-mv $PKG/usr/doc/iptraf-$VERSION/Documentation/rvnamed.8 $PKG/usr/man/man8
-gzip -9 $PKG/usr/man/man8/*
-
-# crud removal
-( cd $PKG/usr/doc/iptraf-$VERSION/Documentation
-  rm -rf manual.aux manual.dvi *.log manual.rtf manual.sgml manual.template .xvpics .log
-)
-
-rm -f $PKG/usr/doc/iptraf-$VERSION/Documentation/manual.template.gz
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/iptraf-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/iptraf/iptraf.paths.diff b/source/n/iptraf/iptraf.paths.diff
deleted file mode 100644
index 4251b46d5..000000000
--- a/source/n/iptraf/iptraf.paths.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./src/Makefile.orig	2003-03-14 13:39:46.000000000 -0800
-+++ ./src/Makefile	2003-03-14 13:41:15.000000000 -0800
-@@ -68,12 +68,12 @@
- # installation target directory.  The iptraf and rvnamed programs get
- # stored here.  iptraf also exec's rvnamed from this directory.
- 
--TARGET		= /usr/local/bin
-+TARGET		= /usr/sbin
- 
- # The IPTraf working directory; if you change this.  Starting with this
- # version, this definition overrides dirs.h.
- 
--WORKDIR		= /var/local/iptraf
-+WORKDIR		= /var/cache/iptraf
- 
- # The IPTraf log file directory.  IPTraf log files are placed here.
- # This definition overrides dirs.h
diff --git a/source/n/iptraf/iptraf_3.0.0-6.diff b/source/n/iptraf/iptraf_3.0.0-6.diff
deleted file mode 100644
index c524e0deb..000000000
--- a/source/n/iptraf/iptraf_3.0.0-6.diff
+++ /dev/null
@@ -1,1499 +0,0 @@
---- iptraf-3.0.0.orig/Documentation/iptraf.8
-+++ iptraf-3.0.0/Documentation/iptraf.8
-@@ -2,22 +2,22 @@
- .SH NAME
- iptraf \- Interactive Colorful IP LAN Monitor
- .SH SYNOPSIS
--.BR iptraf " { [ " -f " ] [ " -q " ] [ { " -i 
-+.BR iptraf " { [ " \-f " ] [ " \-q " ] [ " \-u " ] [ { " \-i 
- .IR iface " | " 
--.BR -g " | " -d
-+.BR \-g " | " \-d
- .IR iface " | "
--.BR -s
-+.BR \-s
- .IR iface " | "
--.BR -z
-+.BR \-z
- .IR iface " | "
--.BR -l 
-+.BR \-l 
- .IR iface " } [ " 
--.BR -t
-+.BR \-t
- .IR timeout " ] [ "
--.BR -B " [ "
--.BR -L
-+.BR \-B " [ "
-+.BR \-L
- .IR logfile " ] ] ] | [ "
--.BR -h " ] }"
-+.BR \-h " ] }"
- .br
- .SH DESCRIPTION
- .B iptraf
-@@ -30,38 +30,38 @@
- .SH OPTIONS
- These options can also be supplied to the command:
- .TP
--.BI "-i " iface
-+.BI "\-i " iface
- immediately start the IP traffic monitor on the specified interface, or
--all interfaces if "-i all" is specified
-+all interfaces if "\-i all" is specified
- .TP
--.B "-g"
-+.B "\-g"
- immediately start the general interface statistics
- .TP
--.BI "-d " iface
-+.BI "\-d " iface
- allows you to immediately start the detailed on the indicated interface (iface)
- .TP
--.BI "-s " iface
-+.BI "\-s " iface
- allows you to immediately monitor TCP and UDP traffic on the specified interface (iface)
- .TP
--.BI "-z " iface
-+.BI "\-z " iface
- shows packet counts by size on the specified interface
- .TP
--.BI "-l " iface
-+.BI "\-l " iface
- start the LAN station monitor on the specified interface, or all LAN
--interfaces if "-l all" is specified
-+interfaces if "\-l all" is specified
- .TP
--.BI "-t " timeout
-+.BI "\-t " timeout
- tells IPTraf to run the specified facility for only
- .I timeout
- minutes.  This option is used only with one of the above parameters.
- .TP
--.B "-B"
-+.B "\-B"
- redirect standard output to /dev/null, closes standard input, and forks
- the program into the background.  Can be used only with one of the
- facility invocation parameters above.  Send the backgrounded process a
- USR2 signal to terminate.
- .TP
--.B "-L logfile"
-+.B "\-L logfile"
- allows you to specify an alternate log file name.  The default log file
- name is based on either the interface selected (detailed interface
- statistics, TCP/UDP service statistics, packet size breakdown), or the
-@@ -69,15 +69,19 @@
- path is not specified, the log file is placed in
- .B /var/log/iptraf
- .TP
--.B "-f"
-+.B "\-f"
- clears all locks and counters, causing this instance of IPTraf to think
- it's the first one running.  This should only be used to recover from
- an abnormal termination or system crash.
- .TP
--.BI "-q"
-+.B "\-u"
-+allow use of unsupported interfaces as ethernet devices.  This is needed if
-+you changed the name of an interface (ex: ip link set eth0 name foo0)
-+.TP
-+.BI "\-q"
- no longer needed, maintained only for compatibility.
- .TP
--.B "-h"
-+.B "\-h"
- shows a command summary
- .SH SIGNALS
- 
-@@ -86,7 +90,7 @@
- 
- .SH FILES
-  /var/log/iptraf/*.log - log file
-- /var/local/iptraf/* - important IPTraf data files
-+ /var/lib/iptraf/* - important IPTraf data files
- 
- .SH SEE ALSO
-  Documentation/* - complete documentation written by the author
-@@ -96,6 +100,6 @@
- Gerard Paul Java (riker@mozcom.com)
- 
- .SH MANUAL AUTHOR
--Frederic Peters (fpeters@debian.org), using iptraf --help
-+Frederic Peters (fpeters@debian.org), using iptraf \-h
- General manual page modifications by Gerard Paul Java (riker@mozcom.com)
- 
---- iptraf-3.0.0.orig/Documentation/rvnamed.8
-+++ iptraf-3.0.0/Documentation/rvnamed.8
-@@ -11,7 +11,7 @@
- This program is only used by iptraf and, therefore, is useless alone.
- 
- .SH FILES
-- /var/local/iptraf/rvnamed.log - log file
-+ /var/log/iptraf/rvnamed.log - log file
- 
- .SH SEE ALSO
- README.rvnamed - documentation from the author
---- iptraf-3.0.0.orig/src/ifstats.c
-+++ iptraf-3.0.0/src/ifstats.c
-@@ -32,7 +32,7 @@
- #include <arpa/inet.h>
- #include <net/if_arp.h>
- #include <linux/if_packet.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <netinet/ip.h>
- #include <netinet/tcp.h>
- #include <netinet/udp.h>
-@@ -129,7 +129,7 @@
- {
-     FILE *fd;
-     char buf[161];
--    char ifname[10];
-+    char ifname[18];
-     struct iflist *itmp = NULL;
-     struct iflist *tail = NULL;
-     unsigned int index = 0;
-@@ -433,7 +433,7 @@
-     FILE *logfile = NULL;
- 
-     int br;
--    char ifname[10];
-+    char ifname[18];
- 
-     int ch;
- 
-@@ -760,7 +760,7 @@
-     char *tpacket;
-     unsigned int iphlen;
- 
--    char ifname[10];
-+    char ifname[18];
-     struct sockaddr_ll fromaddr;
-     unsigned short linktype;
- 
---- iptraf-3.0.0.orig/src/iptraf.c
-+++ iptraf-3.0.0/src/iptraf.c
-@@ -30,6 +30,7 @@
- #include <panel.h>
- #include <signal.h>
- #include <string.h>
-+#include <locale.h>
- #include <time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -410,7 +411,7 @@
- {
-     printf("\nSyntax:\n");
-     printf
--        ("    iptraf [ -f ] [ { -i iface | -g | -d iface | -s iface | -z iface |\n");
-+        ("    iptraf [ -f ] [ -u ] [ { -i iface | -g | -d iface | -s iface | -z iface |\n");
-     printf
-         ("           -l iface } [ -t timeout ] [ -B ] [ -L logfile ] [-I interval] ] \n\n");
-     printf
-@@ -445,6 +446,8 @@
-         ("-f          - clear all locks and counters.  Use with great caution.\n");
-     printf
-         ("              Normally used to recover from an abnormal termination.\n\n");
-+    printf
-+        ("-u          - allow use of unsupported interfaces as ethernet devices.\n");
-     printf("IPTraf %s Copyright (c) Gerard Paul Java 1997-2004\n",
-            VERSION);
- }
-@@ -499,6 +502,8 @@
-     }
- #endif
- 
-+    setlocale(LC_ALL, "");
-+
-     strcpy(current_logfile, "");
-     strcpy(graphing_logfile, "");
-     strcpy(graphing_filter, "");
-@@ -616,6 +621,18 @@
-     freopen("/dev/null", "r", stdin);
-     freopen("/dev/null", "w", stderr);
- #endif
-+    
-+    /* Check whether LOCKDIR exists (/var/run is on a tmpfs in Ubuntu) */
-+    if(access(LOCKDIR,F_OK) != 0) {
-+	if(mkdir(LOCKDIR, 0700) == -1) {
-+	    fprintf(stderr, "Cannot create %s: %s", LOCKDIR, strerror(errno));
-+	    exit(1);
-+        }
-+	if(chown(LOCKDIR, 0, 0) == -1) {
-+	    fprintf(stderr, "Cannot change owner of %s: %s", LOCKDIR, strerror(errno));
-+	    exit(1);
-+	}
-+    }
- 
-     initscr();
- 
---- iptraf-3.0.0.orig/src/itrafmon.c
-+++ iptraf-3.0.0/src/itrafmon.c
-@@ -604,7 +604,7 @@
-     int curwin = 0;
- 
-     int readlen;
--    char ifname[10];
-+    char ifname[18];
- 
-     unsigned long long total_pkts = 0;
- 
---- iptraf-3.0.0.orig/src/othptab.c
-+++ iptraf-3.0.0/src/othptab.c
-@@ -16,14 +16,28 @@
- 
- ***/
- 
-+/* ARP protocol opcodes. */
-+#define ARPOP_REQUEST   1               /* ARP request.  */
-+#define ARPOP_REPLY     2               /* ARP reply.  */
-+#define ARPOP_RREQUEST  3               /* RARP request.  */
-+#define ARPOP_RREPLY    4               /* RARP reply.  */
-+#define ARPOP_InREQUEST 8               /* InARP request.  */
-+#define ARPOP_InREPLY   9               /* InARP reply.  */
-+#define ARPOP_NAK       10              /* (ATM)ARP NAK.  */
-+
-+
- #include <asm/types.h>
-+#include "options.h"
-+#include "tcptable.h"
-+/*#include <linux/socket.h>*/
-+#include <linux/if.h>
- #include <linux/if_ether.h>
- #include <linux/if_tr.h>
- #include <linux/if_fddi.h>
-+#include <linux/if_arp.h>
-+#include <netdb.h>
- #include <winops.h>
- #include "arphdr.h"
--#include "options.h"
--#include "tcptable.h"
- #include "othptab.h"
- #include "deskman.h"
- #include "attrs.h"
---- iptraf-3.0.0.orig/src/ifstats.h
-+++ iptraf-3.0.0/src/ifstats.h
-@@ -6,7 +6,7 @@
- ***/
- 
- struct iflist {
--    char ifname[8];
-+    char ifname[18];
-     unsigned int encap;
-     unsigned long long iptotal;
-     unsigned long badtotal;
---- iptraf-3.0.0.orig/src/othptab.h
-+++ iptraf-3.0.0/src/othptab.h
-@@ -9,14 +9,12 @@
- #include <malloc.h>
- #include <string.h>
- #include <sys/types.h>
--#include <sys/socket.h>
--#include <netinet/in.h>
-+#include <linux/socket.h>
- #include <arpa/inet.h>
- #include <netinet/ip_icmp.h>
- #include <netinet/udp.h>
- #include <curses.h>
- #include <panel.h>
--#include <netdb.h>
- #include <linux/if_ether.h>
- #include "servname.h"
- #include "addproto.h"
-@@ -42,7 +40,7 @@
-     int s_fstat;
-     int d_fstat;
-     unsigned int protocol;
--    char iface[8];
-+    char iface[18];
-     unsigned int pkt_length;
- 
-     union {
---- iptraf-3.0.0.orig/src/tcptable.h
-+++ iptraf-3.0.0/src/tcptable.h
-@@ -12,19 +12,17 @@
- #include <fcntl.h>
- #include <curses.h>
- #include <panel.h>
--#include <netdb.h>
- #include <time.h>
- #include <sys/types.h>
--#include <sys/socket.h>
--#include <netinet/in.h>
--#include <arpa/inet.h>
--#include <net/if_arp.h>
- #include <asm/types.h>
-+#include <linux/socket.h>
-+#include <sys/socket.h>
-+#include <linux/net.h>
-+#include <linux/if.h>
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>
- #include <linux/if_fddi.h>
- #include <linux/if_tr.h>
--#include <net/if.h>
- #include <netinet/ip.h>
- #include <netinet/udp.h>
- #include "servname.h"
-@@ -64,7 +62,7 @@
-     unsigned long finack;
-     int partial;
-     int finsent;
--    char ifname[8];
-+    char ifname[18];
-     unsigned int index;
-     int reused;
-     int timedout;
---- iptraf-3.0.0.orig/src/Makefile
-+++ iptraf-3.0.0/src/Makefile
-@@ -31,11 +31,12 @@
- # options to be passed to the compiler.  I don't believe they need to be
- # modified (except for -m486 on non-Intel x86 platforms).
- 
--CFLAGS		= -Wall #-O2 #-m486
-+CFLAGS		= -Wall -g #-O2 #-m486
- DIRS		= -DWORKDIR=\"$(WORKDIR)\" \
- 		  -DLOGDIR=\"$(LOGDIR)\" -DEXECDIR=\"$(TARGET)\"
- LDOPTS		= #-static
- 
-+
- # you may want to change this to point to your ncurses include directory
- # if the ncurses include files are not in the default location.
- 
-@@ -139,13 +140,11 @@
- 
- cleano:
- 	rm -f *.o *~
--	strip iptraf
--	strip rvnamed
- 
- # installation rule
- 
- install:
--	@./install.sh $(TARGET) $(WORKDIR) $(LOGDIR) $(LOCKDIR)
-+	@./install.sh $(TARGET) $(WORKDIR) $(LOGDIR) $(LOCKDIR) $(DESTDIR)
- 
- # Upgrade rule
- #
-@@ -170,7 +169,6 @@
- 	/bin/cp -pR ../Documentation $(BINDIR)
- 	mkdir $(BINDIR)/src
- 	/bin/cp -p $(BINS) Makefile install.sh version $(BINDIR)/src
--	strip $(BINDIR)/src/iptraf $(BINDIR)/src/rvnamed $(BINDIR)/src/rawtime
- 
- #$(BINDIR)/src/updatefilters
- 
---- iptraf-3.0.0.orig/src/promisc.c
-+++ iptraf-3.0.0/src/promisc.c
-@@ -32,7 +32,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <netinet/in.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <linux/if_ether.h>
- #include "ifstats.h"
- #include "ifaces.h"
-@@ -49,7 +49,7 @@
- {
-     FILE *fd;
-     int ifd;
--    char buf[8];
-+    char buf[18];
-     struct promisc_states *ptmp;
-     struct promisc_states *tail = NULL;
-     struct ifreq ifr;
-@@ -81,6 +81,7 @@
-              */
- 
-             if ((strncmp(buf, "eth", 3) == 0) ||
-+	        (strncmp(buf, "ath", 3) == 0) ||
-                 (strncmp(buf, "fddi", 4) == 0) ||
-                 (strncmp(buf, "tr", 2) == 0) ||
-                 (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
---- iptraf-3.0.0.orig/src/hostmon.c
-+++ iptraf-3.0.0/src/hostmon.c
-@@ -711,7 +711,7 @@
-     int is_ip;
-     int ch;
- 
--    char ifname[10];
-+    char ifname[18];
- 
-     struct timeval tv;
-     unsigned long starttime;
---- iptraf-3.0.0.orig/src/serv.c
-+++ iptraf-3.0.0/src/serv.c
-@@ -739,7 +739,7 @@
-     unsigned short linktype;
-     int br;
- 
--    char iface[8];
-+    char iface[18];
-     unsigned int idx = 1;
- 
-     unsigned int sport = 0;
---- iptraf-3.0.0.orig/src/packet.c
-+++ iptraf-3.0.0/src/packet.c
-@@ -31,13 +31,12 @@
- #include <netinet/tcp.h>
- #include <sys/time.h>
- #include <net/if_arp.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <sys/ioctl.h>
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>
- #include <linux/if_fddi.h>
- #include <linux/if_tr.h>
--#include <linux/isdn.h>
- #include <linux/sockios.h>
- #include <msgboxes.h>
- #include "deskman.h"
-@@ -79,6 +78,8 @@
-     case ARPHRD_ETHER:
-         if (strncmp(ifname, "eth", 3) == 0)
-             result = LINK_ETHERNET;
-+	else if (strncmp(ifname, "ath", 3) == 0)
-+	    result = LINK_ETHERNET;
-         else if (strncmp(ifname, "plip", 4) == 0)
-             result = LINK_PLIP;
-         else if (strncmp(ifname, "fddi", 4) == 0)       /* For some Ethernet- */
-@@ -101,6 +102,8 @@
-             result = LINK_ETHERNET;
-         else if (strncmp(ifname, "tun", 3) == 0)
-             result = LINK_ETHERNET;
-+        else if (strncmp(ifname, "ra", 2) == 0)
-+            result = LINK_ETHERNET;
-         else if (strncmp(ifname, "vlan", 3) == 0)
-             result = LINK_VLAN;
-         else if (strncmp(ifname, "brg", 3) == 0)
---- iptraf-3.0.0.orig/src/rvnamed.c
-+++ iptraf-3.0.0/src/rvnamed.c
-@@ -219,6 +219,9 @@
-     signal(SIGCHLD, childreap);
- 
-     logfile = fopen(RVNDLOGFILE, "a");
-+    if ( logfile == NULL ) { /* unable to open file -> /dev/null */
-+	logfile = fopen("/dev/null", "a");
-+    }
- 
-     if (logfile == NULL)
-         logfile = fopen("/dev/null", "a");
---- iptraf-3.0.0.orig/src/rvnamed.h
-+++ iptraf-3.0.0/src/rvnamed.h
-@@ -1,9 +1,9 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
--#define CHILDSOCKNAME "/dev/rvndcldcomsk"
--#define PARENTSOCKNAME "/dev/rvndpntcomsk"
--#define IPTSOCKNAME "/dev/rvndiptcomsk"
-+#define CHILDSOCKNAME "/var/run/rvndcldcomsk"
-+#define PARENTSOCKNAME "/var/run/rvndpntcomsk"
-+#define IPTSOCKNAME "/var/run/rvndiptcomsk"
- 
- #define SOCKET_PREFIX	"isock"
- 
---- iptraf-3.0.0.orig/src/ifaces.c
-+++ iptraf-3.0.0/src/ifaces.c
-@@ -24,7 +24,7 @@
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <fcntl.h>
- #include <string.h>
- #include <linux/if_packet.h>
-@@ -32,14 +32,15 @@
- #include "error.h"
- 
- extern int accept_unsupported_interfaces;
--#define NUM_SUPPORTED_IFACES 26
-+#define NUM_SUPPORTED_IFACES 28
- 
- extern int daemonized;
- 
- char ifaces[][6] =
-     { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
-     "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
--    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan"
-+    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "ath",
-+    "ra"
- };
- 
- char *ltrim(char *buf)
-@@ -102,7 +103,7 @@
- int iface_supported(char *iface)
- {
-     int i;
--
-+    
-     if (accept_unsupported_interfaces)
-         return 1;
- 
---- iptraf-3.0.0.orig/src/isdntab.h
-+++ iptraf-3.0.0/src/isdntab.h
-@@ -1,3 +1,87 @@
-+/* copied from Linux ISDN subsystem for inclusion in iptraf */
-+
-+/* Linux ISDN subsystem, main header
-+ *
-+ * Copyright 1994,95,96 by Fritz Elfert (fritz@isdn4linux.de)
-+ * Copyright 1995,96    by Thinking Objects Software GmbH Wuerzburg
-+ * Copyright 1995,96    by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de)
-+ * Copyright 2000-2002  by Kai Germaschewski (kai@germaschewski.name)
-+ * 
-+ * This software may be used and distributed according to the terms
-+ * of the GNU General Public License, incorporated herein by reference.
-+ *
-+ */
-+
-+/* Packet encapsulations for net-interfaces */
-+#define ISDN_NET_ENCAP_ETHER      0
-+#define ISDN_NET_ENCAP_RAWIP      1
-+#define ISDN_NET_ENCAP_IPTYP      2
-+#define ISDN_NET_ENCAP_CISCOHDLC  3 /* Without SLARP and keepalive */
-+#define ISDN_NET_ENCAP_SYNCPPP    4
-+#define ISDN_NET_ENCAP_UIHDLC     5
-+#define ISDN_NET_ENCAP_CISCOHDLCK 6 /* With SLARP and keepalive    */
-+#define ISDN_NET_ENCAP_X25IFACE   7 /* Documentation/networking/x25-iface.txt*/
-+#define ISDN_NET_ENCAP_NR         8
-+
-+/* New ioctl-codes */
-+#define IIOCNETAIF  _IO('I',1)
-+#define IIOCNETDIF  _IO('I',2)
-+#define IIOCNETSCF  _IO('I',3)
-+#define IIOCNETGCF  _IO('I',4)
-+#define IIOCNETANM  _IO('I',5)
-+#define IIOCNETDNM  _IO('I',6)
-+#define IIOCNETGNM  _IO('I',7)
-+#define IIOCGETSET  _IO('I',8) /* no longer supported */
-+#define IIOCSETSET  _IO('I',9) /* no longer supported */
-+#define IIOCSETVER  _IO('I',10)
-+#define IIOCNETHUP  _IO('I',11)
-+#define IIOCSETGST  _IO('I',12)
-+#define IIOCSETBRJ  _IO('I',13)
-+#define IIOCSIGPRF  _IO('I',14)
-+#define IIOCGETPRF  _IO('I',15)
-+#define IIOCSETPRF  _IO('I',16)
-+#define IIOCGETMAP  _IO('I',17)
-+#define IIOCSETMAP  _IO('I',18)
-+#define IIOCNETASL  _IO('I',19)
-+#define IIOCNETDIL  _IO('I',20)
-+#define IIOCGETCPS  _IO('I',21)
-+#define IIOCGETDVR  _IO('I',22)
-+
-+
-+typedef struct {
-+	char	name[10];	/* Name of interface                     */
-+	char	master[10];	/* Name of Master for Bundling           */
-+	char	slave[10];	/* Name of Slave for Bundling            */
-+	char	eaz[256];	/* EAZ/MSN                               */
-+	char	drvid[25];	/* DriverId for Bindings                 */
-+	int	onhtime;	/* Hangup-Timeout                        */
-+	int	charge;		/* Charge-Units                          */
-+	int	l2_proto;	/* Layer-2 protocol                      */
-+	int	l3_proto;	/* Layer-3 protocol                      */
-+	int	p_encap;	/* Encapsulation                         */
-+	int	exclusive;	/* Channel, if bound exclusive           */
-+	int	dialmax;	/* Dial Retry-Counter                    */
-+	int	slavedelay;	/* Delay until slave starts up           */
-+	int	cbdelay;	/* Delay before Callback                 */
-+	int	chargehup;	/* Flag: Charge-Hangup                   */
-+	int	ihup;		/* Flag: Hangup-Timeout on incoming line */
-+	int	secure;		/* Flag: Secure                          */
-+	int	callback;	/* Flag: Callback                        */
-+	int	cbhup;		/* Flag: Reject Call before Callback     */
-+	int	pppbind;	/* ippp device for bindings              */
-+	int	chargeint;	/* Use fixed charge interval length      */
-+	int	triggercps;	/* BogoCPS needed for triggering slave   */
-+	int	dialtimeout;	/* Dial-Timeout                          */
-+	int	dialwait;	/* Time to wait after failed dial        */
-+	int	dialmode;	/* Flag: off / on / auto                 */
-+} isdn_net_ioctl_cfg;
-+
-+
-+
-+
-+/* end of copied part */
-+
-+
- struct isdntabent {
-     char ifname[10];
-     unsigned int encap;
---- iptraf-3.0.0.orig/src/isdntab.c
-+++ iptraf-3.0.0/src/isdntab.c
-@@ -20,7 +20,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/ioctl.h>
--#include <linux/isdn.h>
- #include "isdntab.h"
- 
- 
---- iptraf-3.0.0.orig/src/pktsize.c
-+++ iptraf-3.0.0/src/pktsize.c
-@@ -25,7 +25,7 @@
- #include <sys/time.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <netinet/in.h>
- #include <linux/if_ether.h>
- #include <linux/if_packet.h>
---- iptraf-3.0.0.orig/src/promisc.h
-+++ iptraf-3.0.0/src/promisc.h
-@@ -9,7 +9,7 @@
-  */
- 
- struct promisc_params {
--    char ifname[8];
-+    char ifname[18];
-     int saved_state;
-     int state_valid;
- };
---- iptraf-3.0.0.orig/src/install.sh
-+++ iptraf-3.0.0/src/install.sh
-@@ -18,37 +18,38 @@
- WORKDIR=$2
- LOGDIR=$3
- LOCKDIR=$4
-+DESTDIR=$5
- 
- echo
- echo "*** Installing executable programs and preparing work directories"
- echo
- echo ">>> Installing iptraf in $TARGET"
--$INSTALL -m 0700 -o root -g root -s iptraf $TARGET
-+$INSTALL -m 0700 -o root -g root iptraf $DESTDIR/$TARGET
- echo ">>> Installing rvnamed in $TARGET"
--$INSTALL -m 0700 -o root -g root -s rvnamed $TARGET
-+$INSTALL -m 0700 -o root -g root rvnamed $DESTDIR/$TARGET
- 
--if [ ! -d $WORKDIR ]; then
-+if [ ! -d $DESTDIR/$WORKDIR ]; then
-     echo ">>> Creating IPTraf work directory $WORKDIR"
- else
-     echo ">>> IPTraf work directory $WORKDIR already exists"
--    rm -f $WORKDIR/othfilter.dat
-+    rm -f $DESTDIR/$WORKDIR/othfilter.dat
- fi
- 
--$INSTALL -m 0700 -o root -g root -d $WORKDIR
-+$INSTALL -m 0700 -o root -g root -d $DESTDIR/$WORKDIR
- 
--if [ ! -d $LOGDIR ]; then
-+if [ ! -d $DESTDIR/$LOGDIR ]; then
-     echo ">>> Creating IPTraf log directory $LOGDIR"
- else
-     echo ">>> IPTraf log directory $LOGDIR already exists"
- fi
--$INSTALL -m 0700 -o root -g root -d $LOGDIR
-+$INSTALL -m 0700 -o root -g root -d $DESTDIR/$LOGDIR
- 
--if [ ! -d $LOCKDIR ]; then
-+if [ ! -d $DESTDIR/$LOCKDIR ]; then
-     echo ">>> Creating IPTraf lockfile directory $LOCKDIR"
- else
-     echo ">>> IPTraf lockfile directory $LOCKDIR already exists"
- fi
--$INSTALL -m 0700 -o root -g root -d $LOCKDIR
-+$INSTALL -m 0700 -o root -g root -d $DESTDIR/$LOCKDIR
- echo
- echo
- echo "*** iptraf, and rvnamed executables are in $TARGET"
-@@ -56,25 +57,27 @@
- 
- ################# Filter clearing for 3.0 ##########################
- 
--if [ ! -f $WORKDIR/version ]; then
-+if [ ! -f $DESTDIR/$WORKDIR/version ]; then
-     echo ">>> Clearing old filter list"
--    if [ -f $WORKDIR/tcpfilters.dat ]; then
--        mv -f $WORKDIR/tcpfilters.dat $WORKDIR/tcpfilters.dat~
-+    if [ -f $DESTDIR/$WORKDIR/tcpfilters.dat ]; then
-+        mv -f $DESTDIR/$WORKDIR/tcpfilters.dat $DESTDIR/$WORKDIR/tcpfilters.dat~
-     fi
-     
--    if [ -f $WORKDIR/udpfilters.dat ]; then
--        mv -f $WORKDIR/udpfilters.dat $WORKDIR/udpfilters.dat~
-+    if [ -f $DESTDIR/$WORKDIR/udpfilters.dat ]; then
-+        mv -f $DESTDIR/$WORKDIR/udpfilters.dat $DESTDIR/$WORKDIR/udpfilters.dat~
-     fi
- 
--    if [ -f $WORKDIR/othipfilters.dat ]; then
--        mv -f $WORKDIR/othipfilters.dat $WORKDIR/othipfilters.dat~
-+    if [ -f $DESTDIR/$WORKDIR/othipfilters.dat ]; then
-+        mv -f $DESTDIR/$WORKDIR/othipfilters.dat $DESTDIR/$WORKDIR/othipfilters.dat~
-     fi
- 
--    rm -f $WORKDIR/savedfilters.dat
-+    rm -f $DESTDIR/$WORKDIR/savedfilters.dat
- fi
- ####################################################################
- 
--cat version > $WORKDIR/version
-+cat version > $DESTDIR/$WORKDIR/version
-+
-+exit 0
- 
- echo 
- echo
---- iptraf-3.0.0.orig/src/tr.c
-+++ iptraf-3.0.0/src/tr.c
-@@ -7,7 +7,7 @@
-  */
- 
- #include <asm/types.h>
--#include <linux/if_tr.h>
-+#include <netinet/if_tr.h>
- #include <netinet/in.h>
- 
- unsigned int get_tr_ip_offset(unsigned char *pkt)
---- iptraf-3.0.0.orig/debian/manpages
-+++ iptraf-3.0.0/debian/manpages
-@@ -0,0 +1,2 @@
-+Documentation/iptraf.8
-+Documentation/rvnamed.8
---- iptraf-3.0.0.orig/debian/dirs
-+++ iptraf-3.0.0/debian/dirs
-@@ -0,0 +1,7 @@
-+etc/logrotate.d 
-+usr/sbin 
-+usr/lib/iptraf 
-+usr/share/doc-base/ 
-+var/lib/iptraf/ 
-+var/run/iptraf/
-+
---- iptraf-3.0.0.orig/debian/README.debian
-+++ iptraf-3.0.0/debian/README.debian
-@@ -0,0 +1,16 @@
-+iptraf for Debian
-+-----------------
-+
-+Since 2.1.1, old config files (versions below 1.4.0) won't be updated to the
-+new format. Binary config files are a pain; let's suffer :( (old tools don't
-+compile anymore)
-+
-+IPTraf does _not_ work with IPv6. you've been warned.
-+
-+IPTraf for Debian supports wvlan and lec interfaces that upstream doesn't
-+support by lack of thorough testing. This support is here since users
-+requested it but no tests have been done !
-+
-+-- 
-+Frederic Peters <fpeters@debian.org>, Wed, 19 Dec 2001 10:27:54 +0100
-+
---- iptraf-3.0.0.orig/debian/changelog
-+++ iptraf-3.0.0/debian/changelog
-@@ -0,0 +1,424 @@
-+iptraf (3.0.0-6) unstable; urgency=low
-+
-+  * src/ifaces.c: added support for raX interfaces (closes: #281315)
-+  * debian/menu: updated to new menu policy (froms Apps/Net to Applications /
-+    Network / Monitoring)
-+  * src/iptraf.c: added call to setlocale() (closes: #328186, #327147)  (that
-+    I couldn't reproduce anyway)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 29 Sep 2007 12:42:56 +0200
-+
-+iptraf (3.0.0-5) unstable; urgency=low
-+
-+  * src/Makefile, src/install.sh: always use -g, and don't strip binaries
-+    (closes: #437229)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Wed, 15 Aug 2007 15:36:49 +0200
-+
-+iptraf (3.0.0-4) unstable; urgency=low
-+
-+  * src/ifaces.c: incremented NUM_SUPPORTED_IFACES so that ath devices are
-+    recognised correctly. (closes: #413212)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat,  3 Mar 2007 13:35:58 +0100
-+
-+iptraf (3.0.0-3) unstable; urgency=low
-+
-+  * Sync with Ubuntu fixes (by Oliver Grawert and Michael Vogt)
-+    * added fix for /var/run detection (since it is a tmpfs by default on
-+      Ubuntu) [and fixed ubuntu fix]
-+    * added support for ath devices
-+    * fixed FTBFS by changing linux/if_tr.h to netinet/if_tr.h
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sun, 15 Oct 2006 13:34:14 +0200
-+
-+iptraf (3.0.0-2) unstable; urgency=low
-+
-+  * src/ifaces.c: remove duplicated patch, it had been applied upstream and I
-+    missed it. (closes: #379539)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon, 24 Jul 2006 11:02:29 +0200
-+
-+iptraf (3.0.0-1) unstable; urgency=low
-+
-+  * New upstream release. (closes: #370577)
-+    * Oops, I missed it, thansk for the bug report.
-+    * Updated patches to work against this version.
-+    * Supports vlan interfaces (closes: #168202, #226577)
-+    * Supports bridged interfaces (closes: #215535)
-+  * debian/copyright: updated copyright & license information.
-+  * debian/rules: partly updated to newer debhelper helpers.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue,  6 Jun 2006 07:36:49 +0200
-+
-+iptraf (2.7.0-8) unstable; urgency=low
-+
-+  * src/*.[ch]: shaked up headers so it compiles with current libc and linux
-+    headers (closes: #323319)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue, 16 Aug 2005 10:24:50 +0200
-+
-+iptraf (2.7.0-7) unstable; urgency=low
-+
-+  * Documentation/iptraf.8: use \- to denote the dash signs before options.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 26 Feb 2005 10:37:01 +0100
-+
-+iptraf (2.7.0-6) unstable; urgency=low
-+
-+  * Creates rvnamed sockets in /var/run/ (closes: #272958)
-+  * debian/menu: quote needs and section.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu, 23 Sep 2004 10:05:55 +0200
-+
-+iptraf (2.7.0-5) unstable; urgency=low
-+
-+  * Include bits from <linux/isdn.h> to get iptraf working without inclusion
-+    of this kernel header (closes: #219757)
-+  * Do not test for TERM if running daemonized (closes: #222525)
-+  * Document -u in the manpage (closes: #147447, #199888)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu, 11 Dec 2003 13:45:00 +0100
-+
-+iptraf (2.7.0-4) unstable; urgency=low
-+
-+  * debian/menu: fixed su-to-root in menu item (closes: #188078)
-+  * debian/control: removed note about Linux kernel >= 2.2
-+  * debian/control: updated policy to 3.6.1.0, no changes needed.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 30 Aug 2003 23:16:41 +0200
-+
-+iptraf (2.7.0-3) unstable; urgency=low
-+
-+  * Added support for vlan interfaces. (patch by Ard van Breemen)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon, 11 Nov 2002 17:52:22 +0100
-+
-+iptraf (2.7.0-2) unstable; urgency=low
-+
-+  * debian/iptraf-manual: there is no longer a plain text manual.
-+    (closes: #149648)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue, 11 Jun 2002 11:40:45 +0200
-+
-+iptraf (2.7.0-1) unstable; urgency=low
-+
-+  * New upstream release.
-+  * Upstream fixes detailed interface statitistics screen. (closes: #146851)
-+  * Upstream has support for renamed interfaces. (closes: #128175)
-+    but no documentation for it (doesn't close: 147447...)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Wed, 22 May 2002 09:31:32 +0200
-+
-+iptraf (2.6.0-1) unstable; urgency=low
-+
-+  * New upstream release.
-+  * Upstream added percentage broadcast packet. (closes: #119915)
-+  * Upstream applied my patch for renamed interfaces. (closes: #128175)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Wed,  1 May 2002 11:46:31 +0200
-+
-+iptraf (2.5.0-4) unstable; urgency=low
-+
-+  * debian/logrotate: s/USR/USR1/ (closes: #131106)
-+  * No longer hangs with resolver daemon (closes: #83522)
-+  * debian/postrm: remove /var/run/iptraf on purge (closes: #129907)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sun, 27 Jan 2002 13:51:48 +0100
-+
-+iptraf (2.5.0-3) unstable; urgency=low
-+
-+  * debian/postinst: fixed spelling mistake itpraf -> iptraf. Caused old
-+    script to rotate logs not to be renamed. (closes: #129744)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Fri, 18 Jan 2002 12:33:38 +0100
-+
-+iptraf (2.5.0-2) unstable; urgency=low
-+
-+  * debian/menu: use su-to-root to launch iptraf from menu. (closes: #128144)
-+  * debian/doc: removed README.Documentation since it talks about installing
-+    documentation and this is already done by the package. (closes: #126932)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon,  7 Jan 2002 21:31:09 +0100
-+
-+iptraf (2.5.0-1) unstable; urgency=low
-+
-+  * New upstream release. (closes: #125726)
-+  * Upstream source tarball no longer contains compiled binaries.
-+    (closes: #122677)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Wed, 19 Dec 2001 10:10:07 +0100
-+
-+iptraf (2.4.0-4) unstable; urgency=low
-+
-+  * debian/logrotate: don't fail if iptraf is not running. (closes: #122692)
-+  * debian/copyright: corrected licences -> licenses
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu,  6 Dec 2001 19:17:39 +0100
-+
-+iptraf (2.4.0-3) unstable; urgency=low
-+
-+  * debian/logrotate: added USR1 signal sending after logrotate rotated the
-+    logfiles. (notification by Sebastian Henschel <shensche@defcom.de>)
-+  * debian/changelog: removed emacs cruft from the end of the file.
-+  * src/Makefile: removed -g from gcc flags.
-+  * debian/rules, src/Makefile: added support for DEB_BUILD_OPTIONS
-+  * debian/control: updated Standard-Versions to 3.5.6.0
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue, 27 Nov 2001 13:36:37 +0100
-+
-+iptraf (2.4.0-2) unstable; urgency=low
-+
-+  * Fixed logfile directory location in rvnamed manpage (Closes: #99455)
-+  * Added support for lec interfaces.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon,  2 Jul 2001 11:34:39 +0200
-+
-+iptraf (2.4.0-1) unstable; urgency=low
-+
-+  * New upstream release.
-+  * Upstream includes /etc/ethers patch.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Wed, 11 Apr 2001 11:19:26 +0200
-+
-+iptraf (2.3.1-2) unstable; urgency=low
-+
-+  * Patched so it can use /etc/ethers like tcpdump (Closes: #32134)
-+  * debian/postinst: as a consequence it no longer creates ethernet.desc
-+    from an existing /etc/ethers
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue, 19 Dec 2000 20:35:25 +0100
-+
-+iptraf (2.3.1-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat,  9 Dec 2000 16:42:35 +0100
-+
-+iptraf (2.2.2-3) unstable; urgency=high
-+
-+  * applied patch to support wvlan interfaces (patch by eichin@thok.org)
-+    (closes: #70875)
-+  * fixed rvnamed so it doesn't segfault (and makes iptraf locking up)
-+    when /var/log/iptraf doesn't exist. (closes: #71487)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon, 27 Nov 2000 18:21:21 +0100
-+
-+iptraf (2.2.2-2) unstable; urgency=high
-+
-+  * debian/rules: rename old /etc/cron.daily/iptraf to /e/c.d/iptraf.obsolete
-+    since we now use logrotate (and dpkg won't remove it automatically)
-+    (closes: #72998)
-+  * debian/logrotate: added notifempty statemente
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon, 16 Oct 2000 22:37:54 +0200
-+
-+iptraf (2.2.2-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu, 24 Aug 2000 19:22:07 +0200
-+
-+iptraf (2.1.1-5) unstable; urgency=low
-+
-+  * create log directory in postinst since it will only be removed by purge
-+    (ie not remove) (closes: #58961)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Wed,  1 Mar 2000 15:08:34 +0100
-+
-+iptraf (2.1.1-4) frozen unstable; urgency=high
-+
-+  * recompiled against libncurses5
-+  * debian/control: fixed Build-Depends line (libncurses4-dev has been
-+    replaced by libncurses-dev)/ (closes: #56376)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 29 Jan 2000 01:50:53 +0100
-+
-+iptraf (2.1.1-3) frozen unstable; urgency=low
-+
-+  * debian/postinst: iptraf wouldn't install because of /var/state/iptraf
-+    no longer existing. (closes: #56147)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue, 25 Jan 2000 23:14:25 +0100
-+
-+iptraf (2.1.1-2) unstable; urgency=low
-+
-+  * /var/lib/iptraf was not created
-+
-+ -- Frederic Peters <fpeters@debian.org>  Tue, 21 Dec 1999 17:10:40 +0100
-+ 
-+iptraf (2.1.1-1) unstable; urgency=high
-+
-+  * Maintainer upload :)
-+  * Closes: #52341 and #52837 (rvnamed not working)
-+  * Closes: #52548 (/usr/doc/iptraf not existing)
-+  * Closes: #51801 (make building in live fs)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Fri, 17 Dec 1999 17:45:57 +0100
-+ 
-+iptraf (2.1.1-0.2) unstable; urgency=low
-+
-+  * Another NMU requested by Frederic.
-+  * debian/postinst: Fixed move from /var/lib/iptraf to /var/state/iptraf 
-+    to work in all cases (closes: #51712).
-+  * debian/postinst: Commented out the config file conversion tools.
-+    I can't get them to compile anymore :(
-+
-+ -- Torsten Landschoff <torsten@debian.org>  Sat,  4 Dec 1999 12:04:51 +0100
-+
-+iptraf (2.1.1-0.1) unstable; urgency=low
-+
-+  * Debian QA Upload as requested by Frederic.
-+  * New upstream release (closes: #50804).
-+  * New features:
-+    - New filter for non-IP packages (closes: #44420).
-+    - Ctrl-L does redraw the screen now (closes: #43848).
-+  * debian/control: Added Build-Depends, updated Standards-Version.
-+  * debian/rules: Updated to adjust for changes in upstream source:
-+  * Removed the old configfile conversion tools. I don't think they 
-+    are worth the effort.
-+
-+ -- Torsten Landschoff <torsten@debian.org>  Tue, 23 Nov 1999 17:49:23 +0100
-+
-+iptraf (2.0.2-5) unstable; urgency=low
-+
-+  * Added 'missingok' to logrotate.d/iptraf . (bug#44794)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Fri, 10 Sep 1999 20:14:56 +0200
-+
-+iptraf (2.0.2-4) unstable; urgency=low
-+
-+  * Updated debian/rules to build with newer debhelper
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu,  9 Sep 1999 18:32:00 +0200
-+
-+iptraf (2.0.2-3) unstable; urgency=low
-+
-+  * Moved to logrotate (it should now be compliant with policy 3.0.1)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sun,  5 Sep 1999 19:56:59 +0200
-+
-+iptraf (2.0.2-2) unstable; urgency=low
-+
-+  * Fixed postinst removal of /etc/iptraf.cfg (Bug#43625)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sun, 29 Aug 1999 02:32:41 +0200
-+
-+iptraf (2.0.2-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu, 29 Jul 1999 22:48:35 +0200
-+
-+iptraf (1.4.2-2) unstable; urgency=low
-+
-+  * debian/rules : fixed a few errors (Fixes Bug#32265)
-+  * debian/postinst : improved handling of converting format from
-+    older releases
-+  * Converting /etc/ethers (from tcpdump) to iptraf's ethernet.desc
-+    (Fixes Bug#32134)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 30 Jan 1999 17:52:27 +0100
-+ 
-+iptraf (1.4.2-1) unstable; urgency=low
-+
-+  * New upstream release (Fixes Bug#31805)
-+  * Switched to debhelper
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon, 18 Jan 1999 16:47:38 +0100
-+ 
-+iptraf (1.4.1-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon,  4 Jan 1999 19:59:53 +0100
-+
-+iptraf (1.3.0-5) frozen unstable; urgency=low
-+
-+  * Fixed a typo in postrm (Bug#30559)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sun, 13 Dec 1998 18:45:31 +0100
-+
-+iptraf (1.3.0-4.1) unstable; urgency=low
-+
-+  * non-maintainer (binary-only) upload for Alpha
-+  * make 3.77-2 apparently doesn't like `*.h' as target
-+
-+ -- Paul Slootman <paul@debian.org>  Mon, 12 Oct 1998 20:41:28 +0200
-+
-+iptraf (1.3.0-4) unstable; urgency=low
-+
-+  * (Re) Added daily maintenance of log file.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon,  5 Oct 1998 21:40:04 +0200
-+
-+iptraf (1.3.0-3) unstable; urgency=low
-+
-+  * New versions aren't just for Alpha people :)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Thu, 24 Sep 1998 23:04:33 +0200
-+
-+iptraf (1.3.0-2.1) unstable; urgency=low
-+
-+  * non-maintainer (binary-only) upload for Alpha
-+  * fixed creation of /var/log/iptraf (should be $DESTDIR/var/log/iptraf)
-+
-+ -- Paul Slootman <paul@debian.org>  Thu, 24 Sep 1998 00:31:19 +0200
-+
-+iptraf (1.3.0-2) unstable; urgency=low
-+
-+  * Made it upgrade right from both 1.1 and 1.2 releases.
-+  * Version 1.3.0 brings a warning message at startup when IP Masquerading is enabled in the kernel. This can be boring so I add a new switch (-q).
-+
-+ -- Frederic Peters <fpeters@debian.org>  Mon, 21 Sep 1998 08:11:33 +0200
-+
-+iptraf (1.3.0-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sun, 20 Sep 1998 22:57:54 +0200
-+
-+iptraf (1.2.0-2) unstable; urgency=low
-+
-+  * Added PLIP to included interfaces (fixes #26376)
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 19 Sep 1998 11:08:24 +0200
-+
-+iptraf (1.2.0-1) unstable; urgency=low
-+
-+  * New maintainer.
-+  * New upstream release.
-+  * Moved configuration files from /var/lib/iptraf/ to /etc/iptraf/.
-+  * Moved log files from /var/lib/iptraf/ to /var/log/.
-+  * Removed '-m486' flag in Makefile (fixes #20989).
-+  * Created man pages.
-+  * Added doc-base support.
-+
-+ -- Frederic Peters <fpeters@debian.org>  Sat, 27 Jun 1998 15:30:28 +0200
-+
-+iptraf (1.1.0-3) unstable; urgency=low
-+
-+  * New maintainer.
-+  * Many new improvements to package design.
-+
-+ -- Robert S. Edmonds <edmonds@freewwweb.com>  Mon,  6 Apr 1998 18:16:04 -0400
-+
-+iptraf (1.1.0-2) unstable; urgency=low
-+
-+  * path to rvnamed was wrong and thus rvnamed was not loaded when needed.
-+  * Clean up *.rej files. Sigh.
-+
-+ -- Christoph Lameter <chris@waterf.org>  Sat, 28 Feb 1998 09:13:59 -0800
-+
-+iptraf (1.1.0-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Christoph Lameter <chris@waterf.org>  Sat, 28 Feb 1998 07:53:14 -0800
-+
-+iptraf (1.0-1) unstable; urgency=low
-+
-+  * Initial Release.
-+
-+ -- Christoph Lameter <chris@waterf.org>  Sat,  3 Jan 1998 21:59:02 -0800
-+
---- iptraf-3.0.0.orig/debian/control
-+++ iptraf-3.0.0/debian/control
-@@ -0,0 +1,15 @@
-+Source: iptraf
-+Section: net
-+Priority: optional
-+Maintainer: Frederic Peters <fpeters@debian.org>
-+Build-Depends: debhelper (>= 5.0.0-1), libncurses-dev
-+Standards-Version: 3.7.2.0
-+
-+Package: iptraf
-+Architecture: any
-+Depends: ${shlibs:Depends}
-+Description: Interactive Colorful IP LAN Monitor
-+ IPTraf is an ncurses-based IP LAN monitor that generates
-+ various network statistics including TCP info, UDP counts,
-+ ICMP and OSPF information, Ethernet load info, node stats,
-+ IP checksum errors, and others.
---- iptraf-3.0.0.orig/debian/copyright
-+++ iptraf-3.0.0/debian/copyright
-@@ -0,0 +1,29 @@
-+This package is maintained by Frederic Peters <fpeters@debian.org>.
-+
-+It was downloaded from:
-+  ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.0.tar.gz
-+
-+
-+Copyright (c) Gerard Paul Java 1997-2005
-+
-+IPTraf is open-source software, distributed under the terms of the GNU
-+General Public License, Version 2, or (at your option) any later version.
-+
-+This program is free software; you can redistribute it and/or modify it
-+under the terms of the GNU General Public License as published by the Free
-+Software Foundation; either version 2 of the License, or (at your option)
-+any later version.
-+
-+This program is distributed in the hope that it will be useful, but
-+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License along with
-+this program; if not, write to the Free Software Foundation, Inc., 51
-+Franklin St, Fifth Floor, Boston, MA  02110-1301,  USA.
-+
-+
-+On Debian GNU/Linux systems, the complete text of the GNU General Public
-+License can be found in `/usr/share/common-licenses/GPL'.
-+
---- iptraf-3.0.0.orig/debian/docs
-+++ iptraf-3.0.0/debian/docs
-@@ -0,0 +1,8 @@
-+README
-+README.interfaces
-+README.platforms
-+README.rvnamed
-+README.contact
-+FAQ
-+RELEASE-NOTES
-+
---- iptraf-3.0.0.orig/debian/postinst
-+++ iptraf-3.0.0/debian/postinst
-@@ -0,0 +1,66 @@
-+#!/bin/sh
-+
-+set -e
-+
-+case "$1" in
-+    configure)
-+	if [ -e /etc/iptraf.cfg ]
-+	then
-+		# old, incompatible, binary config file - I won't miss you :)
-+		rm -f /etc/iptraf.cfg
-+	fi
-+
-+	if command -v install-docs >/dev/null 2>&1; then
-+		install-docs -i /usr/share/doc-base/iptraf
-+	fi
-+
-+	if [ ! -d /var/lib/iptraf ]; then
-+		mkdir /var/lib/iptraf
-+	fi
-+
-+	if [ -e /var/state/iptraf ]; then
-+		find /var/state/iptraf -mindepth 1 -maxdepth 1 	\
-+					-exec mv \{\} /var/lib/iptraf/ \;
-+		rmdir /var/state/iptraf || true
-+	fi
-+
-+	# log files may have sensitive data
-+	test -d /var/log/iptraf || mkdir /var/log/iptraf
-+	chmod 0700 /var/log/iptraf
-+
-+	# renaming old logfile rotator since it is marked as conffile and dpkg won't
-+	# remove it (reported as Bug#72998 by Josip Rodin <joy@cibalia.gkvk.hr>
-+	test -e /etc/cron.daily/iptraf && \
-+		mv /etc/cron.daily/iptraf /etc/cron.daily/iptraf.obsolete
-+
-+	# filters changed in 3.0, move them away (copied from in src/install.sh)
-+	WORKDIR=/var/lib/iptraf/
-+	if [ -z "$2" ] || dpkg --compare-versions "$2" lt 3.0.0-1 ; then
-+		if [ -f $WORKDIR/tcpfilters.dat ]; then
-+			mv -f $WORKDIR/tcpfilters.dat $WORKDIR/tcpfilters.dat~
-+		fi
-+
-+		if [ -f $WORKDIR/udpfilters.dat ]; then
-+			mv -f $WORKDIR/udpfilters.dat $WORKDIR/udpfilters.dat~
-+		fi
-+
-+		if [ -f $WORKDIR/othipfilters.dat ]; then
-+			mv -f $WORKDIR/othipfilters.dat $WORKDIR/othipfilters.dat~
-+		fi
-+
-+		rm -f $WORKDIR/savedfilters.dat
-+	fi
-+	;;
-+
-+    abort-upgrade|abort-remove|abort-deconfigure)
-+        ;;
-+
-+    *)
-+        echo "postinst called with unknown argument \`$1'" >&2
-+        exit 1
-+        ;;
-+esac
-+
-+
-+#DEBHELPER#
-+
---- iptraf-3.0.0.orig/debian/menu
-+++ iptraf-3.0.0/debian/menu
-@@ -0,0 +1,4 @@
-+?package(iptraf):needs="text" \
-+	section="Applications/Network/Monitoring" \
-+	title="IPTraf" hints="Monitoring" \
-+	command="/usr/bin/su-to-root -c /usr/sbin/iptraf"
---- iptraf-3.0.0.orig/debian/iptraf-manual
-+++ iptraf-3.0.0/debian/iptraf-manual
-@@ -0,0 +1,11 @@
-+Document: iptraf
-+Title: IPTraf User's Manual
-+Author: Gerard Paul Java
-+Abstract: This document is the User's Manual for IPTraf 2.7.0.
-+ Documented here are the features of the program and instructions on its use.
-+Section: Apps/Net
-+
-+Format: HTML
-+Index: /usr/share/doc/iptraf/html/manual.html
-+Files: /usr/share/doc/iptraf/html/manual.html
-+
---- iptraf-3.0.0.orig/debian/rules
-+++ iptraf-3.0.0/debian/rules
-@@ -0,0 +1,78 @@
-+#!/usr/bin/make -f
-+# Made with the aid of dh_make, by Craig Small
-+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-+# Some lines taken from debmake, by Cristoph Lameter.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+makeopts      := \
-+		 WORKDIR=/var/lib/iptraf			\
-+		 LOGDIR=/var/log/iptraf				\
-+		 TARGET=/usr/sbin				\
-+		 DESTDIR=$(shell pwd)/debian/iptraf
-+
-+build: build-stamp
-+build-stamp:
-+	dh_testdir
-+
-+	# Add here commands to compile the package.
-+	cd src; make $(makeopts)
-+	
-+	cp Documentation/README README.Documentation
-+
-+	touch build-stamp
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp
-+	rm -f README.Documentation
-+
-+	# Add here commands to clean up after the build process.
-+	-cd src; make clean
-+	dh_clean
-+
-+# Build architecture-independent files here.
-+binary-indep: build
-+
-+# Build architecture-dependent files here.
-+binary-arch: build
-+#	dh_testversion
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+
-+	# commands to install the files into debian/iptraf
-+	cp debian/iptraf-manual debian/iptraf/usr/share/doc-base/iptraf
-+
-+	cd src; $(MAKE) install $(makeopts)
-+
-+	dh_installdocs
-+	dh_installmenu
-+	dh_installlogrotate
-+	dh_installman -A
-+	dh_installchangelogs	CHANGES
-+
-+	mkdir debian/iptraf/usr/share/doc/iptraf/html
-+	mkdir debian/iptraf/usr/share/doc/iptraf/html/stylesheet-images/
-+	cp Documentation/*.html debian/iptraf/usr/share/doc/iptraf/html/
-+	cp Documentation/stylesheet-images/*.gif debian/iptraf/usr/share/doc/iptraf/html/stylesheet-images/
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	chmod 0750 debian/iptraf/var/log/iptraf
-+
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+source diff:                                                                  
-+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary
-+
---- iptraf-3.0.0.orig/debian/postrm
-+++ iptraf-3.0.0/debian/postrm
-@@ -0,0 +1,18 @@
-+#! /bin/sh
-+
-+set -e
-+
-+if [ $1 = purge ]; then
-+	if [ -e /etc/iptraf.cfg ]; then
-+		rm --force /etc/iptraf.cfg
-+	fi
-+	if [ -d /var/log/iptraf ]; then
-+		rm -rf /var/log/iptraf
-+	fi
-+	if [ -d /var/lib/iptraf ]; then
-+		rm -rf /var/lib/iptraf
-+	fi
-+fi
-+
-+#DEBHELPER#
-+
---- iptraf-3.0.0.orig/debian/prerm
-+++ iptraf-3.0.0/debian/prerm
-@@ -0,0 +1,8 @@
-+#! /bin/sh
-+
-+if command -v install-docs >/dev/null 2>&1; then
-+	install-docs -r iptraf
-+fi
-+
-+#DEBHELPER#
-+
---- iptraf-3.0.0.orig/debian/compat
-+++ iptraf-3.0.0/debian/compat
-@@ -0,0 +1 @@
-+5
---- iptraf-3.0.0.orig/debian/iptraf.logrotate
-+++ iptraf-3.0.0/debian/iptraf.logrotate
-@@ -0,0 +1,12 @@
-+
-+/var/log/iptraf/*.log {
-+	rotate 7
-+	daily
-+	compress
-+	missingok
-+	notifempty
-+	postrotate
-+		/usr/bin/killall -USR1 iptraf 2> /dev/null || :
-+	endscript
-+}
-+
diff --git a/source/n/iptraf/slack-desc b/source/n/iptraf/slack-desc
deleted file mode 100644
index ef2319f9a..000000000
--- a/source/n/iptraf/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-iptraf: iptraf (console-based network monitoring program)
-iptraf:
-iptraf: IPTraf is a console-based network monitoring program for Linux that
-iptraf: displays information about IP traffic such as:
-iptraf:
-iptraf:   Current TCP connections, types of IP packets, packet and byte
-iptraf:   counts, TCP/UDP counts by ports, packet counts by packet sizes,
-iptraf:   packet and byte counts by IP address, interface activity, flag
-iptraf:   statuses on TCP packets, and other LAN station statistics.
-iptraf:
-iptraf: iptraf was written by Gerard Paul Java.
diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild
index c7a77a4a9..bc711fb02 100755
--- a/source/n/iputils/iputils.SlackBuild
+++ b/source/n/iputils/iputils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=s20100418
+VERSION=s20101006
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/n/irssi/irssi.SlackBuild b/source/n/irssi/irssi.SlackBuild
index 367587973..eca06ab34 100755
--- a/source/n/irssi/irssi.SlackBuild
+++ b/source/n/irssi/irssi.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ PKG=$TMP/package-irssi
 
 VERSION=0.8.15
 DIRCD=0.8.15
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/iw/iw.SlackBuild b/source/n/iw/iw.SlackBuild
index 66a4aa7b1..bd78d0e0c 100755
--- a/source/n/iw/iw.SlackBuild
+++ b/source/n/iw/iw.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008  Robert Simpson, Ventura, California, USA
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,23 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PRGNAM=iw
-VERSION=${VERSION:-0.9.14}
-ARCH=${ARCH:-x86_64}
+PKGNAM=iw
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -37,14 +46,16 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
-cd $PRGNAM-$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -65,14 +76,14 @@ make install \
     xargs strip --strip-unneeded 2> /dev/null
 )
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  COPYING README \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+  COPYING* README* \
+    $PKG/usr/doc/$PKGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/n/iwlwifi-100-ucode/iwlwifi-100-ucode.SlackBuild b/source/n/iwlwifi-100-ucode/iwlwifi-100-ucode.SlackBuild
new file mode 100755
index 000000000..6ef720e5f
--- /dev/null
+++ b/source/n/iwlwifi-100-ucode/iwlwifi-100-ucode.SlackBuild
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# Copyright 2006, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=iwlwifi-100-ucode
+#VERSION will be determined automatically, and the package will use the last version found.
+ARCH=${ARCH:-fw}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+for file in $CWD/${PKGNAM}-*.tar.?z* ; do
+  VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - )
+  rm -rf ${PKGNAM}-${VERSION}
+  tar xvf $file || exit 1
+  cd ${PKGNAM}-$VERSION || exit 1
+  # Make sure ownerships and permissions are sane:
+  chown -R root:root .
+  chmod 644 *
+  # install:
+  mkdir -p $PKG/lib/firmware
+  cp -a iwlwifi-*.ucode $PKG/lib/firmware
+  # Add a documentation directory:
+  mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION}
+  cp -a LICENSE* README* $PKG/usr/doc/${PKGNAM}-${VERSION}
+done
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/n/iwlwifi-100-ucode/slack-desc b/source/n/iwlwifi-100-ucode/slack-desc
new file mode 100644
index 000000000..3c7b36c0a
--- /dev/null
+++ b/source/n/iwlwifi-100-ucode/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                 |-----handy-ruler------------------------------------------------------|
+iwlwifi-100-ucode: iwlwifi-1000-ucode (Intel Centrino N 100 wireless microcode)
+iwlwifi-100-ucode:
+iwlwifi-100-ucode: The microcode provided in this package is required for the Intel
+iwlwifi-100-ucode: Wireless WiFi Link AGN driver for Linux (iwlagn) to operate.
+iwlwifi-100-ucode:
+iwlwifi-100-ucode: Visit Intel's Linux wireless website at this address:
+iwlwifi-100-ucode:   http://intellinuxwireless.org/
+iwlwifi-100-ucode:
+iwlwifi-100-ucode:
+iwlwifi-100-ucode:
+iwlwifi-100-ucode:
diff --git a/source/n/iwlwifi-6xxx-ucode/iwlwifi-6xxx-ucode.SlackBuild b/source/n/iwlwifi-6xxx-ucode/iwlwifi-6xxx-ucode.SlackBuild
new file mode 100755
index 000000000..0002f09d2
--- /dev/null
+++ b/source/n/iwlwifi-6xxx-ucode/iwlwifi-6xxx-ucode.SlackBuild
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=iwlwifi-6xxx-ucode
+#VERSION will be determined automatically, and the package will use the last version found.
+ARCH=${ARCH:-fw}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+for file in $CWD/iwlwifi-6*-*.tar.?z* ; do
+  VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - )
+  SRCNAM=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 1-3 -d -)
+  rm -rf ${SRCNAM}-${VERSION}
+  tar xvf $file || exit 1
+  cd $SRCNAM-$VERSION || exit 1
+  # Make sure ownerships and permissions are sane:
+  chown -R root:root .
+  chmod 644 *
+  # install:
+  mkdir -p $PKG/lib/firmware
+  cp -a iwlwifi-*.ucode $PKG/lib/firmware
+  # Add a documentation directory:
+  mkdir -p $PKG/usr/doc/${SRCNAM}-${VERSION}
+  cp -a LICENSE* README* $PKG/usr/doc/${SRCNAM}-${VERSION}
+done
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/n/iwlwifi-6xxx-ucode/slack-desc b/source/n/iwlwifi-6xxx-ucode/slack-desc
new file mode 100644
index 000000000..0043d6cd4
--- /dev/null
+++ b/source/n/iwlwifi-6xxx-ucode/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                  |-----handy-ruler------------------------------------------------------|
+iwlwifi-6xxx-ucode: iwlwifi-6xxx-ucode (Intel 6xxx wireless microcode)
+iwlwifi-6xxx-ucode:
+iwlwifi-6xxx-ucode: The microcode provided in this package is required for the Intel
+iwlwifi-6xxx-ucode: Wireless WiFi Link AGN driver for Linux (iwlagn) to operate.
+iwlwifi-6xxx-ucode:
+iwlwifi-6xxx-ucode: Visit Intel's Linux wireless website at this address:
+iwlwifi-6xxx-ucode:   http://intellinuxwireless.org/
+iwlwifi-6xxx-ucode:
+iwlwifi-6xxx-ucode:
+iwlwifi-6xxx-ucode:
+iwlwifi-6xxx-ucode:
diff --git a/source/n/libassuan/libassuan.SlackBuild b/source/n/libassuan/libassuan.SlackBuild
index 6d49096f1..426464e51 100755
--- a/source/n/libassuan/libassuan.SlackBuild
+++ b/source/n/libassuan/libassuan.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=libassuan
-VERSION=1.0.5
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/n/libgcrypt/libgcrypt.SlackBuild b/source/n/libgcrypt/libgcrypt.SlackBuild
index 720314cac..d0629eee2 100755
--- a/source/n/libgcrypt/libgcrypt.SlackBuild
+++ b/source/n/libgcrypt/libgcrypt.SlackBuild
@@ -24,7 +24,7 @@
 
 PKGNAM=libgcrypt
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/libgpg-error/libgpg-error.SlackBuild b/source/n/libgpg-error/libgpg-error.SlackBuild
index 4d0384afe..58f6cecae 100755
--- a/source/n/libgpg-error/libgpg-error.SlackBuild
+++ b/source/n/libgpg-error/libgpg-error.SlackBuild
@@ -23,8 +23,8 @@
 
 
 PKGNAM=libgpg-error
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source/n/mailx/mailx.SlackBuild b/source/n/mailx/mailx.SlackBuild
index 256d5ebc2..9d5523668 100755
--- a/source/n/mailx/mailx.SlackBuild
+++ b/source/n/mailx/mailx.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=12.4
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -33,6 +42,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/n/metamail/metamail.SlackBuild b/source/n/metamail/metamail.SlackBuild
index e158283b3..cbf9241f9 100755
--- a/source/n/metamail/metamail.SlackBuild
+++ b/source/n/metamail/metamail.SlackBuild
@@ -22,9 +22,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=2.7
-ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-5}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-4}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -41,6 +51,9 @@ elif [ "$ARCH" = "arm" ]; then
 elif [ "$ARCH" = "armel" ]; then
   SLKCFLAGS="-O2 -march=armv4t"
   LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -54,8 +67,9 @@ rm -rf metamail-$VERSION
 xz -dc $CWD/metamail-$VERSION.tar.xz | tar xvf - || exit 1
 cd metamail-$VERSION
 
-xz -dc $CWD/metamail_2.7-52.diff.xz | patch -p1 || exit 1
+xz -dc $CWD/metamail_2.7-54.diff.xz | patch -p1 || exit 1
 xz -dc $CWD/metamail.automake.diff.xz | patch -p1 || exit 1
+zcat $CWD/metamail.uue.getline.diff.gz | patch -p1 || exit 1
 
 chmod 755 configure
 
@@ -73,7 +87,7 @@ CFLAGS="$SLKCFLAGS" \
   --disable-static \
   --program-prefix="" \
   --program-suffix="" \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 ( cd bin
   cat showexternal | perl -pi -e 's|sensible-pager|more|' > se
diff --git a/source/n/metamail/metamail.uue.getline.diff b/source/n/metamail/metamail.uue.getline.diff
new file mode 100644
index 000000000..24bdcd7bf
--- /dev/null
+++ b/source/n/metamail/metamail.uue.getline.diff
@@ -0,0 +1,29 @@
+--- ./src/metamail/uue.c.orig	2010-08-11 20:04:47.000000000 -0500
++++ ./src/metamail/uue.c	2010-08-11 20:05:12.000000000 -0500
+@@ -30,7 +30,7 @@
+ }
+ 
+ 
+-getline (buf, size, fp)
++uue_getline (buf, size, fp)
+ char *buf;
+ int size;
+ FILE *fp;
+@@ -70,7 +70,7 @@
+     char buf[63];
+ 
+     while (1) {
+-	if (getline (buf, sizeof buf, infp) < 0) {
++	if (uue_getline (buf, sizeof buf, infp) < 0) {
+ 	    fprintf (stderr, "Premature EOF!\n");
+ 	    return;
+ 	}
+@@ -82,7 +82,7 @@
+ 	}
+     }	
+     while (1) {
+-	if (getline (buf, sizeof buf, infp) < 0) {
++	if (uue_getline (buf, sizeof buf, infp) < 0) {
+ 	    fprintf (stderr, "Premature EOF!\n");
+ 	    return;
+ 	}
diff --git a/source/n/metamail/metamail_2.7-52.diff b/source/n/metamail/metamail_2.7-52.diff
deleted file mode 100644
index 1217f4289..000000000
--- a/source/n/metamail/metamail_2.7-52.diff
+++ /dev/null
@@ -1,43013 +0,0 @@
---- metamail-2.7.orig/bin/showaudio
-+++ metamail-2.7/bin/showaudio
-@@ -1,6 +1,4 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
- # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- # 
- # Permission to use, copy, modify, and distribute this material 
-@@ -13,200 +11,309 @@
- # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
- # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
--#
- 
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
--
--# First, figure out which machine to play it on!
--set thishost=`hostname`
--
--# Note that there are some special lines in here that only work at Bellcore,
--# Specifically involving phone playback from the machine "greenbush".
--# Everything should work fine at other sites, though
--set AUDIOBINDIR=/u/andrew/phone-sau/bin
--set AUDIOPHONEHOST=greenbush
--set AUDIOPHONEHOSTLONG=greenbush.bellcore.com
--set AUDIOLOGMAIL=andrew@thumper.bellcore.com
--set ORG="Bellcore"
--set STDINPUT=0
--if ("$1" == "-p") then
--    set AUDIOPHONE=$2
--    shift
--    shift
--endif
--if ("$1" == "-s") then
--    set AUDIOSPEAKERFORCE = 1
--    shift
--endif
--if ($?AUDIOPHONE || $?AUDIOPHONEFORCE) then
--    goto playphone
--endif
--if (! -d $AUDIOBINDIR) then
--    set AUDIOSPEAKERFORCE=1
--endif
--
--if ("$1" == "-") then
--    set STDINPUT=1
--    shift
--endif
--if ($#argv < 1) then
--    set STDINPUT=1
--endif
--	
--if (! $STDINPUT && ! $?AUDIOSPEAKERFORCE && ! $?AUDIOPHONEFORCE) then
--    if ($?MM_NOTTTY) then
--	if ($MM_NOTTTY == 1) then
--	    setenv MM_NOTTTY 0
--	    xterm -e showaudio $*
--	    exit 0
--	endif
--    endif
--choosehardware:
--    echo This program can display audio on the speakers of some workstations, 
--    echo "or (at some sites) it can call you on the telephone.  Please choose one:"
--    echo ""
--    echo "1 -- Use the computer's speaker"
--    echo "2 -- Call me on the telephone"
--    echo ""
--    echo -n "Which do you prefer (1 or 2)? "
--    set ans=$<
--    if ($ans == 2)  then
--	echo "OK, we'll use the telephone..."
--	set AUDIOPHONEFORCE=1
--	echo "In the future, you can avoid this question by setting the environment variable"
--	echo "AUDIOPHONEFORCE to 1"
--	goto playphone
--    else if ($ans == 1) then
--    	echo "OK, Attempting to play the audio using your computer's speaker.."
--    	set AUDIOSPEAKERFORCE=1
--	echo "In the future, you can avoid this question by setting the environment variable"
--	echo "AUDIOSPEAKERFORCE to 1"
--    else
--	echo "That is NOT one of your choices."
--	goto choosehardware
--    endif
--endif
--
--set audiohost=$thishost
--if ($?DISPLAY) then
--    set audiohost=`echo $DISPLAY | sed -e 's/:.*//'`
--    if ($audiohost == "unix") set audiohost=$thishost
--    if ($audiohost == "") set audiohost=$thishost
--endif
--if ($?AUDIOHOST) then
--	set audiohost=$AUDIOHOST
--endif
--
--if ($audiohost != $thishost) then
--    echo Sending audio to $audiohost...
--    if ($?MMS_AUDIO) then
--        if ($STDINPUT) then
--            cat | mms -host $audiohost "show audio/basic" -
--        else
--            cat $* | mms -host $audiohost "show audio/basic" -
--        endif
--        exit 0
--    endif
--
--# The next two lines are very inefficient, but not everyone has their path right for an rsh
--    pushd ~ >& /dev/null
--    set thisprog=`which showaudio`
--    popd >& /dev/null
--    if ($STDINPUT) then
--        cat | rsh $audiohost $thisprog -s -
--    else
--        cat $* | rsh $audiohost $thisprog  -s -
--    endif
--    exit 0
--endif
--
--if (-f /usr/sbin/sfplay) then
--    if ($#argv >= 1) then
--	exec /usr/sbin/sfplay -i mu-law chan 1 rate 8000 end $*
--    else
--	cat > ${METAMAIL_TMPDIR}/audio.$$
--	/usr/sbin/sfplay -i mu-law chan 1 rate 8000 end ${METAMAIL_TMPDIR}/audio.$$
--	rm ${METAMAIL_TMPDIR}/audio.$$
--	exit 0
--    endif
--else if (-d /usr/sony) then
--    set dev=/dev/sb0
--else if (-e /usr/bin/audioplay) then
--#  Solaris 2.0
--    /usr/bin/audioconvert -i raw,voice -f sun $* | /usr/bin/audioplay
--    exit $status
--else if (-e /bin/audioplay) then
--#  Solaris 2.0
--    /bin/audioconvert -i raw,voice -f sun $* | /bin/audioplay
--    exit $status
--else
--    set dev=/dev/audio
--endif
--
--if (-w $dev) then
--echo Playing audio on $thishost using $dev, one moment please...
--if ($#argv >= 1) then
--        cat $* > $dev
-+# Brought into line with metamail 2.7 beta release Csh version
-+# Added sox support
-+#    Dave Shield	February 1994
-+
-+thishost=`hostname`
-+
-+AUDIOBINDIR=/u/andrew/phone-sau/bin
-+AUDIOPHONEHOST=greenbush
-+AUDIOPHONEHOSTLONG=greenbush.bellcore.com
-+AUDIOLOGMAIL=greenbush.bellcore.com
-+ORG=Bellcore
-+STDINPUT=0
-+
-+if test -x /usr/bin/remsh
-+then
-+			# Probably a System V based system
-+			#  "rsh" is likely to be "restricted shell"
-+	RSH=remsh
- else
--        cat > $dev
--endif
--exit 0
--endif
-+	RSH=rsh
-+fi
-+# SOX=/usr/remote/bin9/sox
-+
-+if test "$1" = "-p"
-+then
-+	AUDIOPHONE=$2
-+	shift
-+	shift
-+fi
-+
-+if test "$1" = "-s"
-+then
-+	AUDIOSPEAKERFORCE=1
-+	shift
-+fi
-+
-+playphone=0
-+if test ! -z "${AUDIOPHONE:-}" -o ! -z "${AUDIOPHONEFORCE:-}"
-+then
-+	playphone=1
-+fi
-+
-+if test $playphone -eq 0
-+then
-+	if test ! -d "$AUDIOBINDIR"
-+	then
-+		AUDIOSPEAKERFORCE=1
-+	fi
-+
-+	if test "$1" = "-"
-+	then
-+		STDINPUT=1
-+		shift
-+	fi
-+	if test $# -eq 0
-+	then
-+		STDINPUT=1
-+	fi
-+
-+	if test $STDINPUT -eq 0 -a -z "${AUDIOSPEAKERFORCE:-}" -a -z "${AUDIOPHONEFORCE:-}"
-+	then
-+		if test ! -z "${MM_NOTTTY:-}"
-+		then
-+			if test $MM_NOTTTY -eq 1
-+			then
-+				MM_NOTTTY=0; export MM_NOTTTY
-+				xterm -e showaudio $*
-+				exit 0
-+			fi
-+		fi
-+		looping=1
-+		while test $looping -eq 1
-+		do
-+		    echo This program can display audio on the speakers of some workstations, 
-+		    echo "or (at some sites) it can call you on the telephone.  Please choose one:"
-+		    echo ""
-+		    echo "1 -- Use the computer's speaker"
-+		    echo "2 -- Call me on the telephone"
-+		    echo ""
-+		    echo -n "Which do you prefer (1 or 2)? [1] "
-+		    read ans
-+		    if test "$ans" -eq 2
-+		    then
-+			echo "OK, we'll use the telephone..."
-+			AUDIOPHONEFORCE=1
-+			echo "In the future, you can avoid this question by setting the environment variable"
-+			echo "AUDIOPHONEFORCE to 1"
-+			playphone=1
-+			looping=0
-+		    elif test "$ans" -eq 1
-+		    then
-+			echo "OK, Attempting to play the audio using your computer's speaker.."
-+			AUDIOSPEAKERFORCE=1
-+			echo "In the future, you can avoid this question by setting the environment variable"
-+			echo "AUDIOSPEAKERFORCE to 1"
-+			looping=0
-+		    else
-+			echo "That is NOT one of your choices."
-+		    fi
-+		done
-+	fi
-+fi
-+
-+if test $playphone -eq 0
-+then
-+	audiohost=$thishost
-+	if test ! -z "${DISPLAY:-}"
-+	then
-+		audiohost=`echo $DISPLAY | sed -e 's/:.*//'`
-+		if test "$audiohost" = unix -o "$audiohost" = localhost
-+		then
-+			audiohost=$thishost
-+		fi
-+		if test -z "$audiohost"
-+		then
-+			audiohost=$thishost
-+		fi
-+	fi
-+	if test ! -z "${AUDIOHOST:-}"
-+	then
-+		audiohost=$AUDIOHOST
-+	fi
-+
-+	if test ! "$audiohost" = "$thishost"
-+	then
-+		echo Sending audio to $audiohost...
-+		if test ! -z "${MMS_AUDIO}"
-+		then
-+			if test $STDINPUT -eq 1
-+			then
-+				cat | mms -host $audiohost "show audio/basic"
-+			else
-+				cat $* | mms -host $audiohost "show audio/basic"
-+			fi
-+			exit 0
-+		fi
-+		thisprog=`(cd; which showaudio)`
-+		if test $STDINPUT -eq 1
-+		then
-+			cat | $RSH $audiohost $thisprog -s
-+		else
-+			cat $* | $RSH $audiohost $thisprog -s
-+		fi
-+		exit 0
-+	fi
-+
-+
-+	if test -f /usr/sbin/sfplay
-+	then
-+		if test $# -ne 0
-+		then
-+			exec /usr/sbin/sfplay -i mu-law chan 1 rate 8000 end $*
-+		else
-+			fname=$(mktemp /tmp/audio.XXXXXX)
-+			cat > $fname
-+			/usr/sbin/sfplay -i mu-law chan 1 rate 8000 end $fname
-+			rm $fname
-+			exit 0
-+		fi
-+	elif test -f /usr/bin/audioplay
-+	then
-+	# Solaris 2.0
-+		/usr/bin/audioconvert -i raw,voice -f sun $* | /usr/bin/audioplay
-+		exit $?
-+	elif test -f /bin/audioplay
-+	then
-+	# Solaris 2.0
-+		/bin/audioconvert -i raw,voice -f sun $* | /bin/audioplay
-+		exit $?
-+	elif test -d /usr/sony
-+	then
-+		dev=/dev/sb0
-+	else
-+		dev=/dev/audio
-+	fi
- 
--playphone:
--if (-d $AUDIOBINDIR) then
--              set thisprog=`which showaudio`
--	if (! $?AUDIOPHONE) then
--	    if ($?MM_NOTTTY) then
--		if ($MM_NOTTTY == 1) then
--		    setenv MM_NOTTTY 0
--		    xterm -e $thisprog $*
--		    exit 0
--		endif
--	    endif
--	    echo This message contains audio, which can be sent to your telephone.
--	    echo Please enter the telephone number at which you would like to hear this
--	    echo -n "audio message as you would dial it from INSIDE ${ORG}:  "
--	    set AUDIOPHONE=$<
--	endif
--	if ($thishost == $AUDIOPHONEHOST || $thishost == $AUDIOPHONEHOSTLONG) then
--	    echo Calling Phone number $AUDIOPHONE
--	    echo "You MUST SAY HELLO when you answer the phone, or you will not hear the message."
--	    mail -s "showaudio: `whoami` called $AUDIOPHONE" $AUDIOLOGMAIL < /dev/null
--	    if ($STDINPUT) then
--	        cat $AUDIOBINDIR/../GREET.au $* - | $AUDIOBINDIR/play -\# $AUDIOPHONE -
--	    else
--	        cat $AUDIOBINDIR/../GREET.au $* | $AUDIOBINDIR/play -\# $AUDIOPHONE -
--	    endif
--	    echo All done
--	    exit 0
-+	if test -w $dev
-+	then
-+		echo Playing audio on $thishost using $dev, one moment please...
-+		if test $# -ne 0
-+		then
-+			if test ! -z "${SOX:-}"
-+			then
-+			    for ii in $*
-+			    do
-+#
-+#  The "approved magic" to translate arbitary sounds
-+#	to AU format is as follows:
-+#
-+#				$SOX -t auto $ii -c 1 -t aiff - | \
-+#				$SOX -t aiff - -U -b -t au -c 1 -r 8000 $dev
-+#
-+#  But the following "direct" translation also seems to work
-+				$SOX -t auto $ii -c 1 -t au -c 1 -r 8000 $dev
-+			    done
-+			else
-+				cat $* > $dev
-+			fi
-+		else
-+			if test ! -z "${SOX:-}"
-+			then
-+				fname=$(mktemp /tmp/audio.XXXXXX)
-+				cat > $fname
-+#
-+#  See also above
-+#
-+				$SOX -t auto $fname -c 1 -t au -c 1 -r 8000 $dev
-+				rm $fname
-+			else
-+				cat > $dev
-+			fi
-+		fi
-+		exit 0
-+	fi
-+fi
-+
-+if test -d "$AUDIOBINDIR"
-+then
-+	thisprog=`which showaudio`
-+	if test -z "${AUDIOPHONE:-}"
-+	then
-+		if test ! -z "${MM_NOTTTY:-}"
-+		then
-+			if test $MM_NOTTTY -eq 1
-+			then
-+				MM_NOTTTY=0; export MM_NOTTTY
-+				xterm -e $thisprog $*
-+				exit 0
-+			fi
-+		fi
-+		echo This message contains audio, which can be sent to your telephone.
-+		echo Please enter the telephone number at which you would like to hear this
-+		echo -n "audio message as you would dial it from inside ${ORG}: "
-+		read AUDIOPHONE
-+	fi
-+
-+	if test "$thishost" == "$AUDIOPHONEHOST" \
-+		-o "$thishost" == "$AUDIOPHONEHOSTLONG"
-+	then
-+		echo Calling Phone number $AUDIOPHONE
-+		echo "You MUST SAY HELLO when you answer the phone, or you will not hear the message."
-+		mail -s "showaudio: `whoami` called $AUDIOPHONE" $AUDIOLOGMAIL < /dev/null
-+		if test $STDINPUT -eq 1
-+		then
-+			cat $AUDIOBINDIR/../GREET.au $* - | $AUDIOBINDIR/play -\# $AUDIOPHONE -
-+		else
-+			cat $AUDIOBINDIR/../GREET.au $* | $AUDIOBINDIR/play -\# $AUDIOPHONE -
-+		fi
-+		echo All done
-+		exit 0
- 	else
--	    echo Trying to rsh to $AUDIOPHONEHOST to send audio via telephone
--	    cat $* | rsh $AUDIOPHONEHOST $thisprog -p $AUDIOPHONE -
--	    exit 0
--	endif
--endif
-+		echo Trying to rsh to $AUDIOPHONEHOST to send audio via telephone
-+		if test $STDINPUT -eq 1
-+		then
-+			cat $* - | $RSH $AUDIOPHONEHOST $thisprog -p $AUDIOPHONE -
-+		else
-+			cat $* | $RSH $AUDIOPHONEHOST $thisprog -p $AUDIOPHONE -
-+		fi
-+		exit 0
-+	fi
-+fi
- echo ""
--echo This message contains an audio mesage, which can not currently be
--echo played on this type of workstation.   If you log into an appropriate 
--echo "machine (currently a SPARCstations or Sony News workstation)"
--echo and read this message there, you should be able to hear the audio
--echo message.  
-+echo "This message contains an audio mesage, which can not currently be"
-+echo "played on this type of workstation.   If you log into an appropriate"
-+echo "machine (currently a SPARCstation or Sony News workstation)"
-+echo "and read this message there, you should be able to hear the audio"
-+echo "message."
- echo ""
--if (! $?MM_NOTTTY) set MM_NOTTTY=0
--if ($MM_NOTTTY == 1) then
--    set fname=/tmp/mm.aud.$$
-+
-+if test -z "${MM_NOTTY:-}"
-+then
-+	MM_NOTTY=0
-+fi
-+if test $MM_NOTTY -eq 1
-+then
-+	fname=$(mktemp /tmp/metamail.XXXXXX)
- else
--    echo -n "Do you want to write the audio out to a file [y] ? "
--    set ANS=$<
--    if ("$ANS" =~ n* ||  "$ANS" =~ N* ) exit 0
--    echo -n "File name:"
--    set fname=$<
--endif
--cp $1 $fname
--if ($status == 0) echo Wrote raw audio file: $fname
-+	echo -n "Do you want to write the audio out to a file [y] ? "
-+	read ANS
-+	case "$ANS" in
-+		[Nn]*)	exit 0 ;;
-+	esac
-+
-+	echo -n "File name:"
-+	read fname
-+fi
-+cp "$1" "$fname"
-+if test $? -eq 0
-+then
-+	echo Wrote raw audio file: "$fname"
-+fi
- exit 0
--
---- metamail-2.7.orig/bin/showpicture
-+++ metamail-2.7/bin/showpicture
-@@ -1,6 +1,4 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
- # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- # 
- # Permission to use, copy, modify, and distribute this material 
-@@ -13,84 +11,111 @@
- # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
- # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
--#
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
--
--if (! $?X_VIEWER) then
--set X_VIEWER="xloadimage -view -quiet -geometry +1+1"
--# set X_VIEWER="xv -geometry +1+1"
--endif
--if ($1 == "-viewer" && $#argv > 1) then
--    set X_VIEWER = "$2"
--    shift
--    shift
--endif
--
--if (! $?MM_NOTTTY) then
--    set MM_NOTTTY=0
--endif
--if (! $?DISPLAY) then
--    echo ""
--    echo This message contains a picture, which can currently only be
--    echo viewed when running X11.  If you read this message while running
--    echo X11, and have your DISPLAY variable set, you will then
--    echo be able to see the picture properly.
--    echo ""
--    if ($MM_NOTTTY) then
--        set fname=${METAMAIL_TMPDIR}/sp.$$
--        echo "The picture is being automatically stored in the file $fname"
--        echo "If you do not want this file, please delete it."
--    else
--        echo -n "Do you want to write the picture out to a file [y] ? "
--        set ANS=$<
--        if ("$ANS" =~ n* ||  "$ANS" =~ N* ) exit 0
--        while ( 1 == 1)
--            echo -n "File name:"
--            set fname=$<
--            if (! -f $fname) then
--                break
--            else
--                echo "$fname already exists. Try again"
--            endif
--        end
--    endif
--    cp $1 $fname
--    if ($status == 0) echo Wrote file $fname
--    exit 0
--endif
--
--if ($#argv == 0) then
--    set SQUIRREL=${METAMAIL_TMPDIR}/sp.$$
--    cat > $SQUIRREL
--else
--    set SQUIRREL="$*"
--endif
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
- 
--echo NOTE:  TO MAKE THE PICTURE WINDOW GO AWAY, JUST TYPE 'q' IN IT.
--if ($#argv == 0) then
--    echo "==> TO SAVE THIS IMAGE, COPY THE FILE $SQUIRREL BEFORE EXITING"
--    echo ""
--    $X_VIEWER $SQUIRREL
--    rm $SQUIRREL
-+if test -z "${X_VIEWER:-}"
-+then
-+	X_VIEWER="xloadimage -view -quiet"
-+# X_VIEWER="xv"
-+fi
-+
-+if test "$1" = "-viewer" -a ! -z "$2"
-+then
-+	X_VIEWER=$2
-+	shift
-+	shift
-+fi
-+
-+if test -z "${MM_NOTTY:-}"
-+then
-+	MM_NOTTY=0
-+fi
-+if test -z "${DISPLAY:-}"
-+then
-+	echo ""
-+	echo This message contains a picture, which can currently only be
-+	echo viewed when running X11.  If you read this message while running
-+	echo X11, you will be able to see the picture properly.
-+	if test $MM_NOTTY -eq 1
-+	then
-+		fname=$(mktemp /tmp/metamail.XXXXXX)
-+		echo "The picture is being automatically stored in the file $fname"
-+		echo "If you do not want this file, please delete it."
-+	else
-+		echo -n "Do you want to write the picture out to a file [y] ? "
-+		read ANS
-+		case "$ANS" in
-+		    [Nn]*)	exit 0;;
-+		    *)	looping=1
-+			while test $looping -eq 1
-+			do
-+				echo -n "File name: "
-+				read fname
-+				if test -f "$fname"
-+				then
-+					echo "$fname already exists. Try again"
-+				else
-+					looping=0
-+				fi
-+			done ;;
-+		esac
-+	fi
-+	cp "$1" "$fname"
-+	if test $? -eq 0
-+	then
-+		echo Wrote file "$fname"
-+	fi
-+	exit 0
-+fi
-+
-+if test -z "$1"
-+then
-+	SQUIRREL=$(mktemp /tmp/metamail.XXXXXX)
-+	cat > $SQUIRREL
- else
-+	SQUIRREL="$*"
-+fi
- 
--foreach i ($*)
--    echo "==> TO SAVE THIS IMAGE, COPY THE FILE $i BEFORE EXITING"
--    echo ""
--    set dir=$i:h
--    if ($dir != $i) then
--	# Make the ln sure to work	
--	cd $dir
--    endif
--    ln $i $$.PRESS-q-TO-EXIT 
--    if (! $status) then 
--        sh -c "$X_VIEWER $$.PRESS-q-TO-EXIT"
--        rm $$.PRESS-q-TO-EXIT 
--    else
--        sh -c "$X_VIEWER $i"
--    endif
--end
--endif
-+
-+echo NOTE: TO MAKE THE PICTURE WINDOW GO AWAY, JUST TYPE 'q' IN IT.
-+if test -z "$1"
-+then
-+	echo "==> TO SAVE THIS IMAGE, COPY THE FILE $SQUIRREL BEFORE EXITING"
-+	echo
-+	$X_VIEWER $SQUIRREL
-+	rm $SQUIRREL
-+else
-+	for i in $SQUIRREL
-+	do
-+		echo "==> TO SAVE THIS IMAGE, COPY THE FILE $i BEFORE EXITING"
-+		echo
-+		dir=$(dirname $i)
-+		base=$(basename $i)
-+		if test ! "$base" = "$i"
-+		then
-+			cd $dir
-+		fi
-+		if ln $i $$.PRESS-q-TO-EXIT  > /dev/null 2>&1
-+		then
-+		    $X_VIEWER $$.PRESS-q-TO-EXIT
-+		    rm $$.PRESS-q-TO-EXIT 
-+		else
-+		    $X_VIEWER $i
-+		fi
-+	done
-+fi
---- metamail-2.7.orig/bin/metasend
-+++ metamail-2.7/bin/metasend
-@@ -1,6 +1,4 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
- # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- # 
- # Permission to use, copy, modify, and distribute this material 
-@@ -13,487 +11,591 @@
- # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
- # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
--#
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
--
--set hname = `hostname`
--set idctr=0
--set MustDelete=0
--set batchmode=0
--set multipart = 1
--if ($?SPLITSIZE) then
--    set splitsize=$SPLITSIZE
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
-+
-+hname=`hostname`
-+idctr=0
-+MustDelete=0
-+batchmode=0
-+multipart=1
-+if test ! -z "${SPLITSIZE:-}"
-+then
-+	splitsize=$SPLITSIZE
- else
--    set splitsize = 100000
--endif
--set outputfile = ""
--set multipartsubtype = "mixed"
--set cdescrip = "An object packed by metasend"
--set isentity=0
--set newid=`date | tr " :" "__"`
--set cid="<${newid}_$idctr@${hname}>"
--@ idctr++
--
--while ($#argv > 0)
--    switch ("$1")
--        case "-S":
--            shift
--            if ($#argv == 0) then
--                echo "-S requires a following argument, the SPLIT threshhold"
--                exit -1
--            endif
--            set splitsize=$1
--            shift
--            breaksw
--        case "-b":
--            # Batch mode -- ALL args must be on command line
--            set batchmode = 1
--            shift
--            breaksw
--        case "-c":
--            shift
--            if ($#argv == 0) then
--                echo "-c requires a following argument, the CC address"
--                exit -1
--            endif
--            set cc="$1"
--            shift
--            breaksw
--        case "-i":
--            shift
--            if ($#argv == 0) then
--                echo "-i requires a following argument, the Content-ID value"
--                exit -1
--            endif
--            set cid=$1
--            shift
--            breaksw
--        case "-I":
--            shift
--            if ($#argv == 0) then
--                echo "-I requires a following argument, the multipart Content-ID value"
--                exit -1
--            endif
--            set multicid=$1
--            shift
--            breaksw
--        case "-s":
--            shift
--            if ($#argv == 0) then
--                echo "-s requires a following argument, the SUBJECT"
--                exit -1
--            endif
--            set subject="$1"
--            shift
--            breaksw
--        case "-t":
--            shift
--            if ($#argv == 0) then
--                echo "-t requires a following argument, the TO address"
--                exit -1
--            endif
--            set to="$1"
--            shift
--            breaksw
--        case "-F":
--            shift
--            if ($#argv == 0) then
--                echo "-F requires a following argument, the FROM address"
--                exit -1
--            endif
--            set from="$1"
--            shift
--            breaksw
--        case "-P":
--            shift
--            if ($#argv == 0) then
--                echo "-P requires a following argument, the preamble file name"
--                exit -1
--            endif
--            set preamblefile="$1"
--            shift
--            breaksw
--        case "-e":
--            shift
--            if ($#argv == 0) then
--                echo "-e requires a following argument, the ENCODING value"
--                exit -1
--            endif
--            set encode=$1
--            if ($encode == "base64") then
--	    set encodingprog = "mimencode -b"
--            else if ($encode == "x-uue") then
--	        set encodingprog = "uuencode mail-body"
--            else if ($encode == "7bit") then
--	        set encodingprog = cat
--           else
--	        set encodingprog = "mimencode -q"
--	        set encode = "quoted-printable"
--           endif 
--           shift
--            breaksw
--        case "-f":
--            shift
--            if ($#argv == 0) then
--                echo "-f requires a following argument, the DATA FILE"
--                exit -1
--            endif
--            set datafile=$1
--            if (! -e  $datafile) then
--                echo The file $datafile does not exist.
--                exit -1
--            endif
--            shift
--            breaksw
--        case "-m":
--            shift
--            if ($#argv == 0) then
--                echo "-m requires a following argument, the MIME CONTENT-TYPE"
--                exit -1
--            endif
--#            set ctyperaw = $1
--#            set  ctype=`echo $ctyperaw | tr \" \'`
--	set ctype = "$1"
--	if (`echo $ctype | grep /` == "") then
--	    echo "Invalid content-type specified"
--	    exit -1
--	endif
--            shift
--            breaksw
--        case "-o":
--            shift
--            if ($#argv == 0) then
--                echo "-o requires a following argument, the output file name"
--                exit -1
--            endif
--            set outputfile="$1"
--            shift
--            breaksw
--        case "-/":
--            shift
--            if ($#argv == 0) then
--                echo "-/ requires a following argument, the multipart subtype"
--                exit -1
--            endif
--            set multipartsubtype="$1"
--            shift
--            breaksw
--        case "-D":
--            shift
--            if ($#argv == 0) then
--                echo "-D requires a following argument, the Content-Description value"
--                exit -1
--            endif
--            set cdescrip="$1"
--            shift
--            breaksw
--        case "-E":
--            set isentity=1
--            shift
--            breaksw
--        case "-z":
--            set MustDelete=1
--            shift
--            breaksw
--        case "-n":
--            if ($isentity) then
--              if (! $?encode) then 
--                set encode=7bit
--                set encodingprog=cat
--              endif
--              if (! $?ctype) then
--                  set ctype=bogus
--                  # Never used
--               endif
--	if ( ! $?datafile) then
--	    echo One part is incomplete -- each part needs at least -f and -E
--	    exit -1
--	endif
--            else 
--	if ( ! $?ctype || ! $?datafile) then
--	    echo One part is incomplete -- each part needs at least -f and -m
--	    exit -1
--	endif
--            endif
--	if (! $?encode) then
--	        if ("$ctype" =~ text*) then
--	              set encodingprog = "mimencode -q"
--		set encode = "quoted-printable"
--	        else
--	            set encode = base64
--	            set encodingprog = "mimencode -b"
--	        endif
--	endif
--	set ctype${multipart} = "$ctype"
--	set datafile${multipart} = $datafile
--	set encode${multipart} = $encode
--	set cdescrip${multipart} = "$cdescrip"
--	set cid${multipart} = "$cid"
--	set isentity${multipart} = $isentity
--	set encodingprog${multipart} = "$encodingprog"
--	unset ctype
--	unset datafile
--	unset encode
--	unset encodingprog
--	set newid=`date | tr " :" "__"`
--	set cid="<${newid}_$idctr@${hname}>"
--	@ idctr++
--	set cdescrip = "An object packed by metasend"
--	set isentity=0
--            @  multipart++
--	shift
--	breaksw
--        default:
--            echo UNRECOGNIZED METASEND OPTION: $1
--            exit -1
--    endsw
--end
--if ($batchmode == 0) then
--    if (! $?to) then
--        echo -n "To: "
--        set to = $<
--    endif
--    if (! $?subject) then
--        echo -n "Subject: "
--        set subject = $<
--    endif
--    if (! $?cc) then
--        echo -n "CC: "
--        set cc = $<
--    endif
--anotherpart:
--    if (! $?ctype) then
--        echo -n "Content-type: "
--#        set ctyperaw = $<
--#        set  ctype=`echo $ctyperaw | tr \" \'`
--        set ctype = "$<"
--    endif
--    if (`echo $ctype | grep /` == "") then
--        echo "Invalid content-type specified"
--        unset ctype
--        goto anotherpart
--    endif
--#    if ($ctype != $ctyperaw)  echo Double  quotes not allowed, using $ctype
--    if (! $?datafile) then
--        getfile:
--        echo -n "Name of file containing $ctype data: "
--        set datafile = $<
--        if (! -e  $datafile) then
--            echo The file $datafile does not exist.
--            goto getfile
--        endif
--    endif
--    if (! $?encode) then
--        retry:
--        echo "Do you want to encode this data for sending through the mail?"
--        echo "  1 -- No, it is already in 7 bit ASCII"
--        echo "  2 -- Yes, encode in base64 (most efficient)"
--        echo "  3 -- Yes, encode in quoted-printable (less efficient, more readable)"
--        echo "  4 -- Yes, encode it using uuencode (not standard, being phased out)"
--        set encode=$<
--        switch ("$encode")
--            case 1:
--                set encodingprog = cat
--	  set encode = 7bit
--                breaksw
--            case 2:
--                set encodingprog = "mimencode -b"
--	  set encode = base64
--                breaksw
--            case 3:
--                set encodingprog = "mimencode -q"
--	  set encode = quoted-printable
--                breaksw
--            case 4:
--                set encodingprog = "uuencode $datafile"
--	  set encode = x-uue
--                breaksw
--            default:
--                echo Unrecognized answer, please try again.
--                goto retry
--        endsw
--    endif
--    echo -n "Do you want to include another file too (y/n) [n] ? "
--    set ans=$<
--    if  ("$ans" =~ y*) then
--	set ctype${multipart} = "$ctype"
--	set datafile${multipart} = $datafile
--	set encode${multipart} = $encode
--	set encodingprog${multipart} = "$encodingprog"
--	set cdescrip${multipart} = "$cdescrip"
--	set cid${multipart} = "$cid"
--	set isentity${multipart} = $isentity
--	set cdescrip = "An object packed by metasend"
--	set isentity=0
--	unset ctype
--	unset datafile
--	unset encode
--	unset encodingprog
--	set newid=`date | tr " :" "__"`
--	set cid="<${newid}_$idctr@${hname}>"
--	@ idctr++
--            @  multipart++
--            goto anotherpart
--     endif
-+	splitsize=100000
-+fi
-+
-+ouputfile=
-+multipartsubtype=mixed
-+cdescrip=    # -Immi
-+attachfilename=    # -Immi
-+isentity=0
-+newid=`date | tr " :" "__"`
-+cid="<${newid}_$idctr@${hname}>"
-+idctr=`expr $idctr + 1`
-+
-+while test ! -z "$*"
-+do
-+	case $1 in
-+		-S) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-S requires a following argument, the SPLIT threshhold"
-+			exit 1
-+		    fi
-+		    splitsize=$1
-+		    shift ;;
-+
-+		-b) batchmode=1
-+		    shift ;;
-+
-+		-c) shift
-+		    if test -z "$*"
-+		    then
-+		    	echo "-c requires a following argument, the CC address"
-+			exit 1
-+		    fi
-+		    cc=$1
-+		    shift ;;
-+
-+		-i) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-i requires a following argument, the Content-ID value"
-+			exit 1
-+		    fi
-+		    cid=$1
-+		    shift ;;
-+
-+		-I) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-I requires a following argument, the multipart Content-ID value"
-+			exit 1
-+		    fi
-+		    multicid=$1
-+		    shift ;;
-+
-+		-s) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-s requires a following argument, the SUBJECT"
-+			exit 1
-+		    fi
-+		    subject=$1
-+		    shift ;;
-+
-+		-t) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-t requires a following argument, the TO address"
-+			exit 1
-+		    fi
-+		    to=$1
-+		    shift ;;
-+
-+		-F) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-F requires a following argument, the FROM address"
-+			exit 1
-+		    fi
-+		    from=$1
-+		    shift ;;
-+
-+		-P) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-P requires a following argument, the preamble file name"
-+			exit 1
-+		    fi
-+		    preamblefile=$1
-+		    shift ;;
-+
-+		-e) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-e requires a following argument, the ENCODING value"
-+			exit 1
-+		    fi
-+		    encode=$1
-+		    case "$encode" in
-+			"base64")	encodingprog="mimencode -b";;
-+			"x-uue")	encodingprog="uuencode \$datafile";;
-+			"7bit")		encodingprog=cat;;
-+			"8bit")		encodingprog=cat;;
-+			*)		encodingprog="mimencode -q"
-+					encode=quoted-printable ;;
-+		    esac
-+		    shift ;;
-+
-+		-f) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-f requires a following argument, the DATA FILE"
-+			exit 1
-+		    fi
-+		    datafile=$1
-+		    if test ! -r "$datafile"
-+		    then
-+			echo The file "$datafile" does not exist
-+			exit 1
-+		    fi
-+		    shift ;;
-+
-+		-m) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-m requires a following argument, the MIME CONTENT-TYPE"
-+			exit 1
-+		    fi
-+		    ctype=$1
-+		    if test "`echo $ctype | grep /`" = ""
-+		    then
-+			echo Invalid content-type specified
-+			exit 1
-+		    fi
-+		    shift ;;
-+
-+		-o) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-o requires a following argument, the output file name"
-+			exit 1
-+		    fi
-+		    outputfile=$1
-+		    shift ;;
-+
-+		-/) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-/ requires a following argument, the multipart subtype"
-+			exit 1
-+		    fi
-+		    multipartsubtype=$1
-+		    shift ;;
-+
-+		-D) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-D requires a following argument, the Content-Description value"
-+			exit 1
-+		    fi
-+		    cdescrip=$1
-+		    shift ;;
-+
-+# begin immi
-+		-A) shift
-+		    if test -z "$*"
-+		    then
-+			echo "-A requires a following argument, the attachment file name"
-+			exit 1
-+		    fi
-+		    attachfilename=$1
-+		    shift ;;
-+#end immi
-+
-+		-E) isentity=1
-+		    shift ;;
-+
-+		-z) MustDelete=1
-+		    shift ;;
-+
-+		-n) if test $isentity -ne 0
-+		    then
-+			if test -z "${encode:-}"
-+			then
-+				encode=7bit
-+				encodingprog=cat
-+			fi
-+			if test -z "${ctype:-}"
-+			then
-+				ctype=bogus
-+				# Never used
-+			fi
-+			if test -z "${datafile:-}"
-+			then
-+				echo One part is incomplete -- each part needs at least -f and -E
-+				exit 1
-+			fi
-+		    else
-+			if test -z "${ctype:-}" || test -z "${datafile:-}"
-+			then
-+				echo One part is incomplete -- each part needs at least -f and -m
-+				exit 1
-+			fi
-+		    fi
-+		    if test -z "${encode:-}"
-+		    then
-+		    	case "$ctype" in
-+				text*)	encodingprog="mimencode -q"
-+					encode=quoted-printable ;;
-+				*)	encodingprog="mimencode -b"
-+					encode=base64 ;;
-+			esac
-+		    fi
-+		    eval ctype${multipart}=\"$ctype\"
-+		    eval datafile${multipart}=$datafile
-+		    eval encode${multipart}=$encode
-+		    eval cdescrip${multipart}=\"$cdescrip\"
-+		    eval attachfilename${multipart}=\"$attachfilename\"   # -Immi
-+		    eval cid${multipart}=\"$cid\"
-+		    eval isentity${multipart}=$isentity
-+		    eval encodingprog${multipart}=\"\$encodingprog\"
-+
-+		    ctype=
-+		    datafile=
-+		    encode=
-+		    encodingprog=
-+		    newid=`date | tr " :" "__"`
-+		    cid="<${newid}_$idctr@${hname}>"
-+		    idctr=`expr $idctr + 1`
-+		    cdescrip=             # -Immi
-+		    attachfilename=       # -Immi
-+		    isentity=0
-+		    multipart=`expr $multipart + 1`
-+		    shift ;;
-+
-+		*) echo UNRECOGNIZED METASEND OPTION: "$1"
-+		   exit 1 ;;
-+	esac
-+done
-+
-+if test $batchmode -eq 0
-+then
-+	if test -z "${to:-}"
-+	then
-+		echo -n "To: "
-+		read to
-+	fi
-+	if test -z "${subject:-}"
-+	then
-+        	echo -n "Subject: "
-+		read subject
-+	fi
-+	if test -z "${cc:-}"
-+	then
-+		echo -n "CC: "
-+		read cc
-+	fi
-+
-+	anotherpart=1
-+	while test $anotherpart -eq 1
-+	do
-+	    looping=1
-+	    while test $looping -ne 0
-+	    do
-+	        if test -z "${ctype:-}"
-+	        then
-+        		echo -n "Content-type: "
-+			read ctype
-+		fi
-+		if test "`echo $ctype | grep /`" = ""
-+		then
-+			echo Invalid content-type specified
-+			ctype=
-+		else
-+			looping=0
-+		fi
-+	    done
-+	    if test -z "${datafile:-}"
-+	    then
-+		looping=1
-+		while test $looping -eq 1
-+		do
-+			echo -n "Name of file containing $ctype data: "
-+			read datafile
-+			if test -r "$datafile"
-+			then
-+				looping=0
-+			else
-+				echo "The file $datafile does not exist."
-+			fi
-+		done
-+	    fi
-+
-+	    if test -z "${encode:-}"
-+	    then
-+		looping=1
-+		while test $looping -eq 1
-+		do
-+			echo "Do you want to encode this data for sending through the mail?"
-+			echo "  1 -- No, it is already in 7 bit ASCII"
-+			echo "  2 -- Yes, encode in base64 (most efficient)"
-+			echo "  3 -- Yes, encode in quoted-printable (less efficient, more readable)"
-+			echo "  4 -- Yes, encode it using uuencode (not standard, being phased out)"
-+			echo "  5 -- No, it is 8 bit extended ASCII"
-+			read encode
-+			looping=0
-+			case "$encode" in
-+				1) encodingprog=cat
-+				   encode=7bit ;;
-+				2) encodingprog="mimencode -b"
-+				   encode=base64 ;;
-+				3) encodingprog="mimencode -q"
-+				   encode=quoted-printable ;;
-+				4) encodingprog="uuencode $datafile"
-+				   encode=x-uue ;;
-+ 				5) encodingprog=cat
-+ 				   encode=8bit ;;
-+				*) echo Unrecognized answer, please try again.
-+				   looping=1 ;;
-+			esac
-+		done
-+	    fi
-+
-+	    echo -n "Do you want to include another file too (y/n) [n] ? "
-+	    read ans
-+	    case $ans in
-+		[Yy]*)	
-+		    eval ctype${multipart}=\"$ctype\"
-+		    eval datafile${multipart}=$datafile
-+		    eval encode${multipart}=$encode
-+		    eval encodingprog${multipart}=\"\$encodingprog\"
-+		    eval cdescrip${multipart}=\"$cdescrip\"
-+		    eval attachfilename${multipart}=\"$attachfilename\"   # -Immi
-+		    eval cid${multipart}=\"$cid\"
-+		    eval isentity${multipart}=$isentity
-+		    cdescrip=         # -Immi
-+		    attachfilename=   # -Immi
-+		    isentity=0
-+		    ctype=
-+		    datafile=
-+		    encode=
-+		    encodingprog=
-+		    newid=`date | tr " :" "__"`
-+		    cid="<${newid}_$idctr@${hname}>"
-+		    idctr=`expr $idctr + 1`
-+		    multipart=`expr $multipart + 1`
-+		    ;;
-+		*)
-+		    anotherpart=0;;
-+	    esac
-+	done
-+
- else
--    if ($outputfile == "") then
--      if (! $?to || ! $?subject || ! $?ctype || ! $?datafile) then
--        echo metasend: in batch mode, if output is not directed to a file,-t, -s, -f, and -m are all required
--        exit -1
--      endif
--    else
--      if (! $?datafile) then
--        echo metasend:  in batch mode, -f is required.
--      endif
--      if ($isentity) then
--        if (! $?ctype) then
--          set ctype=bogus
--          # will not be used anyway really
--        endif
--      endif
--      if (! $?ctype  ) then
--        echo metasend: in batch mode, with output directed to a file, -E or -m is required
--        exit -1
--      endif
--    endif    
--    if (! -e  $datafile) then
--        echo metasend:  The file $datafile does not exist
--        exit -1
--    endif
--#    if (! $?cc) set cc=""
--#     if ($ctype != $ctyperaw)  echo Double  quotes not allowed, using $ctype
--    if (! $?encode) then
--        if ("$ctype" =~ text*) then
--	set encodingprog = "mimencode -q"
--	set encode = "quoted-printable"
--        else
--            set encodingprog = "mimencode -b"
--            set encode = base64
--        endif
--    else if ($encode == "base64") then
--        set encodingprog = "mimencode -b"
--    else if ($encode == "x-uue") then
--        set encodingprog = "uuencode mail-body"
--    else if ($encode == "7bit") then
--        set encodingprog = cat
--    else
--        set encodingprog = "mimencode -q"
--        set encode = "quoted-printable"
--    endif
--endif
--
--if (! $?encode) then
--        if ("$ctype" =~ text*) then
--	set encode = "quoted-printable"
--	set encodingprog = "mimencode -q"
--        else
--            set encode = base64
--            set encodingprog = "mimencode -b"
--        endif
--endif
--set ctype${multipart} = "$ctype"
--set datafile${multipart} = $datafile
--set encode${multipart} = $encode
--set cdescrip${multipart} = "$cdescrip"
--set cid${multipart} = "$cid"
--set isentity${multipart} = $isentity
--set encodingprog${multipart} = "$encodingprog"
-+	if test -z "${outputfile:-}"
-+	then
-+	    if test -z "${to:-}" \
-+		-o -z "${subject:-}" \
-+		-o -z "${ctype:-}" \
-+		-o -z "${datafile:-}"
-+	    then
-+		echo "metasend: in batch mode, if output is not directed to a file,  -t, -s, -f, and -m are all required"
-+		exit 1
-+	    fi
-+	else
-+	    if test -z "${datafile:-}"
-+	    then
-+		echo "metasend: in batch mode, -f is required."
-+		exit 1
-+	    fi
-+	    if test $isentity -ne 0
-+	    then
-+	        if test -z "${ctype:-}"
-+	        then
-+			ctype=bogus
-+			#  will not be used anyway
-+		fi
-+	    fi
-+	    if test -z "${ctype:-}"
-+	    then
-+		echo "metasend: in batch mode, with output directed to a file, -E or -m is required."
-+		exit 1
-+	    fi
-+	fi
-+
-+
-+	if test ! -r "$datafile"
-+	then
-+		echo "metasend: The file $datafile does not exist"
-+		exit 1
-+	fi
-+
-+#	if test -z "${cc:-}"
-+#	then
-+#		cc=''
-+#	fi
-+
-+	if test -z "${encode:-}"
-+	then
-+		case "$ctype" in
-+			text*) encodingprog="mimencode -q"
-+			       encode=quoted-printable ;;
-+			*) encodingprog="mimencode -b"
-+			   encode=base64 ;;
-+		esac
-+	else
-+		case "$encode" in
-+			base64) encodingprog="mimencode -b" ;;
-+			x-uue)  encodingprog="uuencode $datafile" ;;
-+			7bit)   encodingprog=cat ;;
-+			8bit)   encodingprog=cat ;;
-+			*) encodingprog="mimencode -q"
-+			   encode=quoted-printable ;;
-+		esac
-+	fi
-+fi
-+
-+if test -z "${encode:-}"
-+then
-+	case "$ctype" in
-+		text*) encodingprog="mimencode -q"
-+		       encode=quoted-printable ;;
-+		*) encodingprog="mimencode -b"
-+		   encode=base64 ;;
-+	esac
-+fi
-+
-+eval ctype${multipart}=\"$ctype\"
-+eval datafile${multipart}=$datafile
-+eval encode${multipart}=$encode
-+eval cdescrip${multipart}=\"$cdescrip\"
-+eval attachfilename${multipart}=\"$attachfilename\"   # -Immi
-+eval cid${multipart}=\"$cid\"
-+eval isentity${multipart}=$isentity
-+eval encodingprog${multipart}=\"\$encodingprog\"
- 
--set fname = ${METAMAIL_TMPDIR}/metasend.$$
-+fname=`tempfile -p metamail -m 600`
- echo "MIME-Version: 1.0" > $fname
--if ($?to) then
--    echo "To: " "$to" >> $fname
--endif
--if ($?subject) then
--    echo "Subject: " "$subject" >> $fname
--endif
--if ($?cc) then
--    echo "CC: " "$cc" >> $fname
--endif
--if ($?from) then
--    echo "From: " "$from" >> $fname
--endif
--if ($multipart > 1) then
--    set  boundary = ${hname}.$$.`date | tr "  " .`
--    set newid=`date | tr " :" "__"`
--    if ($?multicid) then
--        echo "Content-ID: $multicid"   >> $fname
--    else
--        echo "Content-ID: <${newid}_$idctr@${hname}>"   >> $fname
--        @ idctr++
--    endif
--    echo "Content-type: multipart/$multipartsubtype;" >> $fname
--    echo "	boundary="\"$boundary\" >> $fname
--    echo "" >> $fname
--    if ($?preamblefile) then
--        cat $preamblefile >> $fname
--    else
--        echo "This is  a multimedia message in MIME  format.  If you are reading this" >> $fname
--        echo "prefix, your mail reader does  not understand MIME.  You may wish" >> $fname
--        echo "to look into upgrading to a newer version of  your mail reader." >> $fname
--    endif
--    set i=1
--    set junkfile=${METAMAIL_TMPDIR}/mmjunk.$$
--    while  ($multipart >= $i)
-+
-+if test ! -z "${to:-}"
-+then echo "To: $to" >> $fname
-+fi
-+if test ! -z "${subject:-}"
-+then echo "Subject: $subject" >> $fname
-+fi
-+if test ! -z "${cc:-}"
-+then echo "CC: $cc" >> $fname
-+fi
-+if test ! -z "${from:-}"
-+then echo "From: $from" >> $fname
-+fi
-+
-+if test $multipart -gt 1
-+then
-+	boundary=${hname}.$$.`date | tr "  " .`
-+	newid=`date | tr " :" "__"`
-+	if test ! -z "${multicid:-}"
-+	then
-+		echo "Content-ID: $multicid" >> $fname
-+	else
-+		echo "Content-ID: ${newid}_$idctr@${hname}" >> $fname
-+		idctr=`expr $idctr + 1`
-+	fi
-+	echo "Content-type: multipart/$multipartsubtype;" >> $fname
-+	echo "	boundary="\"$boundary\" >> $fname
-+	echo "" >> $fname
-+	if test ! -z "${preamblefile:-}"
-+	then
-+		cat $preamblefile >> $fname
-+	else
-+		echo "This is  a multimedia message in MIME  format.  If you are reading this" >> $fname
-+		echo "prefix, your mail reader does  not understand MIME.  You may wish" >> $fname
-+		echo "to look into upgrading to a newer version of  your mail reader." >> $fname
-+	fi
-+
-+	i=1
-+	while test $multipart -ge $i
-+	do
-+		echo "" >> $fname
-+		echo --$boundary >> $fname
-+		eval isentity=\$isentity$i
-+
-+		if test $isentity -eq 0
-+		then
-+			eval echo "Content-ID: \$cid$i" >> $fname
-+			eval echo "Content-type: \$ctype$i" >> $fname
-+#begin immi
-+			eval cdescrip=\$cdescrip$i
-+			if test ! -z "$cdescrip"
-+			then
-+				echo "Content-Description: $cdescrip" >> $fname
-+			fi
-+			eval attachfilename=\$attachfilename$i
-+			if test ! -z "$attachfilename"
-+			then
-+				echo "Content-Disposition: attachment; filename=\"$attachfilename\"" >> $fname
-+			fi
-+#end immi
-+			eval echo "Content-Transfer-Encoding: \$encode$i" >> $fname
-+			echo "" >> $fname
-+		fi
-+		eval \$encodingprog$i \< \"\$datafile$i\" \>\> $fname
-+		i=`expr $i + 1`
-+	done
-+	echo "" >> $fname
-+	echo --${boundary}-- >> $fname
- 	echo "" >> $fname
--	echo --$boundary >> $fname
--	echo set isentity=\$isentity$i > $junkfile
--	source $junkfile
--	if (! $isentity) then
--	    echo -n "Content-ID: "   >> $fname
--	    echo echo \$cid$i \>\>  $fname > $junkfile
--	    source $junkfile 
--	    echo -n "Content-type: ">>$fname
--	    echo echo \$ctype$i \>\>  $fname > $junkfile
--	    source $junkfile 
--	    echo -n "Content-Description: ">>$fname
--	    echo echo \"\$cdescrip$i \" \>\>  $fname > $junkfile
--	    source $junkfile 
--	    echo -n "Content-Transfer-Encoding: " >>$fname
--	    echo echo \$encode$i \>\> $fname > $junkfile
--	    source $junkfile 
--	    echo ""  >> $fname
--	endif
--	echo \$encodingprog$i \< \$datafile$i \>\> $fname > $junkfile
--	source $junkfile 
--	@ i++
--    end
--    rm $junkfile
--    echo "" >> $fname
--    echo --${boundary}-- >> $fname
--    echo "" >> $fname
--else 
--    if (! $isentity) then
--        echo "Content-ID: $cid"   >> $fname
--        echo "Content-type: " $ctype >> $fname
--        echo "Content-Description: " $cdescrip >> $fname
--        echo "Content-Transfer-Encoding: " $encode >> $fname
--    endif
--    echo  "" >> $fname
--    $encodingprog < $datafile >> $fname
--    # Ensure last line has trailing carriage return
--    echo "" >> $fname
--endif
--if ($outputfile == "") then
--    if ($batchmode == 0) echo -n "Delivering mail, please wait...  "
--    splitmail -s $splitsize -d $fname
--    if (! $status) then
--        if ($batchmode == 0) echo "Mail delivery apparently succeeded."
--        rm $fname
--    else if ($MustDelete == 1) then
--        echo Mail delivery failed
--        rm $fname
--        exit -1
--    else
--        echo Mail delivery failed, draft mail is in $fname
--        exit -1
--    endif
- else
--    mv $fname $outputfile
--    if ($status) exit -1
--endif
-+	if test $isentity -eq 0
-+	then
-+		echo "Content-ID: $cid" >> $fname
-+		echo "Content-type: $ctype" >> $fname
-+#begin immi
-+		if test ! -z "$cdescrip"
-+		then
-+			echo "Content-Description: $cdescrip" >> $fname
-+		fi
-+		if test ! -z "$attachfilename"
-+		then
-+			echo "Content-Disposition: attachment; filename=\"$attachfilename\"" >> $fname
-+		fi
-+#end immi
-+		echo "Content-Transfer-Encoding: $encode" >> $fname
-+	fi
-+	echo "" >> $fname
-+	$encodingprog < "$datafile" >> $fname
-+	# Ensure last line has trailing carriage return
-+	echo "" >> $fname
-+fi
-+
-+if test -z "${outputfile:-}"
-+then
-+	if test $batchmode = 0
-+	then
-+		echo -n "Delivering mail, please wait...  "
-+	fi
-+	splitmail -s "$splitsize" -d $fname
-+
-+	if test $? -eq 0
-+	then
-+		if test $batchmode = 0
-+		then
-+			echo "Mail delivery apparently succeeded."
-+		fi
-+		rm $fname
-+	elif test "$MustDelete" -eq 1
-+	then
-+		echo Mail delivery failed
-+		rm $fname
-+		exit -1
-+	else
-+		echo "Mail delivery failed, draft mail is in $fname"
-+		exit -1
-+	fi
-+else
-+	mv $fname "$outputfile"
-+	if test $? -ne 0
-+	then
-+		exit -1
-+	fi
-+fi
- exit 0
- 
-+
---- metamail-2.7.orig/bin/showpartial
-+++ metamail-2.7/bin/showpartial
-@@ -1,92 +1,156 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
--
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
--
--set TREEROOT=${METAMAIL_TMPDIR}/m-prts-`whoami`
--if ($#argv < 3 || $#argv > 4) then
--    echo "Usage:  showpartial file id partnum totalnum"
--    exit -1
--endif
--set file=$1
-+#!/bin/sh -e
-+# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+# 
-+# Permission to use, copy, modify, and distribute this material 
-+# for any purpose and without fee is hereby granted, provided 
-+# that the above copyright notice and this permission notice 
-+# appear in all copies, and that the name of Bellcore not be 
-+# used in advertising or publicity pertaining to this 
-+# material without the specific, prior written permission 
-+# of an authorized representative of Bellcore.  BELLCORE 
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+if [ -z "$METAMAIL_TMPDIR" ]
-+then
-+	METAMAIL_TMPDIR=/tmp
-+fi
-+
-+
-+
-+if test -z "$3" -o ! -z "$5"
-+then
-+	echo "Usage: showpartial file id partnum totalnum"
-+	exit 1
-+fi
-+
-+file=$1
-+
- # This next line is because message-id can contain weird chars
--set id=`echo $2 | tr -d  \!\$\&\*\(\)\|\'\"\;\/\<\>\\` 
--@ partnum = $3
--if ($#argv == 3 || $4 == "") then
--    set totalnum=-1
-+id=$(echo "$2" | tr -d \!\$\&\*\(\)\|\'\"\;\/\<\>\\\\ )
-+
-+partnum=$3
-+
-+if test -z "$4"
-+then
-+	totalnum=-1
-+else
-+	totalnum=$4
-+fi
-+
-+if [ -n "$HOME" ] ; then
-+# If we have a home directory, create a temporary dir and
-+# store the name there unless the file already exists
-+# and the directory it points to is valid directory
-+	[ -e "$HOME/.metamail_treeroot" ] && TREEROOT=`cat $HOME/.metamail_treeroot`
-+	[ -e "$TREEROOT" ] && [ ! -d "$TREEROOT" ] && rm -f "$TREEROOT" 
-+	if [ ! -e "$HOME/.metamail_treeroot" ] || [ ! -e "$TREEROOT" ]; then
-+		TREEROOT=`mktemp -d -t msg-parts.XXXXXX` || { echo "$0: Cannot create temporary dir!" >&2 ; exit 1; }
-+		echo $TREEROOT >$HOME/.metamail_treeroot
-+	fi
- else
--    @ totalnum = $4
--endif
-+	TREEROOT=$METAMAIL_TMPDIR/msg-parts-`whoami`
-+	# Sanity check: is this a directory?
-+	[ -e "$TREEROOT" ] && [ ! -d "$TREEROOT" ] && rm -f "$TREEROOT" 
-+	# Sanity check, does it belong to us?
-+	if [ -d "$TREEROOT" ] ; then
-+		treeuid=`stat -c %u "$TREEROOT"`
-+		if [ "$treeuid" -ne "`id -u`" ]; then
-+			echo "$0: Tried to use $TREEROOT but it does not belong to us! Aborting." >&2
-+			exit 1
-+		fi
-+	else
-+		mkdir -p "$TREEROOT" || { echo "$0: Cannot create dir $TREEROOT!" >&2 ; exit 1; }
-+	fi
-+
-+fi
-+if test ! -d "${TREEROOT}/$id"
-+then
-+	mkdir "${TREEROOT}/$id"
-+	if test $? -ne 0
-+	then
-+	        echo mkdir "${TREEROOT}/$id" failed
-+		exit 1
-+	fi
-+fi
- 
--if (! -d  $TREEROOT)  then
--    mkdir $TREEROOT
--    if ($status) then 
--        echo mkdir $TREEROOT failed
--        exit -1
--    endif
--endif
--if (! -d ${TREEROOT}/$id) then 
--    mkdir ${TREEROOT}/$id
--    if ($status) then 
--        echo mkdir ${TREEROOT}/$id failed
--        exit -1
--    endif
--endif
--cp $file ${TREEROOT}/$id/$partnum
--if ($status) then 
--    echo cp $file ${TREEROOT}/$id/$partnum failed
--    exit -1
--endif
--if ($totalnum == -1) then
--    if (-e ${TREEROOT}/$id/CT) then
--	set totalnum=`cat ${TREEROOT}/$id/CT`
--    else
--    	set totalnum=-1  #GROSS HACK
--    endif
-+cp $file "${TREEROOT}/$id/$partnum"
-+if test $? -ne 0
-+then
-+	echo cp $file "${TREEROOT}/$id/$partnum" failed
-+	exit 1
-+fi
-+
-+if test $totalnum -eq -1
-+then
-+	if test -r "${TREEROOT}/$id/CT"
-+	then
-+		totalnum=`cat "${TREEROOT}/$id/CT"`
-+	else
-+    		totalnum=-1
-+	fi
- else
--    echo $totalnum >! ${TREEROOT}/$id/CT
--endif
-+	echo $totalnum > "${TREEROOT}/$id/CT"
-+fi
-+
- # Slightly bogus here -- the shell messes up the newlines in the headers
--# If you put $MM_HEADERS in quotes, it doesn't help.
- # if ($partnum == 1) then
--#     echo $MM_HEADERS > ${TREEROOT}/$id/HDRS
-+#     echo $MM_HEADERS > "${TREEROOT}/$id/HDRS"
- # endif
--set found=0
--set ix=1
--set list=""
--set limit=$totalnum
--if ($limit == -1) set limit=25
--while ($ix <= $limit)
--    if (-e ${TREEROOT}/$id/$ix) then
--	set list="$list $ix"
--	@ found ++
--    endif
--    @ ix ++
--end
--if ($found == $totalnum) then
--    cd ${TREEROOT}/$id
--    cat $list > ${TREEROOT}/$id/FULL
--#    cat ${TREEROOT}/$id/HDRS $list > ${TREEROOT}/$id/FULL
--    rm $list
--    echo All parts of this ${totalnum}-part message have now been read.
--    metamail -d  ${TREEROOT}/$id/FULL
--    echo WARNING:  To save space, the full file is now being deleted.  
--    echo You will have to read all $totalnum parts again to see the full message again.
--    rm ${TREEROOT}/$id/FULL
--    rm ${TREEROOT}/$id/CT
--#    rm ${TREEROOT}/$id/HDRS
--    cd
--    rmdir ${TREEROOT}/$id
--    rmdir ${TREEROOT} >& /dev/null
-+found=0
-+ix=1
-+list=
-+limit=$totalnum
-+if test "$limit" -eq -1
-+then
-+	limit=25
-+fi
-+
-+while test "$ix" -le "$limit"
-+do
-+	if test -f "${TREEROOT}/$id/$ix"
-+	then
-+		list="$list $ix"
-+		found=$(($found + 1))
-+	fi
-+	ix=`expr $ix + 1`
-+done
-+
-+if test $found = "$totalnum"
-+then
-+	cd "${TREEROOT}/$id"
-+	cat $list > "${TREEROOT}/$id/FULL"
-+	rm $list
-+	echo All parts of this "${totalnum}"-part message have now been read.
-+	metamail -d < "${TREEROOT}/$id/FULL"
-+	echo WARNING:  To save space, the full file is now being deleted.  
-+	echo You will have to read all "$totalnum" parts again to see the full message again.
-+	rm "${TREEROOT}/$id/FULL"
-+	rm "${TREEROOT}/$id/CT"
-+	cd ${METAMAIL_TMPDIR}
-+	rmdir "${TREEROOT}/$id"
-+	rmdir ${TREEROOT} > /dev/null 2>&1
-+	[ -e "$HOME/.metamail_treeroot" ] && > "$HOME/.metamail_treeroot" 
- else
--    if (${totalnum} == -1) then
--        echo So far you have only read $found of the several parts of this message.
--    else
--        echo So far you have only read $found of the $totalnum parts of this message.
--    endif
--    echo When you have read them all, then you will see the message in full.
--endif
--    
-+	if test "$totalnum" -eq -1
-+	then
-+		echo So far you have only read $found of the several parts of this message.
-+	else
-+		echo So far you have only read $found of the "$totalnum" parts of this message.
-+	fi
-+	echo When you have read them all, then you will see the message in full.
-+fi
---- metamail-2.7.orig/bin/audiosend
-+++ metamail-2.7/bin/audiosend
-@@ -1,6 +1,4 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
- # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- # 
- # Permission to use, copy, modify, and distribute this material 
-@@ -13,97 +11,114 @@
- # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
- # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
--#
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
- 
- # This is to make metamail/showaudio do playback on the speaker, not the phone.
--setenv AUDIOSPEAKERFORCE 1 
-+AUDIOSPEAKERFORCE=1 ; export AUDIOSPEAKERFORCE
-+
-+if test -d /usr/sony
-+then
-+	dev=/dev/sb0
-+else
-+	dev=/dev/audio
-+fi
- 
--if (-d /usr/sony) then
--    set dev=/dev/sb0
-+if test -f /usr/sbin/sendmail
-+then
-+    MAILCOMMAND=/usr/sbin/sendmail
- else
--    set dev=/dev/audio
--endif
-+    MAILCOMMAND=mail
-+fi
- 
--if ( $#argv == 1 ) then
--    set to = $1
-+if test ! -z "${1:-}"
-+then
-+    to=$1
- else
-     echo -n "To: "
--    set to = $<
--endif
-+    read to
-+fi
- echo -n "Subject: "
--set subject = $<
-+read subject
- echo -n "CC: "
--set cc = $<
-+read cc
- 
--record:
--echo -n "Press RETURN when you are ready to start recording: "
--set foo = $<
--
--set fname = ${METAMAIL_TMPDIR}/audio-out.$$
--set fnameraw = ${METAMAIL_TMPDIR}/audio-raw.$$
--
--echo "To: " "$to" > $fname
--echo "Subject: " "$subject" >> $fname
--echo "CC: " "$cc" >> $fname
--echo "MIME-Version: 1.0" >> $fname
--echo "Content-Type: audio/basic" >> $fname
--echo "Content-Transfer-Encoding: base64" >> $fname
--echo  "" >> $fname
--# THIS IS UNBELIEVABLY GRUBBY
--onintr cleanup
--if (! $?RECORD_AUDIO) then
--    (/bin/cat < $dev > $fnameraw) &
--else
--    ($RECORD_AUDIO > $fnameraw) &
--endif
--jobs -l > ${METAMAIL_TMPDIR}/AUDCAT.$$
--set foo=`/bin/cat ${METAMAIL_TMPDIR}/AUDCAT.$$`
--/bin/rm ${METAMAIL_TMPDIR}/AUDCAT.$$
--set PID=$foo[2]
--echo -n "press RETURN when you are done recording: "
--set foo=$<
--echo One moment please...
--/bin/sleep 1
--echo -n Killing recording job...
--/bin/kill -9 $PID >& /dev/null
--mimencode -b < $fnameraw >> $fname
--/bin/rm $fnameraw
--echo "" >> $fname
--
--whatnext:
--echo ""
--echo "What do you want to do?"
--echo ""
--echo "1 -- Send mail"
--echo "2 -- Listen to recorded message"
--echo "3 -- Replace with a new recording"
--echo "4 -- Quit"
--set which = $<
--    switch ("$which")
--        case 1:
--          echo -n "Sending mail, please wait...  "
--          /usr/lib/sendmail $to  $cc < $fname
--          if (! $status) then
--            echo "Done."
--            rm $fname
--            exit
--          else
--            echo Mail delivery failed, draft mail is in $fname
--          endif
--          breaksw
--        case 2:
--          metamail -d $fname
--          breaksw
--        case 3:
--          goto record
--        case 4:
--          exit
--    endsw
--goto whatnext
--exit 0
--cleanup:
--kill -9 $PID >& /dev/null
-+record=1
-+
-+while true
-+do
-+	if test $record -eq 1
-+	then
-+		echo -n "Press RETURN when you are ready to start recording: "
-+		read foo
-+
-+		fname=`tempfile -p metamail -m 600`
-+		fnameraw=`tempfile -p metamail -m 600`
-+
-+		echo "To: $to" > $fname
-+		echo "Subject: $subject" >> $fname
-+		echo "CC: $cc" >> $fname
-+		echo "MIME-Version: 1.0" >> $fname
-+		echo "Content-Type: audio/basic" >> $fname
-+		echo "Content-Transfer-Encoding: base64" >> $fname
-+		echo "" >> $fname
-+
-+		trap "kill -9 $! > /dev/null 2>&1" HUP INT TERM
-+
-+		if test -z "RECORD_AUDIO"
-+		then
-+			(cat < $dev > $fnameraw) &
-+		else
-+			($RECORD_AUDIO > $fnameraw) &
-+		fi
-+		echo -n "press RETURN when you are done recording: "
-+		read foo
-+		echo One moment please...
-+		sleep 1
-+		echo -n Killing recording job...
-+		kill -9 $! > /dev/null 2>&1
-+		mimencode -b < $fnameraw >> $fname
-+		rm $fnameraw
-+		echo "" >> $fname
-+	fi
-+	record=0
-+
-+	echo ""
-+	echo "What do you want to do?"
-+	echo ""
-+	echo "1 -- Send mail"
-+	echo "2 -- Listen to recorded message"
-+	echo "3 -- Replace with a new recording"
-+	echo "4 -- Quit"
-+	read which
-+	case $which in
-+		1) echo -n "Sending mail, please wait...  "
-+		  $MAILCOMMAND $to $cc < $fname
-+
-+		  if test $? -eq 0
-+		  then
-+			echo Done.
-+			rm $fname
-+			exit 0
-+		  else
-+			echo Mail delivery failed, draft is in $fname
-+		  fi ;;
-+		2) metamail -d $fname ;;
-+		3) record=1 ;;
-+		4) exit 0 ;;
-+	esac
-+done
---- metamail-2.7.orig/bin/patch-metamail
-+++ metamail-2.7/bin/patch-metamail
-@@ -1,20 +1,58 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
--set HOSTNAME=thumper.bellcore.com
--set DIRNAME=pub/nsb
--set PREFIX="mm.patch."
--
--if ($#argv < 2 || $#argv > 5) then
--	echo Usage:  patch-metamail source-tree-root patch-number [hostname [dirname [prefix]]]
--	exit -1
--endif
--
--set TREEROOT=$1
--set PATCHNUMBER=$2
--if ($#argv > 2) set HOSTNAME=$3
--if ($#argv > 3) set DIRNAME=$4
--if ($#argv > 4) set PREFIX=$5
-+#!/bin/sh -e
-+# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+# 
-+# Permission to use, copy, modify, and distribute this material 
-+# for any purpose and without fee is hereby granted, provided 
-+# that the above copyright notice and this permission notice 
-+# appear in all copies, and that the name of Bellcore not be 
-+# used in advertising or publicity pertaining to this 
-+# material without the specific, prior written permission 
-+# of an authorized representative of Bellcore.  BELLCORE 
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Conversion from C shell to Bourne shell
-+# by Bob Glickstein, Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp. (Z-Code)
-+# 
-+# Permission to use, copy, modify, and distribute this material for
-+# any purpose and without fee is hereby granted, provided that the
-+# above copyright notice and this permission notice appear in all
-+# copies, and that the name of Z-Code not be used in advertising or
-+# publicity pertaining to this material without the specific, prior
-+# written permission of an authorized representative of Z-Code.
-+# Z-CODE MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY OF
-+# THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", WITHOUT ANY
-+# EXPRESS OR IMPLIED WARRANTIES.
-+
-+HOSTNAME=thumper.bellcore.com
-+DIRNAME=pub/nsb
-+PREFIX=mm.patch.
-+
-+if test -z "$2" -o ! -z "$6"
-+then
-+	echo "Usage: patch-metamail source-tree-root patch-number [hostname [dirname [prefix]]]"
-+	exit 1
-+fi
-+
-+TREEROOT=$1
-+PATCHNUMBER=$2
-+
-+if test ! -z "$3"
-+then
-+	HOSTNAME=$3
-+fi
-+
-+if test ! -z "$4"
-+then
-+	DIRNAME=$4
-+fi
-+
-+if test ! -z "$5"
-+then
-+	PREFIX=$5
-+fi
- 	
- echo WARNING:  This program, if allowed to do so, will attempt to 
- echo install a PATCH file for your metamail sources which are rooted 
-@@ -22,15 +60,16 @@
- echo ""
- echo It will use a patch file that it retrieves via anonymous ftp
- echo from the host $HOSTNAME, in the directory $DIRNAME, 
--echo with filenames starting with ${PREFIX}.
-+echo with filenames starting with $PREFIX.
- echo ""
--echo -n "Do you want to install the patch in directory $TREEROOT [y/n] ? "
--set ans=$<
--if ($ans == "y" || $ans == "Y") then
--    cd $TREEROOT
--    set ident=`whoami`@`hostname`
--    echo Using anonymous ftp with password $ident
--    ftp -n <<!
-+echo -n "Do you want to install the patch in directory $TREEROOT (y/n)? [n] "
-+read ans
-+
-+case "$ans" in
-+	[Yy]*) cd $TREEROOT
-+	       ident=`whoami`@`hostname`
-+	       echo Using anonymous ftp with password $ident
-+	       ftp -n <<!
- open $HOSTNAME
- user anonymous $ident
- cd $DIRNAME
-@@ -38,8 +77,6 @@
- get ${PREFIX}${PATCHNUMBER}
- quit
- !
--    patch -p < ${PREFIX}${PATCHNUMBER}
--else
--	echo Patch not installed
--endif
--
-+	       patch -p < ${PREFIX}${PATCHNUMBER} ;;
-+	*) echo Patch not installed
-+esac
---- metamail-2.7.orig/bin/showexternal
-+++ metamail-2.7/bin/showexternal
-@@ -1,6 +1,4 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
- # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- # 
- # Permission to use, copy, modify, and distribute this material 
-@@ -13,142 +11,174 @@
- # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
- # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
--# 
- 
--onintr cleanup
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
--if (! $?FTP) then
--    set FTP=ftp
--endif
--
--if ($#argv <3) then
--    echo "Usage: showexternal body-file access-type name [site [directory [mode [server]]]]"
--    exit -1
--endif
--set bodyfile=$1
--set atype=`echo $2 | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
--set name=$3
--if ($#argv > 3) then
--    set site=$4
--else 
--    set site=""
--endif
--if ($#argv > 4) then
--    set dir=$5
--else
--    set dir=""
--endif
--if ($#argv > 5) then
--    set mode=$6
--else
--    set mode=""
--endif
--if ($#argv > 6) then
--    set server=$7
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
-+
-+if test -f /usr/sbin/sendmail
-+then
-+    MAILCOMMAND=/usr/sbin/sendmail
- else
--    set server=""
--endif
-+    MAILCOMMAND=/bin/mail
-+fi
- 
--if ("$server" == "" && $atype == "mail-server") then
--# Backward compatibility with some broken stuff
--    set server=${name}@${site}
--    echo WARNING -- old style mailserver syntax, using server $server
--endif
--
--set ctype="`grep -i content-type: $bodyfile | sed -e 's/............: //'`"
--if ("$ctype" == "") set ctype="text/plain"
--set cenc=`grep -i content-transfer-encoding: $bodyfile | sed -e 's/.........................: //'`
--set username=""
--set pass=""
--set TMPDIR=${METAMAIL_TMPDIR}/XXXternal.$$
-+if test "$#" -lt 3
-+then
-+	echo "Usage: showexternal body-file access-type name [site [directory [mode]]]"
-+	exit 1
-+fi
-+
-+if [ -z "$METAMAIL_TMPDIR" ]
-+then
-+	METAMAIL_TMPDIR=/tmp
-+fi
-+
-+# Check argument integrity. Don't trust mail headers
-+if echo "$1$2$3$4$5$6$7" | grep -q '[[:space:]]'
-+then
-+	echo "Illegal white space in arguments -- possibly a mail bomb?!"
-+	echo "Command was:"
-+	echo \'$0\' \'$1\' \'$2\' \'$3\' \'$4\' \'$5\' \'$6\' \'$7\'
-+	exit 2
-+fi
-+
-+bodyfile=$1
-+atype=$(echo "$2" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)
-+name=$3
-+
-+site=$4
-+
-+dir=$5
-+
-+mode=$6
-+
-+server=$7
-+
-+if test -z "$server" -a $atype = "mail-server"
-+then
-+	server=${name}@${site}
-+	echo WARNING -- old style mailserver syntax, using server "$server"
-+fi
-+
-+ctype=$(grep -i content-type: "$bodyfile" | sed -e 's/............: //')
-+if test -z "$ctype"
-+then ctype="text/plain"
-+fi
-+cenc=$(grep -i content-transfer-encoding: "$bodyfile" | sed -e 's/.........................: //')
-+username=
-+pass=
-+TMPDIR=$METAMAIL_TMPDIR/XXXternal.$$
-+trap 'cd $METAMAIL_TMPDIR ; rmdir "$TMPDIR" >/dev/null 2>&1' 1 2 3 15
- mkdir $TMPDIR
--pushd $TMPDIR
--set NEWNAME="mm.ext.$$"
--set NEEDSCONFIRMATION=1
--switch ("$atype")
--    case anon-ftp:
--	echo "This mail message contains a POINTER (reference) to data that is "
--	echo not included in the message itself.  Rather, the data can be retrieved 
--	echo automatically using  anonymous FTP to a site on the network.
--	breaksw
--    case ftp:
--	echo "This mail message contains a POINTER (reference) to data that is "
--	echo not included in the message itself.  Rather, the data can be retrieved 
--	echo automatically using  the FTP protocol to a site on the network.
--	breaksw
--    case mail-server:  
--	cat > ${METAMAIL_TMPDIR}/ext.junk.$$ <<!
--This mail message contains a POINTER (reference) to data that is 
--not included in the message itself.  Rather, the data can be retrieved 
--by sending a special mail message to a mail server on the network.
--However, doing this automatically is slightly dangerous, because  someone
--might be using this mechanism to cause YOU to send obnoxious mail.
--For that reason, the mail message that WOULD be sent is being shown to you
--first for your approval.
-+PUSHED_DIR=`pwd`
-+cd $TMPDIR
-+NEWNAME="mm.ext.$$"
-+NEEDSCONFIRMATION=1
-+
-+case $atype in
-+	anon-ftp)
-+		echo "This mail message contains a POINTER (reference) to data that is "
-+		echo not included in the message itself.  Rather, the data can be retrieved 
-+		echo automatically using anonymous FTP to a site on the network. ;;
-+		
-+	ftp)
-+		echo "This mail message contains a POINTER (reference) to data that is "
-+		echo not included in the message itself.  Rather, the data can be retrieved 
-+		echo automatically using the FTP protocol to a site on the network. ;;
-+
-+	mail-server)
-+		TMPF=$(mktemp /tmp/ext.junk.XXXXXX)
-+		cat > $TMPF <<!
-+This mail message contains a POINTER (reference) to data that is not
-+included in the message itself.  Rather, the data can be retrieved by
-+sending a special mail message to a mail server on the network.
-+However, doing this automatically is slightly dangerous, because
-+someone might be using this mechanism to cause YOU to send obnoxious
-+mail.  For that reason, the mail message that WOULD be sent is being
-+shown to you first for your approval.
- 
- This is the message that will be sent if you choose to go ahead and
--retreive the external data:
-+retrieve the external data:
- 
- Subject: Automated Mail Server Request
--To: ${server}
-+To: $server
- 
- !
--	sed -e 1,/^\$/d < $bodyfile >> ${METAMAIL_TMPDIR}/ext.junk.$$
--	more ${METAMAIL_TMPDIR}/ext.junk.$$
--	rm ${METAMAIL_TMPDIR}/ext.junk.$$
--	breaksw
--    default:
--	# IGNORE ALL THE OTHERS -- AUTOMATIC FOR LOCAL-FILE, AFS.
--	set NEEDSCONFIRMATION=0
--endsw
-+		sed -e 1,/^\$/d < "$bodyfile" >> $TMPF
-+		sensible-pager $TMPF
-+		rm $TMPF ;;
-+
-+	*)
-+		NEEDSCONFIRMATION=0 ;;
-+esac
- 
--if ($NEEDSCONFIRMATION) then
-+if test $NEEDSCONFIRMATION -ne 0
-+then
- 	echo ""
--	echo -n "Do you want to proceed with retrieving the external data [y] ? "
--	set ANS=$<
--	if ("$ANS" =~ n* ||  "$ANS" =~ N* ) then
--		cd ${METAMAIL_TMPDIR}
--		rm -rf $TMPDIR
--		exit 0
--	endif
--endif
--
--switch ("$atype")
--    case anon-ftp:
--	set username=anonymous
--	set pass=`whoami`@`hostname`
--	# DROP THROUGH
--    case ftp:
--	if ("$site" == "") then
--	    echo -n "Site for ftp access: "
--	    set site=$<
--	endif
--	if ("$username" == "") then
--	    echo -n "User name at site ${site}: "
--	    set username=$<
--	endif
--	if ("$pass" == "") then
--	    echo -n "Password for user $username at site ${site}: "
--	    stty -echo
--	    set pass=$<
--	    stty echo
--	    echo ""
--	endif
--	if ("$dir" == "") then
--	    set DIRCMD=""
--	else
--	    set DIRCMD="cd $dir"
--	endif
--	if ("$mode" == "") then
--	    set MODECMD=""
--	else
--	    set MODECMD="type $mode"
--	endif
--	echo OBTAINING MESSAGE BODY USING FTP
--	echo SITE: $site USER $username
--	$FTP -n <<!
-+	echo -n "Do you want to proceed with retrieving the external data? [y] "
-+	read ANS
-+	case "$ANS" in
-+		[Nn]*)	cd $METAMAIL_TMPDIR
-+			rm -rf $TMPDIR;
-+			exit 0 ;;
-+	esac
-+fi
-+
-+case "$atype" in
-+	anon-ftp | ftp)
-+		case "$atype" in
-+		anon-ftp )
-+			username=anonymous
-+			pass=`whoami`@`hostname`
-+			;;
-+		esac
-+
-+		if test -z "$site"
-+		then
-+			echo -n "Site for ftp access: "
-+			read site
-+		fi
-+		if test -z "$username"
-+		then
-+			echo -n "User name at site ${site}: "
-+			read username
-+		fi
-+		if test -z "$pass"
-+		then
-+			echo -n "Password for user $username at site ${site}: "
-+			stty -echo
-+			read pass
-+			stty echo
-+			echo ""
-+		fi
-+		if test -z "$dir"
-+		then
-+			DIRCMD=""
-+		else
-+			DIRCMD="cd $dir"
-+		fi
-+		if test -z "$mode"
-+		then
-+			MODECMD=""
-+		else
-+			MODECMD="type $mode"
-+		fi
-+		echo OBTAINING MESSAGE BODY USING FTP
-+		echo SITE: "$site" USER: "$username"
-+		${FTP:-ftp} -n <<!
- open $site
- user $username $pass
- $DIRCMD
-@@ -156,91 +186,92 @@
- get $name $NEWNAME
- quit
- !
--	if (! -e $NEWNAME) then
--	    echo FTP failed.
--	    cd ${METAMAIL_TMPDIR}
--	    rm -rf $TMPDIR
--	    exit -1
--	endif
--	breaksw
--    case afs:
--    case local-file:
--	if (! -e $name) then
--	    echo local file not found
--	    cd ${METAMAIL_TMPDIR}
--	    rm -rf $TMPDIR
--	    exit -1
--	endif
--    	set NEWNAME=$name
--	echo GETTING BODY FROM FILE NAMED: $NEWNAME
--	breaksw
--    case mail-server:  # A very special case
--	if ("$bodyfile" == "") then
--	    echo mail-server access-type requires a body file
--	    cd ${METAMAIL_TMPDIR}
--	    rm -rf $TMPDIR
--	    exit -1
--	endif
--	echo Subject: Automated Mail Server Request > $NEWNAME
--	echo To: ${server} >> $NEWNAME
--	echo "" >> $NEWNAME
--	sed -e 1,/^\$/d < $bodyfile >> $NEWNAME
--	echo "" >> $NEWNAME
--	/usr/lib/sendmail -t  < $NEWNAME
--	if ($status) then
--	    echo sendmail failed
--	    cd ${METAMAIL_TMPDIR}
--	    rm -rf $TMPDIR
--	    exit -1
--	endif
--	cd ${METAMAIL_TMPDIR}
--	rm -rf $TMPDIR
--	echo Your $ctype data has been requested from a mail server.
--	exit 0
--    default:
--	echo UNRECOGNIZED ACCESS-TYPE
--	cd ${METAMAIL_TMPDIR}
--	rm -rf $TMPDIR
--	exit -1
--endsw
--if ($cenc == base64) then
--	mimencode -u -b < $NEWNAME > OUT
--	mv OUT $NEWNAME
--else if ($cenc == quoted-printable) then
--	mimencode -u -q < $NEWNAME > OUT
--	mv OUT $NEWNAME
--endif
--
--popd
--if ($atype == "local-file") then
--    metamail -p  -b -c "$ctype" $NEWNAME
--else
--    metamail -p -b -c "$ctype" $TMPDIR/$NEWNAME
--endif
-+		if test ! -r "$NEWNAME"
-+		then
-+			echo FTP failed.
-+			cd $METAMAIL_TMPDIR
-+			rm -rf $TMPDIR
-+			exit 1
-+		fi
-+		;;
-+
-+	afs|local-file)
-+		if test ! -r "$name"
-+		then
-+			echo local file not found
-+			cd $METAMAIL_TMPDIR
-+			rm -rf $TMPDIR
-+			exit 1
-+		fi
-+		NEWNAME=$name
-+		echo GETTING BODY FROM FILE NAMED: "$NEWNAME" ;;
-+
-+	mail-server)
-+		if test -z "$bodyfile"
-+		then
-+			echo mail-server access-type requires a body file
-+			cd $METAMAIL_TMPDIR
-+			rm -rf $TMPDIR
-+			exit 1
-+		fi
-+		echo Subject: Automated Mail Server Request > "$NEWNAME"
-+		echo To: "$server" >> "$NEWNAME"
-+		echo >> "$NEWNAME"
-+		sed -e 1,/^\$/d < "$bodyfile" >> "$NEWNAME"
-+		$MAILCOMMAND -t < "$NEWNAME"
-+		if test $? -ne 0
-+		then
-+			echo sendmail failed
-+			cd $METAMAIL_TMPDIR
-+			rm -rf $TMPDIR
-+			exit 1
-+		fi
-+		cd $METAMAIL_TMPDIR
-+		rm -rf $TMPDIR
-+		echo Your "$ctype" data has been requested from a mail server.
-+		exit 0 ;;
-+	*)
-+		echo UNRECOGNIZED ACCESS-TYPE
-+		cd $METAMAIL_TMPDIR
-+		rm -rf $TMPDIR
-+		exit 1 ;;
-+esac
-+
-+if test "$cenc" = base64
-+then
-+	mimencode -u -b < "$NEWNAME" > OUT
-+	mv OUT "$NEWNAME"
-+elif test "$cenc" = quoted-printable
-+then
-+	mimencode -u -q < "$NEWNAME" > OUT
-+	mv OUT "$NEWNAME"
-+fi
-+
-+cd $PUSHED_DIR
-+case "$atype" in
-+    local-file ) metamail -b -p -c "$ctype" "$NEWNAME" ;;
-+    * ) metamail -b -p -c "$ctype" "$TMPDIR/$NEWNAME" ;;
-+esac
- 
--if ($status) then
-+if test $? -ne 0
-+then
- 	echo metamail failed
--	cd ${METAMAIL_TMPDIR}
-+	cd $METAMAIL_TMPDIR
- 	rm -rf $TMPDIR
--	exit -1
--endif
-+	exit 1
-+fi
- 
--if ($NEWNAME != $name) then
-+if test ! "$NEWNAME" = "$name"
-+then
- 	echo ""
--	echo The data just displayed is stored in the file $TMPDIR/$NEWNAME
-+	echo The data just displayed is stored in the file "$TMPDIR/$NEWNAME"
- 	echo "Do you want to delete it?"
--	rm -i $TMPDIR/$NEWNAME
--endif
-+	rm -i "$TMPDIR/$NEWNAME"
-+fi
- 
--if (! -e ${TMPDIR}/${NEWNAME}) then
--    cd ${METAMAIL_TMPDIR}
--    rmdir $TMPDIR
--endif
--exit 0
--
--cleanup:
--cd ${METAMAIL_TMPDIR}
--if (-e $TMPDIR) then    
--    rmdir $TMPDIR
--endif
--exit -1
-+if test ! -r "${TMPDIR}/${NEWNAME}"
-+then
-+	cd /
-+	cd $METAMAIL_TMPDIR
-+	rmdir $TMPDIR
-+fi
---- metamail-2.7.orig/bin/audiocompose
-+++ metamail-2.7/bin/audiocompose
-@@ -1,6 +1,4 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
- # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- # 
- # Permission to use, copy, modify, and distribute this material 
-@@ -13,64 +11,71 @@
- # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
- # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
--#
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- 
- # This is to make metamail/showaudio do playback on the speaker, not the phone.
--setenv AUDIOSPEAKERFORCE 1 
-+AUDIOSPEAKERFORCE=1; export AUDIOSPEAKERFORCE
- 
--if (-d /usr/sony) then
--    set dev=/dev/sb0
-+if test -d /usr/sony
-+then
-+	dev=/dev/sb0
- else
--    set dev=/dev/audio
--endif
-+	dev=/dev/audio
-+fi
- 
--set audiofile=$1
--if (-e $audiofile && ! -z $audiofile) goto whatnext
-+audiofile=$1
- 
--record:
--echo -n "Press RETURN when you are ready to start recording: "
--set foo = $<
--
--# THIS IS UNBELIEVABLY GRUBBY
--onintr cleanup
--if (! $?RECORD_AUDIO) then
--    (/bin/cat < $dev > $audiofile) &
-+if test -f "$audiofile" -a -s "$audiofile"
-+then
-+	whatnext=1
- else
--    ($RECORD_AUDIO > $audiofile) &
--endif
--jobs -l > ${METAMAIL_TMPDIR}/AUDCAT.$$
--set foo=`/bin/cat ${METAMAIL_TMPDIR}/AUDCAT.$$`
--/bin/rm ${METAMAIL_TMPDIR}/AUDCAT.$$
--set PID=$foo[2]
--echo -n "press RETURN when you are done recording: "
--set foo=$<
--echo One moment please...
--/bin/sleep 1
--echo -n Killing recording job...
--/bin/kill -9 $PID >& /dev/null
--
--whatnext:
--echo ""
--echo "What do you want to do?"
--echo ""
--echo "1 -- Listen to recorded message"
--echo "2 -- Replace with a new recording"
--echo "3 -- All Done, Quit"
--set which = $<
--    switch ("$which")
--        case 1:
--          cat $audiofile > $dev
--          breaksw
--        case 2:
--          goto record
--        case 3:
--          exit
--    endsw
--goto whatnext
--exit 0
--cleanup:
--kill -9 $PID >& /dev/null
-+	whatnext=0
-+fi
-+
-+while true
-+do
-+	if test $whatnext -eq 1
-+	then
-+		echo ""
-+		echo "What do you want to do?"
-+		echo ""
-+		echo "1 -- Listen to recorded message"
-+		echo "2 -- Replace with a new recording"
-+		echo "3 -- All Done, Quit"
-+		read which
-+		case $which in
-+			1) cat "$audiofile" > $dev ;;
-+			2) whatnext=0 ;;
-+			3) exit 0 ;;
-+		esac
-+	fi
-+	echo -n "Press RETURN when you are ready to start recording: "
-+	read foo
-+
-+	trap "kill -9 $! > /dev/null 2>&1" 1 2 15
-+	if test -z "$RECORD_AUDIO"
-+	then
-+		(cat < $dev > "$audiofile") &
-+	else
-+		($RECORD_AUDIO > "$audiofile") &
-+	fi
-+	echo -n "press RETURN when you are done recording: "
-+	read foo
-+	echo One moment please...
-+	/bin/sleep 1
-+	echo -n Killing recording job...
-+	/bin/kill -9 $! > /dev/null 2>&1
-+	whatnext=1
-+done
---- metamail-2.7.orig/bin/rcvAppleSingle
-+++ metamail-2.7/bin/rcvAppleSingle
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/sh -e
- #
- # Very simple shellscript to support recieving Macintosh files
- # and store them in a UNIX filesystem used by the CAP AUFS program.
---- metamail-2.7.orig/bin/sun-to-mime
-+++ metamail-2.7/bin/sun-to-mime
-@@ -1,14 +1,20 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
--# Provide VERY minimal support for mail generated by Sun's Openwindows mailtool.
--# Basically, this lets you see the text part, but not much else...
-+#!/bin/sh -e
-+# This file Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
- 
--set TMPFILE=${METAMAIL_TMPDIR}/suntomime.$$
-+TMPFILE=`tempfile -p metamail -m 600`
- echo "Content-type: multipart/mixed; boundary=--------" > $TMPFILE
- echo "" >> $TMPFILE
- sed -e 's/X-Sun-Data-Type:/Content-type:/' >> $TMPFILE < $1
---- metamail-2.7.orig/bin/getfilename
-+++ metamail-2.7/bin/getfilename
-@@ -1,16 +1,36 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
-+# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+# 
-+# Permission to use, copy, modify, and distribute this material 
-+# for any purpose and without fee is hereby granted, provided 
-+# that the above copyright notice and this permission notice 
-+# appear in all copies, and that the name of Bellcore not be 
-+# used in advertising or publicity pertaining to this 
-+# material without the specific, prior written permission 
-+# of an authorized representative of Bellcore.  BELLCORE 
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- 
- echo -n "Enter the name of a file in '$1' format: "
--set fnam=$<
--if ("" == "$fnam") then
--    echo Aborted
--    exit -1
--endif
--if (! -r  $fnam) then
--    echo No such file
--    exit -1
--endif
--cp $fnam $2
--exit 0
-+read fnam
-+if test ! -r "$fnam"
-+then
-+	echo No such file
-+	exit 1
-+fi
-+
-+cp "$fnam" "$2"
---- metamail-2.7.orig/bin/extcompose
-+++ metamail-2.7/bin/extcompose
-@@ -1,103 +1,126 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
--
--if ($#argv < 1) then
--    echo "Usage:  extcompose output-file-name"
-+#!/bin/sh -e
-+# This file Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+if [ $# -lt 1 ]
-+then
-+    echo "Usage:  $0 output-file-name" 1>&2
-     exit 1
--endif
--set OUTFNAME=$1
-+fi
-+OUTFNAME=$1
-+
-+choosing=yes
-+while [ $choosing = yes ]
-+do
-+    echo ""
-+    echo "Where is the external data that you want this mail message to reference?"
-+    echo "    1 -- In a local file"
-+    echo "    2 -- In an AFS file"
-+    echo "    3 -- In an anonymous FTP directory on the Internet"
-+    echo "    4 -- In an Internet FTP directory that requires a valid login"
-+    echo "    5 -- Under the control of a mail server that will send the data on request"
-+    echo ""
-+    echo -n "Please enter a number from 1 to 5: \c"
-+    read ans
-+    case "$ans" in
-+        1) accesstype=local-file ;;
-+	2) accesstype=afs ;;
-+	3) accesstype=anon-ftp ;;
-+	4) accesstype=ftp ;;
-+	5) accesstype=mail-server ;;
-+	* ) echo "That is NOT one of your choices." 1>&2; continue ;;
-+    esac
-+
-+    case "$accesstype" in
-+        ftp | anon-ftp )
-+	    echo -n "Enter the full Internet domain name of the FTP site: "
-+	    read site
-+	    echo -n "Enter the name of the directory containing the file (RETURN for top-level): "
-+	    read directory
-+	    echo -n "Enter the name of the file itself: "
-+	    read name
-+	    echo -n "Enter the transfer mode (type 'image' for binary data, RETURN otherwise): "
-+	    read mode
-+	    if [ -n "$mode" ]
-+	    then mode=ascii
-+	    fi
-+	    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"\; > "$OUTFNAME"
-+	    echo -n "    site="\"$site\" >> "$OUTFNAME"
-+	    if [ -n "$directory" ]
-+	    then echo -n "; directory="\"$directory\">> "$OUTFNAME"
-+	    fi
-+	    echo -n "; mode="\"$mode\">> "$OUTFNAME"
-+	    echo "">> "$OUTFNAME"
-+	    choosing=no
-+	    ;;
- 
--chooseaccesstype:
--echo ""
--echo "Where is the external data that you want this mail message to reference?"
--echo "    1 -- In a local file"
--echo "    2 -- In an AFS file"
--echo "    3 -- In an anonymous FTP directory on the Internet"
--echo "    4 -- In an Internet FTP directory that requires a valid login"
--echo "    5 -- Under the control of a mail server that will send the data on request"
--echo ""
--echo -n "Please enter a number from 1 to 5: "
--set ans=$<
--if ($ans == 1)  then
--    set accesstype=local-file
--else if ($ans == 2) then
--    set accesstype=afs
--else if ($ans == 3) then
--    set accesstype=anon-ftp
--else if ($ans == 4) then
--    set accesstype=ftp
--else if ($ans == 5) then
--    set accesstype=mail-server
--else
--    echo "That is NOT one of your choices."
--    goto chooseaccesstype
--endif
--if ($accesstype == "ftp" || $accesstype == "anon-ftp") then
--    echo -n "Enter the full Internet domain name of the FTP site: "
--    set site=$<
--    echo -n "Enter the name of the directory containing the file (RETURN for top-level): "
--    set directory=$<
--    echo -n "Enter the name of the file itself: "
--    set name = $<
--    echo -n "Enter the transfer mode (type 'image' for binary data, RETURN otherwise): "
--    set mode = $<
--    if ($mode == "") set mode=ascii
--    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"\; > $OUTFNAME
--    echo -n "    site="\"$site\" >> $OUTFNAME
--    if ($directory != "") echo -n "; directory="\"$directory\">> $OUTFNAME
--    if ($mode != "") echo -n "; mode="\"$mode\">> $OUTFNAME
--    echo "">> $OUTFNAME
--else if ($accesstype == "local-file" || $accesstype == "afs") then
--fname:
--    echo -n "Enter the full path name for the file: "
--    set name = $<
--    if (! -e $name) then
--	echo "The file $name does not seem to exist."
--	goto fname
--    endif
--    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"> $OUTFNAME
--else if ($accesstype == "mail-server") then
--    echo -n "Enter the full email address for the mailserver: "
--    set server=$<
--    echo "Content-type: message/external-body; access-type=$accesstype; server="\"$server\"> $OUTFNAME
--else
--    echo accesstype $accesstype not yet implemented
--    goto chooseaccesstype
--endif
-+	local-file | afs )
-+	    name=
-+	    while [ -z "$name" ]
-+	    do
-+	        echo -n "Enter the full path name for the file: "
-+		read name
-+		if [ ! -f "$name" ]
-+		then
-+		    echo "The file $name does not seem to exist."
-+		    name=
-+		fi
-+	    done
-+	    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"> "$OUTFNAME"
-+	    choosing=no
-+	    ;;
-+	
-+	mail-server )
-+	    echo -n "Enter the full email address for the mailserver: "
-+	    read server
-+	    echo "Content-type: message/external-body; access-type=$accesstype; server="\"$server\"> "$OUTFNAME"
-+	    choosing=no
-+	    ;;
-+	
-+	* )
-+	    echo accesstype "$accesstype" not yet implemented
-+	    ;;
-+    esac
-+done
- 
- echo -n "Please enter the MIME content-type for the externally referenced data: "
--set ctype = $<
--getcenc:
--echo "Is this data already encoded for email transport?"
--echo "  1 -- No, it is not encoded"
--echo "  2 -- Yes, it is encoded in base64"
--echo "  3 -- Yes, it is encoded in quoted-printable"
--echo "  4 -- Yes, it is encoded using uuencode"
--set encode=$<
--switch ("$encode")
--    case 1:
--        set cenc=""
--        breaksw
--    case 2:
--        set cenc="base64"
--        breaksw
--    case 3:
--        set cenc="quoted-printable"
--        breaksw
--    case 4:
--        set cenc="x-uue"
--        breaksw
--    default:
--        echo "That is not one of your choices."
--        goto getcenc
--endsw
--echo "" >> $OUTFNAME
--echo "Content-type: " $ctype >> $OUTFNAME
--if ($cenc != "") echo "Content-transfer-encoding: " $cenc >> $OUTFNAME
--echo "" >> $OUTFNAME
--if ($accesstype == "mail-server") then
-+read ctype
-+
-+choosing=yes
-+while [ $choosing = yes ]
-+do
-+    echo "Is this data already encoded for email transport?"
-+    echo "  1 -- No, it is not encoded"
-+    echo "  2 -- Yes, it is encoded in base64"
-+    echo "  3 -- Yes, it is encoded in quoted-printable"
-+    echo "  4 -- Yes, it is encoded using uuencode"
-+    read encode
-+    case "$encode" in
-+	1 ) cenc="" choosing=no ;;
-+	2 ) cenc="base64" choosing=no ;;
-+	3 ) cenc="quoted-printable" choosing=no ;;
-+	4 ) cenc="x-uue" choosing=no ;;
-+	* ) echo "That is not one of your choices." ;;
-+    esac
-+done
-+
-+echo >> "$OUTFNAME"
-+echo "Content-type: " "$ctype" >> "$OUTFNAME"
-+if [ -n "$cenc" ]
-+then echo "Content-transfer-encoding: " "$cenc" >> "$OUTFNAME"
-+fi
-+echo >> "$OUTFNAME"
-+if [ "$accesstype" = "mail-server" ]
-+then
-     echo "Please enter all the data to be sent to the mailserver in the message body, "
-     echo "ending with ^D or your usual end-of-data character:"
--    cat >> $OUTFNAME
--endif
-+    cat >> "$OUTFNAME"
-+fi
---- metamail-2.7.orig/bin/mailserver
-+++ metamail-2.7/bin/mailserver
-@@ -1,4 +1,4 @@
--#!/bin/csh -fb
-+#!/bin/csh -efb
- # (The "-fb" might need to be changed to "-f" on some systems)
- #
- # Mailserver -- a simple MIME mailserver script.
-@@ -18,17 +18,15 @@
- set LOCALADDR=mail-server
- set ROOTDIR=/usr/spool/ftp
- set MAINTAINER=postmaster
--set METAMAILDIR=/usr/local/bin
- set LOGADDR=andrew@thumper.bellcore.com
- # If LOGADDR is the empty string, no logging is done.
- #
- # The real program begins here.
- 
--setenv PATH ${METAMAILDIR}:${PATH}
- rehash
- set FromName=""
- set Subject=""
--set TmpFile=/tmp/ms.$$
-+set TmpFile=`tempfile -p metamail -m 600`
- set FOORAW=$<
- while ("$FOORAW" != "") 
- set FOO=(` echo "$FOORAW" | tr "[" "x"`)
-@@ -68,7 +66,7 @@
- probably run in some circumstance other than mail delivery.
- --------------------
- !
--	cat $TmpFile - | /usr/lib/sendmail $MAINTAINER
-+	cat $TmpFile - | /usr/sbin/sendmail $MAINTAINER
- 	# Takes the rest of the message from standard input
- 	rm $TmpFile
- 	exit 0
-@@ -86,7 +84,7 @@
- 
- The file you requested, if it exists, will not be sent to you.
- !
--	/usr/lib/sendmail -t < $TmpFile
-+	/usr/sbin/sendmail -t < $TmpFile
- 	rm $TmpFile
- 	exit 0
- endif
-@@ -107,7 +105,7 @@
- --------------------------------
- !
- 	ls -R >> $TmpFile
--	/usr/lib/sendmail -t < $TmpFile
-+	/usr/sbin/sendmail -t < $TmpFile
- 	rm $TmpFile
- 	exit 0
- endif
-@@ -135,13 +133,13 @@
-   metasend -b -t "$FromName" -f "$Subject" -m "$ct" -s "Re: $Subject"
- 
- !
--	/usr/lib/sendmail -t < $TmpFile
-+	/usr/sbin/sendmail -t < $TmpFile
- 	rm $TmpFile
- 	exit 0
- endif
- 
- if ("$LOGADDR" != "") then
--	/usr/lib/sendmail -t <<!
-+	/usr/sbin/sendmail -t <<!
- From: ${LOCALADDR}@`hostname`
- To: $LOGADDR
- Subject: Autosend delivery report
---- metamail-2.7.orig/bin/sndAppleSingle
-+++ metamail-2.7/bin/sndAppleSingle
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/sh -e
- #
- # Very simple shellscript to support sending Macintosh files
- # which are stored in a UNIX filesystem by the CAP AUFS program.
---- metamail-2.7.orig/bin/sun2mime
-+++ metamail-2.7/bin/sun2mime
-@@ -1,4 +1,4 @@
--#!/bin/sh -f
-+#!/bin/sh -e
- #
- # This is sun2mime.  It makes a bold attempt to transform a Sun mailtool message into
- # MIME format.
-@@ -6,12 +6,9 @@
- # This program is for use with sun-message which takes an arg to figure out how
- # (or if) the message is encoded.
- #
--if [ x$METAMAIL_TMPDIR = x ]; then
--    METAMAIL_TMPDIR=/tmp
--fi
--TMPFILE=${METAMAIL_TMPDIR}/suntomime.$$
-+TMPFILE=`tempfile -p metamail -m 600`
- 
--/bin/nawk '
-+nawk '
-   BEGIN { printf("Content-type: multipart/mixed; boundary=--------\n\n")
-           RS=""; FS="\n"; mode="HEADER" }
-   mode == "HEADER" {
-@@ -36,8 +33,8 @@
-       print
-   }
-   END { printf("----------\n") }
--' $1 > $TMPFILE
-+' "$1" > $TMPFILE
- 
- metamail -z $TMPFILE
--rm -f $TMPFILE
--
-+rm $TMPFILE
-+exit 0
---- metamail-2.7.orig/bin/sun-audio-file
-+++ metamail-2.7/bin/sun-audio-file
-@@ -1,12 +1,20 @@
--#!/bin/csh -fb
--# (The "-fb" might need to be changed to "-f" on some systems)
--#
-+#!/bin/sh -e
-+# This file Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- 
--if (! $?METAMAIL_TMPDIR) then
--    set METAMAIL_TMPDIR=/tmp
--endif
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
- 
--cd ${METAMAIL_TMPDIR}
--uudecode < $1
--audiotool audio-file
--rm -f audio-file $1
-+audio-file=`tempfile -p metamail -m 600`
-+uudecode -o $audio-file "$1"
-+audiotool $audio-file
-+rm $audio-file "$1"
---- metamail-2.7.orig/bin/uudepipe
-+++ metamail-2.7/bin/uudepipe
-@@ -0,0 +1,13 @@
-+#!/bin/sh -e
-+# This file Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+uudecode -o /dev/stdout -- ${1+"$1"}
---- metamail-2.7.orig/bin/uuenpipe
-+++ metamail-2.7/bin/uuenpipe
-@@ -0,0 +1,13 @@
-+#!/bin/sh -e
-+# This file Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+uuencode -- ${1+"$1"} "$(basename "${1-UUPIPEOUT}")"
---- metamail-2.7.orig/bin/sun-message
-+++ metamail-2.7/bin/sun-message
-@@ -0,0 +1,56 @@
-+#!/bin/sh -e
-+#
-+#  This is sun-message.
-+#  It looks at $2 to figure out how to decode $1,
-+#  then gives the user a short menu of choices:
-+#    display, save or quit.
-+
-+if [ "$2" = "uuencode" ]
-+then 
-+	fn=`tempfile -p metamail -m 600`
-+	uudecode -o $fn "$1"
-+
-+	echo "The following file was uudecoded:"
-+	echo
-+
-+	defans=1
-+	while :
-+	do
-+		ls -l $fn
-+
-+		echo
-+		echo "Please choose one:"
-+		echo
-+		echo "1 -- Display it as ASCII text"
-+		echo "2 -- Save it as a file"
-+		echo "3 -- Quit this menu"
-+		echo
-+		echo -n "Which do you prefer (1 - 3)? [$defans] "
-+
-+		read ans
-+		if test -z "${ans:-}"
-+		then
-+			ans=$defans
-+		fi
-+
-+		case $ans in
-+			1)	sensible-pager $fn ;;
-+			2)	echo -n "Save as: $HOME/"
-+				read nfn
-+				if test ! -z "${nfn:-}"
-+				then
-+					cp $fn "$HOME/$nfn"
-+				else
-+					echo Not Saved.
-+				fi
-+				;;
-+			3)	rm "$1" $fn
-+				exit 0
-+				;;
-+			*)	echo Invalid choice. ;;
-+		esac
-+		defans=3
-+	done
-+else
-+	sensible-pager "$1"
-+fi
---- metamail-2.7.orig/bin/shownonascii
-+++ metamail-2.7/bin/shownonascii
-@@ -0,0 +1,104 @@
-+#!/bin/sh -e
-+# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+# 
-+# Permission to use, copy, modify, and distribute this material 
-+# for any purpose and without fee is hereby granted, provided 
-+# that the above copyright notice and this permission notice 
-+# appear in all copies, and that the name of Bellcore not be 
-+# used in advertising or publicity pertaining to this 
-+# material without the specific, prior written permission 
-+# of an authorized representative of Bellcore.  BELLCORE 
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
-+
-+MYFONTDIR=/usr/lib/X11/fonts/misc
-+
-+CHARSET=$1
-+shift
-+
-+if test "$1" = "-e"
-+then
-+	shift
-+	CMD="$*"
-+	RIGHTTERMCMD="$*"
-+else
-+	CMD="more $* /dev/null"
-+	RIGHTTERMCMD="more $*"
-+fi
-+
-+if test ! -z "${MM_CHARSET:-}"
-+then
-+	if test "$MM_CHARSET" = "$CHARSET"
-+	then
-+		$RIGHTTERMCMD
-+		exit 0
-+	fi
-+fi
-+for f in "${MM_AUXCHARSETS:-}"
-+do
-+	if test "$f" = "$CHARSET"
-+	then
-+		$RIGHTTERMCMD
-+		exit 0
-+	fi
-+done
-+
-+if test ! -d "$MYFONTDIR"
-+then
-+	echo This message contains non-ASCII text, but the $CHARSET font
-+	echo has not yet been installed on this machine.  What follows
-+	echo "may be partially unreadable, but the English (ASCII) parts"
-+	echo "should still be readable."
-+	cat $*
-+	exit 0
-+fi
-+
-+if test -z "${DISPLAY:-}"
-+then
-+	echo This message contains non-ASCII text, which can only be displayed
-+	echo properly if you are running X11.  What follows
-+	echo "may be partially unreadable, but the English (ASCII) parts"
-+	echo "should still be readable."
-+	cat $*
-+	exit 0
-+fi
-+
-+#
-+# Do we have a font server?
-+#
-+if xset q | grep -q tcp/localhost:7100
-+then
-+    echo Your font path appears to be correctly set.
-+else
-+	if xset q | grep -q $MYFONTDIR
-+	then
-+	    echo Your font path appears to be correctly set.
-+	else
-+	    echo Adding $MYFONTDIR to your font path.
-+	    xset +fp "$MYFONTDIR"
-+	fi
-+fi
-+
-+echo Running xterm to display text in $CHARSET, please wait...
-+
-+# Bogus -- need to unsetenv MM_NOTTTY, but can't in Bourne shell.  --bobg.
-+MM_NOTTTY=''
-+XCHARSET=\*`echo $CHARSET | sed -e s/iso-/iso/`
-+xterm -fn $XCHARSET -e $CMD
---- metamail-2.7.orig/bin/Makefile.am
-+++ metamail-2.7/bin/Makefile.am
-@@ -0,0 +1,9 @@
-+MAINTAINERCLEANFILES    = Makefile.in
-+
-+bin_SCRIPTS		= audiocompose audiosend extcompose getfilename \
-+			mailserver mailto-hebrew metasend mimeit \
-+			patch-metamail rcvAppleSingle showaudio showexternal \
-+			shownonascii showpartial showpicture sndAppleSingle \
-+			sun-audio-file sun-message sun-message.csh \
-+			sun-to-mime sun2mime uudepipe uuenpipe
-+
---- metamail-2.7.orig/bin/Makefile.in
-+++ metamail-2.7/bin/Makefile.in
-@@ -0,0 +1,217 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+MAINTAINERCLEANFILES = Makefile.in
-+
-+bin_SCRIPTS = audiocompose audiosend extcompose getfilename 			mailserver mailto-hebrew metasend mimeit 			patch-metamail rcvAppleSingle showaudio showexternal 			shownonascii showpartial showpicture sndAppleSingle 			sun-audio-file sun-message sun-message.csh 			sun-to-mime sun2mime uudepipe uuenpipe
-+
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = ../metamail/config.h
-+CONFIG_CLEAN_FILES = 
-+SCRIPTS =  $(bin_SCRIPTS)
-+
-+DIST_COMMON =  Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+all: all-redirect
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+install-binSCRIPTS: $(bin_SCRIPTS)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-+	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-+	  else if test -f $(srcdir)/$$p; then \
-+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-+	  else :; fi; fi; \
-+	done
-+
-+uninstall-binSCRIPTS:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(bin_SCRIPTS)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-+	done
-+tags: TAGS
-+TAGS:
-+
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = bin
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign bin/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am: install-binSCRIPTS
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-binSCRIPTS
-+uninstall: uninstall-am
-+all-am: Makefile $(SCRIPTS)
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-generic clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-generic distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: uninstall-binSCRIPTS install-binSCRIPTS tags distdir info-am \
-+info dvi-am dvi check check-am installcheck-am installcheck \
-+install-exec-am install-exec install-data-am install-data install-am \
-+install uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/bin/mimeit
-+++ metamail-2.7/bin/mimeit
-@@ -0,0 +1,27 @@
-+#!/bin/sh -e
-+# mimeit - mail base64-encoded stdin
-+#    with content-type $1
-+#    to recipient $2
-+#    with subject $3
-+# All other arguments are passed on to splitmail 
-+
-+if [ $# -lt 3 ]; then
-+	echo "Usage: $0 <content-type> <recipient> <subject> [splitmail-options]" >&2
-+	exit 1
-+fi
-+
-+ct="$1"
-+to="$2"
-+sub="$3"
-+
-+shift
-+shift
-+shift
-+
-+( echo Mime-Version: 1.0 ; \
-+  echo Content-type: "$ct" ; \
-+  echo To: "$to" ; \
-+  echo Subject: "$sub" ; \
-+  echo Content-Transfer-Encoding: base64 ;
-+  echo "" ; \
-+  mimencode -b ) | splitmail -d $*
---- metamail-2.7.orig/bin/mailto-hebrew
-+++ metamail-2.7/bin/mailto-hebrew
-@@ -0,0 +1,76 @@
-+#!/bin/sh -e
-+# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+# 
-+# Permission to use, copy, modify, and distribute this material 
-+# for any purpose and without fee is hereby granted, provided 
-+# that the above copyright notice and this permission notice 
-+# appear in all copies, and that the name of Bellcore not be 
-+# used in advertising or publicity pertaining to this 
-+# material without the specific, prior written permission 
-+# of an authorized representative of Bellcore.  BELLCORE 
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Conversion from C shell to Bourne shell
-+# by Bob Glickstein, Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp. (Z-Code)
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+# Brought into line with metamail 2.7 beta release Csh version
-+#    Dave Shield	February 1994
-+
-+MYFONTDIR=/usr/lib/X11/fonts/misc
-+
-+if test ! -z "${MM_CHARSET:-}"
-+then
-+	if test "$MM_CHARSET" = iso-8859-8
-+	then
-+		mailto $*
-+		exit 0
-+	fi
-+fi
-+
-+if test ! -d "$MYFONTDIR"
-+then
-+	echo The Hebrew font has not been installed properly on this machine.
-+	exit 1
-+fi
-+
-+if test -z "${DISPLAY:-}"
-+then
-+	echo Hebrew mail may only be composed under X11 or on a Hebrew terminal.
-+	exit 1
-+fi
-+
-+#
-+# Do we have a font server?
-+#
-+FSGREP=`xset q | grep "tcp/localhost:7100"`
-+if test ! -z "${FSGREP:-}"
-+then
-+        FPGREP=`xset q | grep $MYFONTDIR`
-+        if test -z "${FPGREP:-}"
-+        then
-+            echo Adding $MYFONTDIR to your font path.
-+            xset +fp "$MYFONTDIR"
-+        else
-+            echo Your font path appears to be correctly set.
-+        fi
-+else
-+    echo Your font path appears to be correctly set.
-+fi
-+
-+echo Running xterm to compose mail in iso-8859-8, please wait...
-+
-+MM_CHARSET=iso-8859-8; export MM_CHARSET
-+xterm -fn \*iso-8859-8 -e mailto $*
---- metamail-2.7.orig/fonts/Makefile
-+++ metamail-2.7/fonts/Makefile
-@@ -10,7 +10,9 @@
- #FONTSUFFIX=fb
- #DIRBUILDER=bldfamily
- 
--all: shownonascii heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX} mailto-hebrew
-+RM=rm
-+
-+all: heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}
- 
- heb6x13.${FONTSUFFIX}: heb6x13.bdf
- #	convertfont -o heb6x13 heb6x13.bdf
-@@ -36,4 +38,4 @@
- 	chmod +x mailto-hebrew
- 
- clean:
--	rm -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}  shownonascii mailto-hebrew fonts.dir
-+	$(RM) -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}  shownonascii mailto-hebrew fonts.dir
---- metamail-2.7.orig/fonts/Xshownonascii
-+++ metamail-2.7/fonts/Xshownonascii
-@@ -1,7 +1,7 @@
- #!/bin/csh -fb
- # (The "-fb" might need to be changed to "-f" on some systems)
- #
--set MYFONTDIR=/u/nsb/lib/fonts
-+set MYFONTDIR=/usr/lib/X11/fonts/misc
- 
- set CHARSET="$1"
- shift
---- metamail-2.7.orig/fonts/Xmailto-hebrew
-+++ metamail-2.7/fonts/Xmailto-hebrew
-@@ -1,7 +1,7 @@
- #!/bin/csh -fb
- # (The "-fb" might need to be changed to "-f" on some systems)
- #
--set MYFONTDIR=/u/nsb/lib/fonts
-+set MYFONTDIR=/usr/lib/X11/fonts/misc
- 
- if ($?MM_CHARSET) then
-     if ($MM_CHARSET == iso-8859-8) then
---- metamail-2.7.orig/man/metasend.1
-+++ metamail-2.7/man/metasend.1
-@@ -12,7 +12,7 @@
- 
- With no arguments, the program will ask the user for the To, Subject, and CC fields.  It will then ask for the name of a MIME content-type.  Next, it will ask the user for the name of an existing file containing that type of data.  After this, it will ask what encoding type, if any, should be applied to this data.  Finally, it  will ask if the user wants to  include information  from an additional file, in which case the last three questions will be repeated for  the next file.
- 
--Alternately, all of this information can be provided on the comand line, using the following options:
-+Alternately, all of this information can be provided on the command line, using the following options:
- 
-     -b -- specifies Batch (non-interactive) Mode.  Will exit with an error message if all additional needed information is not provided on the command line.
-     -c cc -- specifies the CC address
---- metamail-2.7.orig/man/mailto.1
-+++ metamail-2.7/man/mailto.1
-@@ -1,6 +1,6 @@
- .TH MAILTO 1 "Release 1" "Bellcore Prototype"
- .SH NAME
--mailto - Simple mutlimedia mail sending program
-+mailto - Simple multimedia mail sending program
- .SH SYNOPSIS
- .ta 8n
- \fBmailto\fP	[-a] [-c] [-s] [recipient name(s)]
-@@ -74,9 +74,9 @@
- 
- Basically, mailto can include the following things in mail:
- 
--1.  Simple formatted text, using the MIME type "text/richtext".  This allows you to add emphasis to your message using underlining, bold text, italic (diaplsyed as reverse video), centering, and the like.
-+1.  Simple formatted text, using the MIME type "text/richtext".  This allows you to add emphasis to your message using underlining, bold text, italic (displayed as reverse video), centering, and the like.
- 
--2.  Non-text data.  Metamail can include pictures, sounds, and other non-textual data in the middle of any mail message.  The mailcap configuration mechanism can even make this process reasonably user-friendly, but a knowledgable user can include non-textual data even in the absence of a proper mailcap entry.
-+2.  Non-text data.  Metamail can include pictures, sounds, and other non-textual data in the middle of any mail message.  The mailcap configuration mechanism can even make this process reasonably user-friendly, but a knowledgeable user can include non-textual data even in the absence of a proper mailcap entry.
- 
- 3.  Text including non-ASCII characters, such as Hebrew or Russian.  Currently, mailto directly supports only the ISO-8859-* family of character sets, which means that it does not meet the needs of Asian users, in particular.  However, languages that can not be expressed in the ISO-8859 family can still be included in the same way non-text data can be included.
- 
-@@ -230,7 +230,7 @@
-    dot -- controls whether or not a period alone on a line 
-         should be interpreted as terminating your mail
-    ignore -- controls whether or not interrupts are ignored
--   verbose -- controls the verbosity of output from /usr/lib/sendmail
-+   verbose -- controls the verbosity of output from /usr/sbin/sendmail
-    quiet -- controls the verbosity of output from the mailto program.
-    keepblind -- controls whether or not a 'blind' copy of the mail is kept.
-   commasonly -- controls whether or not a space character
-@@ -275,7 +275,7 @@
- 
- .I 
- Altered editing behavior:
--The ~e and ~v commands, which are used to edit the message being composed, will behave differently in mailto if the mail includes non-text portions.  In such cases, each part will be edited separately, in sequence, which makes it impossble for the user to accidentally mess up the inter-part boundaries.  Moreover, if the mailcap entry for a given data type includes an "edit" field, the user will be given the choice of editing with the program named there or editing with his usual (text) editor.  In most cases, this will be a choice between using a structured editor or editing the raw data stream.
-+The ~e and ~v commands, which are used to edit the message being composed, will behave differently in mailto if the mail includes non-text portions.  In such cases, each part will be edited separately, in sequence, which makes it impossible for the user to accidentally mess up the inter-part boundaries.  Moreover, if the mailcap entry for a given data type includes an "edit" field, the user will be given the choice of editing with the program named there or editing with his usual (text) editor.  In most cases, this will be a choice between using a structured editor or editing the raw data stream.
- 
- .I 
- Altered behavior for large messages:
-@@ -283,7 +283,7 @@
- 
- .I
- New -r command-line option 
--The -r comand-line option is not found in standard Berkeley mail.
-+The -r command line option is not found in standard Berkeley mail.
- 
- .SH SUMMARY OF OPTIONS
- -a <charset> -- specifies an alternate character set in use.  This had better be the one your terminal is actually using.  Currently it must be in the iso-8859 character set family.
---- metamail-2.7.orig/man/metamail.1
-+++ metamail-2.7/man/metamail.1
-@@ -38,6 +38,9 @@
- .B \-e 
- This option tells metamail to "eat" leading newlines in message bodies.  This is particularly useful for MH-format mail.
- .TP 8
-+.B \-E <contentencoding>
-+This option tells metamail to use the specified content transfer encoding rather than the one in the headers, if any.  
-+.TP 8
- .B \-f <address>
- This option specifies the name of the sender of the message.  Otherwise, this is determined from the header, if possible.  This information will be placed in the environment to make it available to any interpreters called by metamail.
- .TP 8
-@@ -63,7 +66,7 @@
- This option specifies that it is OK to run as root.  By default, metamail refuses to run if the real or effective user id is root.  You can get the same effect using the MM_RUNASROOT environment variable.
- .TP 8
- .B \-R
--This option specifies that the /usr/ucb/reset should be executed to reset the terminal state, before any other I/O activity.
-+This option specifies that the /usr/bin/reset should be executed to reset the terminal state, before any other I/O activity.
- .TP 8
- .B \-s <subject>  
- This option specifies the subject of the mail message.  By default, this information is obtained from the headers.  This information will be placed in the environment to make it available to any interpreters called by metamail.
-@@ -105,11 +108,13 @@
- 
- The default search path is equivalent to
- 
--$HOME/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
-+.na
-+$HOME/.mailcap:\:/usr/local/etc/mailcap:\:/usr/etc/mailcap:\:/etc/mailcap:\:/etc/mail/mailcap:\:/usr/public/lib/mailcap
-+.ad
- 
- It can be overridden by setting the MAILCAPS environment variable.  Note: Metamail does not actually interpret environment variables such as $HOME or the "~" syntax in this path search.
- 
--The format of mailcap files is explained in the manual entry for mailcap(4).
-+The format of mailcap files is explained in the manual entry for mailcap(5).
- 
- .SH NON-ASCII HEADER FIELDS
- Metamail has rudimentary built-in support for the emerging Internet standards for non-ASCII data in mail headers.  What this means is that such data will be recognized, decoded, and sent to the terminal.  This behavior may be more or less reasonable, depending on the character set in the header data and the capability of the user's terminal, but it will rarely be any worse than showing such data in its encoded form.
-@@ -199,7 +204,7 @@
- .SH FILES
- $HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files.
- .SH SEE ALSO
--audiocompose(1), audiosend(1), ezview(1), getfilename(1), mailto-hebrew(1), mailto(1), metasend(1), mmencode(1), richtext(1), showaudio(1), showexternal(1), shownonascii(1), showpartial(1), showpicture(1), mailcap(4)
-+audiocompose(1), audiosend(1), ezview(1), getfilename(1), mailto-hebrew(1), mailto(1), metasend(1), mimencode(1), richtext(1), showaudio(1), showexternal(1), shownonascii(1), showpartial(1), showpicture(1), mailcap(5)
- .SH BUGS
- In a multipart/alternative body or body parts, some headers in the embedded part that should be displayed may not be displayed.  This will rarely be a problem.  Also, in a multipart/alternative, anything of type "multipart" or "message" is considered to be a recognized part, regardless of the recognizability of its contents.  This might be a problem, only further experience will tell.
- 
---- metamail-2.7.orig/man/mmencode.1
-+++ metamail-2.7/man/mmencode.1
-@@ -1,8 +1,6 @@
- .TH MIMENCODE 1 "Release 1" "Bellcore Prototype"
- .SH NAME
- mimencode - Translate to and from mail-oriented encoding formats
--
--(Same program also installed as "mmencode".)
- .SH SYNOPSIS
- .ta 8n
- \fBmimencode\fP	[-u] [-b] [-q] [-p] [file name] [-o outputfile]
-@@ -37,8 +35,6 @@
- for mail and news use.  The reason is simple:  uuencode doesn't work very well in a number of circumstances and ways.  In particular, uuencode uses characters that don't translate well across all mail gateways (particularly ASCII <-> EBCDIC gateways).  Also, uuencode is not standard -- there are several variants floating around, encoding and decoding things in different and incompatible ways, with no "standard" on which to base an implementation.  Finally, uuencode does not generally work well in a pipe, although some variants have been modified to do so.  Mimencode implements the encodings which were defined for MIME as uuencode replacements, and should be considerably more robust for email use.
- .SH SEE ALSO
- metamail(1), mailto(1)
--.SH BUGS
--This program was originally distributed as "mmencode".  That name turns out to conflict with a program of the same name that is part of the Slate software from BBN, but totally changing the name to mimencode would create other problems (notably with portability to systems where the left half of file names is limited to 8 characters).  Currently, it is being distributed with links under BOTH names.  The programs in the distribution that call the program all call it as "mimencode", so the "mmencode" version may be deleted at sites where it causes a problem.  (The source files are still named "mmencode" rather than "mimencode".)
- .SH COPYRIGHT
- Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- 
---- metamail-2.7.orig/man/richtext.1
-+++ metamail-2.7/man/richtext.1
-@@ -6,6 +6,8 @@
- \fBrichtext\fP [
- .B \-c
- ] [
-+.B \-e
-+] [
- .B \-f
- ] [
- .B \-m
-@@ -53,6 +55,12 @@
- to just correct the raw richtext and write the corrected version to its
- standard output, without performing any formatting.
- .TP 8
-+.B \-e
-+This option directs
-+.I richtext
-+to interpret the input as MIME type text/enriched rather than text/richtext.
-+The text/enriched format is defined in RFC 1896.
-+.TP 8
- .B \-f
- This option directs
- .I richtext
---- metamail-2.7.orig/man/splitmail.1
-+++ metamail-2.7/man/splitmail.1
-@@ -8,23 +8,24 @@
- .SH DESCRIPTION
- The
- .I splitmail
--program will take an email message and break it up into smaller pieces using the "message/partial" type defined by MIME, the proposed Internet standard for multimedia mail formats.  
-+program will take an email message and break it up into smaller pieces using the "message/partial" type defined by MIME(1), the proposed Internet standard for multimedia mail formats.  
- 
- By default it will take the message either from standard input or the named file, and will produce a set of partial message files with names like "/tmp/split.1" for the first part, and so on.  The prefix "/tmp/split." can be overridden using the "-p" option.  
- 
--If the -d option is specified, the mail will actually be delivered.  If -v is specified, the verbose flag will be passed to sendmail.
-+If the -d option is specified, the mail will actually be delivered.  If -v is specified, the verbose flag will be passed to \fBsendmail\fR(8).
- 
--The -i option can be used to make splitmail generate the pieces with similar (but not identical) message-id fields, in a format which allows them to be easily correlated with one another and which end with the suffix provided on the command line after -i.
-+The -i option can be used to make \fBsplitmail\fR generate the pieces with similar (but not identical) message-id fields, in a format which allows them to be easily correlated with one another and which end with the suffix provided on the command line after -i.
- 
--The default chunk size for spliting messages is 250000 at most sites, though this is also a compile-time option.  This can be overriden with the -s switch, or with the environment variable SPLITSIZE.
-+The default chunk size for splitting messages is 250000 at most sites, though this is also a compile-time option.  This can be overridden with the -s switch, or with the environment variable SPLITSIZE.
- 
- Messages smaller than the chunk size will not be turned into partial messages, but will be written to a single file or delivered as a single message.
- .SH ENVIRONMENT
- SPLITSIZE overrides the default chunk size.  Setting SPLITSIZE to, say, 4000000 will effectively ensure that your messages are unlikely ever to be split, but it may cause them to be rejected by some mail transport software.
- .SH SEE ALSO
--mailto(1), metamail(1)
-+.PP
-+\fBmailto\fR(1), \fBmetamail\fR(1), \fBMIME\fR(1), \fBmunpack\fR(1)
- .SH BUGS
--If the size of the input is just on the fencepost, and if it is coming from a file rather than standard input, splitmail will sometimes estimate the number of parts wrong and will have to write out an extra part.  This is harmless but annoying.  It is especially annoying if the estimate was 2 but the real number was 1.
-+If the size of the input is just on the fencepost, and if it is coming from a file rather than standard input, \fBsplitmail\fR will sometimes estimate the number of parts wrong and will have to write out an extra part.  This is harmless but annoying.  It is especially annoying if the estimate was 2 but the real number was 1.
- .SH COPYRIGHT
- Copyright (c) 1992 Bell Communications Research, Inc. (Bellcore)
- 
---- metamail-2.7.orig/man/patch-metamail.1
-+++ metamail-2.7/man/patch-metamail.1
-@@ -8,7 +8,7 @@
- .SH DESCRIPTION
- The
- .I patch-metamail
--program will attempt to retreive a patch file for the metamail distribution, using anonymous ftp to a trusted server, and then install that patch in your local copy of the distribution.
-+program will attempt to retrieve a patch file for the metamail distribution, using anonymous ftp to a trusted server, and then install that patch in your local copy of the distribution.
- 
- The first two arguments, which are required, are the root directory of your local copy of the metamail source directory, and the patch number.  The former is site-dependent, the latter is patch-dependent.
- 
---- metamail-2.7.orig/man/mailcap.4
-+++ metamail-2.7/man/mailcap.4
-@@ -20,13 +20,9 @@
- 
- can be used to indicate that the output of the 'cat' command may be voluminous, requiring either a scrolling window, a pager, or some other appropriate coping mechanism.
- 
--The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by RFC 822.  In practice, this is almost any string.  It is the string that will be matched against the "Content-type" header (or the value passed in with -c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO-8859-1") or a wildcard to match all subtypes (e.g. "image/*").
-+The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content-type" header (or the value passed in with -c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO-8859-1") or a wildcard to match all subtypes (e.g. "image/*").
- 
--The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t', those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\%", those two characters will be replaced by a single % ch
--
--
--
--aracter.  (In fact, the backslash can be used to quote any character, including itself.)
-+The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t', those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\%", those two characters will be replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
- 
- If no "%s" appears in the command field, then instead of placing the message body in a temporary file, metamail will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
- 
---- metamail-2.7.orig/man/uuenpipe.1
-+++ metamail-2.7/man/uuenpipe.1
-@@ -0,0 +1,44 @@
-+.TH UUENPIPE 1 "1998 March 2nd" "METAMAIL" "Debian Linux Manual"
-+.SH NAME
-+uuenpipe \- uuencode a file
-+.SH SYNOPSIS
-+.B uuenpipe
-+.RI [ filename ]
-+.SH "DESCRIPTION"
-+This manual page documents briefly the
-+.B uuenpipe
-+command.
-+This manual page was written for the
-+.B Debian GNU/Linux
-+distribution (but may be used by others), because the original
-+program does not have a manual page.
-+.PP
-+.B uuenpipe
-+uuencodes
-+.I filename
-+(or the standard input if
-+.I filename
-+were not supplied) and prints the result to the standard output.
-+When
-+.I filename
-+is supplied,
-+.B uuenpipe
-+acts as if the following command were invoked.
-+.IP
-+.NF
-+uuencode
-+.I filename
-+.I filename
-+.FI
-+.LP
-+Otherwise, it would act according to the behaviour of the next
-+command.
-+.IP
-+.NF
-+uuencode
-+.I UUPIPEOUT
-+.FI
-+.LP
-+.SH AUTHOR
-+.B uuenpipe
-+is part of mm package.  Manual page added by Herbert Xu.
---- metamail-2.7.orig/man/uudepipe.1
-+++ metamail-2.7/man/uudepipe.1
-@@ -0,0 +1,24 @@
-+.TH UUDEPIPE 1 "1998 March 2nd" "METAMAIL" "Debian Linux Manual"
-+.SH NAME
-+uudepipe \- uudecode a file
-+.SH SYNOPSIS
-+.B uudepipe
-+.RI [ filename ]
-+.SH "DESCRIPTION"
-+This manual page documents briefly the
-+.B uudepipe
-+command.
-+This manual page was written for the
-+.B Debian GNU/Linux
-+distribution (but may be used by others), because the original
-+program does not have a manual page.
-+.PP
-+.B uudepipe
-+uudecodes
-+.I filename
-+(or the standard input if
-+.I filename
-+were not supplied) and prints the result to the standard output.
-+.SH AUTHOR
-+.B uudepipe
-+is part of mm package.  Manual page added by Herbert Xu.
---- metamail-2.7.orig/man/mailcap.5
-+++ metamail-2.7/man/mailcap.5
-@@ -0,0 +1,69 @@
-+.TH MAILCAP 5 "Release 2" "Bellcore Prototype"
-+.SH NAME
-+mailcap - metamail capabilities file
-+.SH DESCRIPTION
-+The
-+.I mailcap
-+file is read by the 
-+.I metamail
-+program to determine how to display non-text at the local site.
-+
-+The syntax of a mailcap file is quite simple, at least compared to termcap files.  Any line that starts with "#" is a comment.  Blank lines are ignored.  Otherwise, each line defines a single mailcap entry for a single content type.  Long lines may be continued by ending them with a backslash character, \\.
-+
-+Each individual mailcap entry consists of a content-type specification, a command to execute, and (possibly) a set of optional "flag" values.  For example, a very simple mailcap entry (which is actually a built-in default behavior for metamail) would look like this:
-+
-+text/plain; cat %s
-+
-+The optional flags can be used to specify additional information about the mail-handling command.  For example:
-+
-+text/plain; cat %s; copiousoutput
-+
-+can be used to indicate that the output of the 'cat' command may be voluminous, requiring either a scrolling window, a pager, or some other appropriate coping mechanism.
-+
-+The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content-type" header (or the value passed in with -c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO-8859-1") or a wildcard to match all subtypes (e.g. "image/*").
-+
-+The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t', those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\%", those two characters will be replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
-+
-+If no "%s" appears in the command field, then instead of placing the message body in a temporary file, metamail will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
-+
-+Two special codes can appear in the viewing command for objects of type multipart (any subtype).  These are "%n" and "%F".  %n will be replaced by the number of parts within the multipart object.  %F will be replaced by a series of arguments, two for each part, giving first the content-type and then the name of the temporary file where the decoded part has been stored.  In addition, for each file created by %F, a second file is created, with the same name followed by "H", which contains the header information for that body part.  This will not be needed by most multipart handlers, but it is there if you ever need it.  
-+
-+The "notes=xxx" field is an uninterpreted string that is used to specify the name of the person who installed this entry in the mailcap file.  (The "xxx" may be replaced by any text string.)
-+
-+The "test=xxx" field is a command that is executed to determine whether or not the mailcap line actually applies.  That is, if the content-type field matches the content-type on the message, but a "test=" field is present, then the test must succeed before the mailcap line is considered to "match" the message being viewed.  The command may be any UNIX command, using the same syntax and the same %-escapes as for the viewing command, as described above.  A command is considered to succeed if it exits with a zero exit status, and to fail otherwise.
-+
-+The "print=xxx" field is a command that is executed to print the data instead of display it interactively.  This behavior is usually a consequence of invoking metamail with the "-h" switch.
-+
-+The "textualnewlines" field can be used in the rather obscure case where metamail's default rules for treating newlines in base64-encoded data are unsatisfactory.  By default, metamail will translate CRLF to the local newline character in decoded base64 output if the content-type is "text" (any subtype), but will not do so otherwise.  A mailcap entry with a field of "textualnewlines=1" will force such translation for the specified content-type, while "textualnewlines=0" will guarantee that the translation does not take place even for textual content-types.
-+
-+The "compose" field may be used to specify a program that can be used to compose a new body or body part in the given format.  Its intended use is to support mail composing agents that support the composition of multiple types of mail using external composing agents. As with the view-command, the compose command will be executed after replacing certain escape sequences starting with "%".  In particular, %s should be replaced by the name of a file to which the composed data is to be written by the specified composing program, thus allowing th3e calling program (e.g. metamail) to tell the called program where to store the composed data.  If %s does not appear, then the composed data will be assumed to be written by the composing programs to standard output.   The result of the composing program may be data that is NOT yet suitable for mail transport -- that is, a Content-Transfer-Encoding may still need to be applied to the data.
-+
-+The "composetyped" field is similar to the "compose" field, but is to be used when the composing program needs to specify the Content-type header field to be applied to the composed data.  The "compose" field is simpler, and is preferred for use with existing (non-mail-oriented) programs for composing data in a given format.  The "composetyped" field is necessary when the Content-type information must include auxilliary parameters, and the composition program must then know enough about mail formats to produce output that includes the mail type information, and to apply any necessary Content-Transfer-Encoding.   Conceptually, "compose" specifies a program that simply outputs the specified type of data in its raw form, while "composetyped" specifies a program that outputs the data as a MIME object, with all necessary Content-* headers already in place.
-+
-+.TP 8
-+.B needsterminal
-+If this flag is given, the named interpreter needs to interact with the user on a terminal.  In some environments (e.g. a window-oriented mail reader under X11) this will require the creation of a new terminal emulation window, while in most environments it will not.  If the mailcap entry specifies "needsterminal" and metamail is not running on a terminal (as determined by isatty(3), the -x option, and the MM_NOTTTY environment variable) then metamail will try to run the command in a new terminal emulation window.  Currently, metamail knows how to create new windows under the X11, SunTools, and WM window systems.
-+.TP 8
-+.B copiousoutput
-+This flag should be given whenever the interpreter is capable of producing more than a few lines of output on stdout, and does no interaction with the user.  If the mailcap entry specifies copiousoutput, and pagination has been requested via the "-p" command, then the output of the command being executed will be piped through a pagination program ("more" by default, but this can be overridden with the METAMAIL_PAGER environment variable).
-+.SH BUILT-IN CONTENT-TYPE SUPPORT
-+The metamail program has built-in support for a few key content-types.  In particular, it supports the text type, the multipart and multipart/alternative type, and the message/rfc822 types.  This support is incomplete for many subtypes -- for example, it only supports US-ASCII text in general.  This kind of built-in support can be OVERRIDDEN by an entry in any mailcap file on the user's search path.  Metamail also has rudimentary built-in support for types that are totally unrecognized -- i.e. for which no mailcap entry or built-in handler exists.  For such unrecognized types, metamail will write a file with a "clean" copy of the data -- i.e. a copy in which all mail headers have been removed, and in which any 7-bit transport encoding has been decoded.
-+.SH FILES
-+$HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files.
-+.SH SEE ALSO
-+metamail(1)
-+.SH COPYRIGHT
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+.SH AUTHOR
-+Nathaniel S. Borenstein
---- metamail-2.7.orig/metamail/splitmail.c
-+++ metamail-2.7/metamail/splitmail.c
-@@ -41,8 +41,8 @@
- #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
- #else
- extern char *getenv();
--#define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi"
--#define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi"
-+#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
-+#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
- #endif
- 
- usageexit() {
-@@ -194,7 +194,7 @@
- 	s = endofheader(from);  /* would be index(from, '\n'),
- 				 but need to check for continuation lines */
-         *s = '\0';
--	if (ShareThisHeader(from, SubjectBuf, &OrigID)) {
-+	if (ShareThisHeader(from, SubjectBuf, sizeof (SubjectBuf), &OrigID)) {
- 	    strcat(SharedHeaders, from);
- 	    strcat(SharedHeaders, "\n");
- 	}
-@@ -339,9 +339,10 @@
-     NULL
- };
- 
--ShareThisHeader(s, SubjectBuf, OrigID)
-+ShareThisHeader(s, SubjectBuf, size, OrigID)
- char *s;
- char *SubjectBuf;
-+size_t size;
- char **OrigID;
- {
-     int i;
-@@ -361,7 +362,8 @@
-     }
-     if (!ULstrcmp(s, "subject")) {
-         *colon = ':';
--        strcpy(SubjectBuf, ++colon);
-+	strncpy(SubjectBuf, ++colon, size);
-+	SubjectBuf[size - 1] = '\0';
-         return(0);
-     }
-     if (!ULstrcmp(s, "content-type")) {
---- metamail-2.7.orig/metamail/dlist.c
-+++ metamail-2.7/metamail/dlist.c
-@@ -0,0 +1,176 @@
-+#include "common.h"
-+#include "dlist.h"
-+
-+/* null structure to easy initializing to NULL */
-+const DList DListNULL = { NULL, NULL };
-+
-+/* create a new dlist node containing data */
-+DListEntry* 
-+dlist_new(void* data) {
-+  DListEntry* new = XMALLOC( DListEntry, 1 );
-+  
-+  new->next = NULL;
-+  new->prev = NULL;
-+  new->data = data;
-+
-+  return new;
-+}
-+
-+/* concatenate two lists */
-+void
-+dlist_cat(DList* list1, DList* list2){
-+  list1->tail->next = list2->head;
-+  list2->head->prev = list1->tail;
-+  list1->tail = list2->tail;
-+}
-+
-+/* to shorten things a bit in some cases */
-+DListEntry*
-+dlist_insertnew(DList* list, void* data, DListEntry* pos) {
-+  DListEntry* new = dlist_new( data );
-+  return dlist_insert( list, new, pos );
-+}
-+
-+/* can be used to insert an entry at a specific position in a dlist.
-+   use with caution on empty list, cause it might fail then. */
-+DListEntry*
-+dlist_insert(DList* list, DListEntry* new, DListEntry* pos) {
-+
-+  if ( pos ) { // if pos not null, insert
-+    new->next = pos->next;
-+    pos->next = new;
-+    new->prev = pos;
-+  } else if( ! list->head && ! list->tail ) { // otherwise treat as empty
-+    new->next = NULL;                         // list
-+    new->prev = NULL;
-+    list->head = new;
-+  } else
-+    return NULL;    // not an empty list -> error
-+  
-+  if ( new->next )  // set tail when tail
-+    new->next->prev = new;
-+  else
-+    list->tail = new;
-+  
-+  return new;
-+}
-+
-+/* can only be used to append to the end of a list */
-+DListEntry*
-+dlist_append(DList* list, DListEntry* new) {
-+  if ( list->tail ) { // if list tail exists, then link with it
-+    new->next = list->tail->next;
-+    list->tail->next = new;
-+  } else {
-+    new->next = NULL;
-+    list->head = new;
-+  }
-+
-+  new->prev = list->tail;
-+
-+  if ( new->next )  // if next is defined, then set its prev value correctly
-+    new->next->prev = new;
-+  else
-+    list->tail = new;
-+  
-+  return new;
-+}
-+
-+
-+
-+DListEntry* 
-+dlist_insert_sort (DList* list, DListEntry* new, dlist_comp cmp) {
-+  
-+}
-+
-+/* retrieves the head of a list */
-+DListEntry* 
-+dlist_head(DList* list) {
-+  DListEntry *help = list->tail;
-+  DListEntry *old  = NULL;
-+  
-+  while( help ) {
-+    old = help;
-+    help = help->prev;
-+  }
-+  
-+  return old;
-+}
-+
-+/* retrieves the tail of a list */
-+DListEntry* 
-+dlist_tail(DList* list) {
-+  DListEntry *help = list->head;
-+  DListEntry *old  = NULL;
-+
-+  while( help ) {
-+    old = help;
-+    help = help->next;
-+  }
-+  
-+  return old;
-+}
-+
-+/* returns the length of the list */
-+size_t 
-+dlist_length(DList* list){
-+  DListEntry *help = list->head;
-+  size_t n;
-+
-+  for (n = 0; help; ++n)
-+    help = help->next;
-+
-+  return n;
-+}
-+
-+/* removes an entry from the list, and returns it so that it might
-+   be destroyed properly */
-+DListEntry*
-+dlist_remove(DList* list, DListEntry* entry) {
-+  if (entry) {
-+    if (entry != list->head) {  // when not head
-+      if (entry->prev)       // and a previous entry exists
-+	entry->prev->next = entry->next; // tell the previous our next entry
-+    } else
-+      list->head = entry->next; // otherwise next entry is head
-+    
-+    if (entry != list->tail) {  // when not tail
-+      if (entry->next)       // and next entry exists
-+	entry->next->prev = entry->prev; // tell the next entry our previous 
-+    } else
-+    list->tail = entry->prev; // otherwise previous is tail
-+  }
-+
-+  return entry;
-+}
-+
-+/* checks a list to be ok (debugging) verifies head, tail and prints list */
-+dlist_check( DList* list ) {
-+  // should be implemented
-+}
-+
-+
-+DListEntry*
-+dlist_search(DList* list, void* data, dlist_comp cmp) 
-+{
-+  DListEntry *help = list->head;
-+
-+  if (list) {
-+    while ( help ) {
-+      if ( cmp( data, help->data ) == 0 ) 
-+	return help;
-+      else
-+	help = help->next;
-+    }
-+  }
-+  
-+  return NULL;
-+}
-+
-+
-+int
-+dlist_strcmp(void* data1, void* data2)
-+{
-+  return strcmp( (char*) data1, (char*) data2 );
-+}
-+
---- metamail-2.7.orig/metamail/dlist.h
-+++ metamail-2.7/metamail/dlist.h
-@@ -0,0 +1,43 @@
-+#ifndef COMMON_LIST_H
-+#define COMMON_LIST_H 1
-+
-+#include <metamail/common.h>
-+
-+BEGIN_C_DECLS
-+
-+typedef int (*dlist_comp) (void*, void*);
-+
-+typedef struct dlistentry {
-+  struct dlistentry *next;
-+  struct dlistentry *prev;
-+  void *data;
-+} DListEntry;
-+
-+typedef struct dlist {
-+  DListEntry *head;
-+  DListEntry *tail;
-+} DList;
-+
-+extern const DList DListNULL;
-+
-+extern DListEntry *dlist_new         (void* data);
-+extern void        dlist_cat         (DList* list1, DList* list2);
-+extern DListEntry *dlist_insert_new  (DList* list, void* data,
-+				      DListEntry* pos);
-+extern DListEntry *dlist_insert      (DList* list, DListEntry* new,
-+				      DListEntry* pos);
-+extern DListEntry *dlist_insert_sort (DList* list, DListEntry* new, 
-+				      dlist_comp cmp);
-+extern DListEntry *dlist_append      (DList* list, DListEntry* new);
-+extern DListEntry *dlist_head        (DList* list);
-+extern DListEntry *dlist_tail        (DList* list);
-+extern size_t      dlist_length      (DList* list);
-+extern DListEntry *dlist_remove      (DList* list, DListEntry* entry);
-+
-+extern DListEntry *dlist_search      (DList* list, void* data, dlist_comp cmp);
-+
-+extern int dlist_strcmp              (void* data1, void* data2);
-+
-+END_C_DECLS
-+
-+#endif /* !COMMON_LIST_H */
---- metamail-2.7.orig/metamail/common-h.in
-+++ metamail-2.7/metamail/common-h.in
-@@ -0,0 +1,162 @@
-+## common-h.in -- Process this file with configure to produce common.h
-+## Copyright (C) 2000 Gary V. Vaughan
-+##
-+## addition and changes that were made are Copyright (C) 2000 Michael Moerz
-+##
-+## This program is free software; you can redistribute it and/or modify
-+## it under the terms of the GNU General Public License as published by
-+## the Free Software Foundation; either version 2, or (at your option)
-+## any later version.
-+##  
-+## This program is distributed in the hope that it will be useful,
-+## but WITHOUT ANY WARRANTY; without even the implied warranty of
-+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+## GNU General Public License for more details.
-+##  
-+## You should have received a copy of the GNU General Public License
-+## along with this program; if not, write to the Free Software
-+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+#if TIME_WITH_SYS_TIME
-+# include <sys/time.h>
-+# include <time.h>
-+#else
-+# if HAVE_SYS_TIME_H
-+#  include <sys/time.h>
-+# else
-+#  include <time.h>
-+# endif
-+#endif
-+
-+#ifndef PARAMS
-+#  if __STDC__
-+#    ifndef NOPROTOS
-+#      define PARAMS(args)        args
-+#    endif
-+#  endif
-+#  ifndef PARAMS
-+#    define PARAMS(args)          ()
-+#  endif
-+#endif
-+
-+#ifndef EXIT_SUCCESS
-+#  define EXIT_SUCCESS  0
-+#  define EXIT_FAILURE  1
-+#endif
-+      
-+#ifdef __cplusplus
-+#  define BEGIN_C_DECLS         extern "C" {
-+#  define END_C_DECLS           }
-+#else
-+#  define BEGIN_C_DECLS
-+#  define END_C_DECLS
-+#endif
-+
-+#ifdef __GNUC__
-+#  ifndef const
-+#    define const       __const
-+#  endif
-+#  ifndef signed
-+#    define signed      __signed
-+#  endif
-+#  ifndef volatile
-+#    define volatile    __volatile
-+#  endif
-+#else
-+#  ifdef __STDC__
-+#    undef  signed
-+#    define signed
-+#    undef  volatile
-+#    define volatile
-+#  endif
-+#endif
-+
-+#ifdef __STDC__
-+#  define STR(x)          #x
-+#  define CONC(x, y)      x##y
-+   typedef void* sic_ptr;
-+#else
-+#  define STR(x)          "x"
-+#  define CONC(x, y)      x/**/y
-+   typedef char* sic_ptr;
-+#endif
-+
-+
-+#define XCALLOC(type, num)      ((type *) xcalloc ((num), sizeof(type)))
-+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-+#define XREALLOC(type, p, num)  ((type *) xrealloc ((p), (num) * sizeof(type)))
-+#define XFREE(stale)                            do {        \
-+              if (stale) { free ((sic_ptr) stale);  stale = 0; }    \
-+                                                      } while (0)
-+
-+
-+BEGIN_C_DECLS
-+
-+extern void *xcalloc    (size_t num, size_t size);
-+extern void *xmalloc    (size_t num);
-+extern void *xrealloc   (void *p, size_t num);
-+extern char *xstrdup    (const char *string);
-+extern char *xstrerror  (int errnum);
-+
-+END_C_DECLS
-+
-+#if WITH_DMALLOC
-+#  include <dmalloc.h>
-+#endif
-+
-+//metamail specific stuff below (this are the additions from Michael Moerz)
-+
-+#define RESET_PROGRAM "/usr/bin/reset"
-+
-+//#define NO_RLIMITS 1
-+#define sigtype void
-+
-+/* This constant should define the ASCII code for newlines on systems where 
-+   the newline convention is other than CRLF.  On UNIX, it is ^J, ASCII 10. 
-+    Here we define it as '\n' which should be right on MOST systems... */
-+#define NEWLINE_CHAR '\n'
-+
-+/* The following defines the default size at which long
-+    messages will be split into multiple messages of type
-+    "message/partial" by the mailto and splitmail commands,
-+    at least. */
-+#ifndef DEFAULT_SPLIT_SIZE
-+#define DEFAULT_SPLIT_SIZE 250000
-+#endif
-+
-+#define PATH_SEPARATOR ':'
-+#ifndef STDPATH
-+#define STDPATH "/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
-+#endif
-+
-+/* The following can be set to a directory or colon-separated list of 
-+  directories that will be prepended to the user's search path before 
-+  executing any mailcap-derived commands. 
-+
-+  It should be set to NULL if there are no directories to prepend.  
-+*/
-+
-+#define AUXPATH NULL
-+
-+
-+#define TMPFILE_NAME_SIZE   1000
-+#define MAX_FILE_NAME_SIZE 1000
-+
-+BEGIN_C_DECLS
-+
-+extern char **environ, *gets();
-+
-+extern char *getenv();
-+extern char *index();
-+extern char *rindex();
-+
-+extern FILE *popen();
-+
-+END_C_DECLS
-+
-+//#ifndef NO_RLIMITS
-+//#include <sys/resource.h>
-+//#endif
-+
-+
-+
---- metamail-2.7.orig/metamail/xmalloc.c
-+++ metamail-2.7/metamail/xmalloc.c
-@@ -0,0 +1,38 @@
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#include "common.h"
-+#include "error.h"
-+
-+void *
-+xmalloc (size_t num)
-+{
-+  void *new = malloc (num);
-+  if (!new)
-+    metamail_fatal ("Memory exhausted");
-+  return new;
-+}
-+
-+void *
-+xrealloc (void *p, size_t num)
-+{
-+  void *new;
-+  
-+  if (!p)
-+    return xmalloc (num);
-+  
-+  new = realloc (p, num);
-+  if (!new)
-+    metamail_fatal ("Memory exhausted");
-+  
-+  return new;
-+}
-+
-+void *
-+xcalloc (size_t num, size_t size)
-+{
-+  void *new = xmalloc (num * size); // is implemented by malloc, cause calloc
-+  bzero (new, num * size);          // is not available in some older C libs
-+  return new;
-+}
---- metamail-2.7.orig/metamail/error.c
-+++ metamail-2.7/metamail/error.c
-@@ -0,0 +1,82 @@
-+#if HAVE_CONFIG_H
-+#  include "config.h"
-+#endif
-+
-+#include "common.h"
-+#include "error.h"
-+
-+#include <libgen.h>  /* basename(3) */
-+const char *program_name = NULL;
-+      
-+static void error PARAMS((int exit_status, const char *mode,
-+			  const char *message, va_list ap));
-+      
-+void
-+set_program_name (path)
-+     const char *path;
-+{
-+  METAMAIL_ASSERT (!program_name);
-+  program_name = (char*) xstrdup ( (char*) basename (path));
-+}
-+
-+static void
-+error (exit_status, mode, message, ap)
-+     int exit_status;
-+     const char *mode;
-+     const char *message;
-+     va_list ap;
-+{
-+  fprintf (stderr, "%s: %s: ", program_name, mode);
-+  vfprintf (stderr, message, ap);
-+  fprintf (stderr, ".\n");
-+
-+  if (exit_status >= 0)
-+    exit (exit_status);
-+}
-+
-+void
-+#if HAVE_STDARG_H
-+metamail_warning (const char *message, ...)
-+#else
-+metamail_warning (message, va_alist)
-+     const char *message;
-+     va_dcl
-+#endif
-+{
-+  va_list ap;
-+  VA_START (ap, message);
-+  error (-1, "warning", message, ap);
-+  va_end (ap);
-+}
-+
-+void
-+#if HAVE_STDARG_H
-+metamail_error (const char *message, ...)
-+#else
-+metamail_error (message, va_alist)
-+     const char *message;
-+     va_dcl
-+#endif
-+{
-+  va_list ap;
-+  VA_START (ap, message);
-+  error (-1, "ERROR", message, ap);
-+  va_end (ap);
-+}
-+      
-+void
-+#if HAVE_STDARG_H
-+metamail_fatal (const char *message, ...)
-+#else
-+metamail_fatal (message, va_alist)
-+     const char *message;
-+     va_dcl
-+#endif
-+{
-+  va_list ap;
-+  VA_START (ap, message);
-+  error (EXIT_FAILURE, "FATAL", message, ap);
-+  va_end (ap);
-+}
-+
-+
---- metamail-2.7.orig/metamail/error.h
-+++ metamail-2.7/metamail/error.h
-@@ -0,0 +1,17 @@
-+#ifndef COMMON_ERROR_H
-+#define COMMON_ERROR_H 1
-+      
-+#include <metamail/common.h>
-+
-+BEGIN_C_DECLS
-+      
-+extern const char *program_name;
-+extern void set_program_name PARAMS((const char *argv0));
-+      
-+extern void metamail_warning      PARAMS((const char *message, ...));
-+extern void metamail_error        PARAMS((const char *message, ...));
-+extern void metamail_fatal        PARAMS((const char *message, ...));
-+      
-+END_C_DECLS
-+      
-+#endif /* !COMMON_ERROR_H */
---- metamail-2.7.orig/metamail/xstrerror.c
-+++ metamail-2.7/metamail/xstrerror.c
-@@ -0,0 +1,32 @@
-+/* xstrerror.c -- strerror wrapper with bound checking
-+   Fri Jun 16 18:30:00 1995  Pat Rankin  <rankin@eql.caltech.edu>
-+   This code is in the public domain.
-+*/
-+
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#include "common.h"
-+
-+extern char *strerror ();
-+
-+/* If strerror returns NULL, we'll format the number into a static buffer.  */
-+#define ERRSTR_FMT "undocumented error #%d"
-+static char xstrerror_buf[sizeof ERRSTR_FMT + 20];
-+
-+/* Like strerror, but result is never a null pointer.  */
-+char *
-+xstrerror (int errnum)
-+{
-+  char *errstr = strerror (errnum);
-+
-+  /* If `errnum' is out of range, result might be NULL.  We'll fix that.  */
-+  if (!errstr)
-+    {
-+      sprintf (xstrerror_buf, ERRSTR_FMT, errnum);
-+      errstr = xstrerror_buf;
-+    }
-+
-+  return errstr;
-+}
---- metamail-2.7.orig/metamail/stamp-common
-+++ metamail-2.7/metamail/stamp-common
-@@ -0,0 +1 @@
-+timestamp
---- metamail-2.7.orig/metamail/common.h
-+++ metamail-2.7/metamail/common.h
-@@ -0,0 +1,203 @@
-+/*  -*- Mode: C -*-
-+ * --------------------------------------------------------------------
-+ * DO NOT EDIT THIS FILE!  It has been automatically generated
-+ * from:    configure.in and common.h.in
-+ * on host: diziet
-+ * --------------------------------------------------------------------
-+ */
-+
-+#ifndef METAMAIL_COMMON_H
-+#define METAMAIL_COMMON_H 1
-+
-+#include <stdio.h>
-+#include <ctype.h>        // ??? ok here
-+#include <sys/types.h>
-+#include <sys/stat.h>     // ??? ok here
-+
-+// ??? following ok here without check?
-+#include <pwd.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/file.h>
-+#include <signal.h>
-+
-+#include <termio.h>
-+#include <fcntl.h>
-+#include <sys/utsname.h>
-+
-+#include <linux/limits.h>
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <errno.h>
-+
-+#ifndef errno
-+/* Some sytems #define this! */
-+extern int errno;
-+#endif
-+
-+#include <string.h>
-+
-+#include <stdarg.h>
-+#ifndef VA_START
-+#  define VA_START(a, f) va_start(a, f)
-+#endif /* VA_START */
-+
-+
-+#include <assert.h>
-+#define METAMAIL_ASSERT assert
-+
-+
-+#if TIME_WITH_SYS_TIME
-+# include <sys/time.h>
-+# include <time.h>
-+#else
-+# if HAVE_SYS_TIME_H
-+#  include <sys/time.h>
-+# else
-+#  include <time.h>
-+# endif
-+#endif
-+
-+#ifndef PARAMS
-+#  if __STDC__
-+#    ifndef NOPROTOS
-+#      define PARAMS(args)        args
-+#    endif
-+#  endif
-+#  ifndef PARAMS
-+#    define PARAMS(args)          ()
-+#  endif
-+#endif
-+
-+#ifndef EXIT_SUCCESS
-+#  define EXIT_SUCCESS  0
-+#  define EXIT_FAILURE  1
-+#endif
-+      
-+#ifdef __cplusplus
-+#  define BEGIN_C_DECLS         extern "C" {
-+#  define END_C_DECLS           }
-+#else
-+#  define BEGIN_C_DECLS
-+#  define END_C_DECLS
-+#endif
-+
-+#ifdef __GNUC__
-+#  ifndef const
-+#    define const       __const
-+#  endif
-+#  ifndef signed
-+#    define signed      __signed
-+#  endif
-+#  ifndef volatile
-+#    define volatile    __volatile
-+#  endif
-+#else
-+#  ifdef __STDC__
-+#    undef  signed
-+#    define signed
-+#    undef  volatile
-+#    define volatile
-+#  endif
-+#endif
-+
-+#ifdef __STDC__
-+#  define STR(x)          #x
-+#  define CONC(x, y)      x##y
-+   typedef void* sic_ptr;
-+#else
-+#  define STR(x)          "x"
-+#  define CONC(x, y)      x/**/y
-+   typedef char* sic_ptr;
-+#endif
-+
-+
-+#define XCALLOC(type, num)      ((type *) xcalloc ((num), sizeof(type)))
-+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-+#define XREALLOC(type, p, num)  ((type *) xrealloc ((p), (num) * sizeof(type)))
-+#define XFREE(stale)                            do {        \
-+              if (stale) { free ((sic_ptr) stale);  stale = 0; }    \
-+                                                      } while (0)
-+
-+
-+BEGIN_C_DECLS
-+
-+extern void *xcalloc    (size_t num, size_t size);
-+extern void *xmalloc    (size_t num);
-+extern void *xrealloc   (void *p, size_t num);
-+extern char *xstrdup    (const char *string);
-+extern char *xstrerror  (int errnum);
-+
-+END_C_DECLS
-+
-+#if WITH_DMALLOC
-+#  include <dmalloc.h>
-+#endif
-+
-+//metamail specific stuff below (this are the additions from Michael Moerz)
-+
-+#define RESET_PROGRAM "/usr/bin/reset"
-+
-+//#define NO_RLIMITS 1
-+#define sigtype void
-+
-+/* This constant should define the ASCII code for newlines on systems where 
-+   the newline convention is other than CRLF.  On UNIX, it is ^J, ASCII 10. 
-+    Here we define it as '\n' which should be right on MOST systems... */
-+#define NEWLINE_CHAR '\n'
-+
-+/* The following defines the default size at which long
-+    messages will be split into multiple messages of type
-+    "message/partial" by the mailto and splitmail commands,
-+    at least. */
-+#ifndef DEFAULT_SPLIT_SIZE
-+#define DEFAULT_SPLIT_SIZE 250000
-+#endif
-+
-+#define PATH_SEPARATOR ':'
-+#ifndef STDPATH
-+#define STDPATH "/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
-+#endif
-+
-+/* The following can be set to a directory or colon-separated list of 
-+  directories that will be prepended to the user's search path before 
-+  executing any mailcap-derived commands. 
-+
-+  It should be set to NULL if there are no directories to prepend.  
-+*/
-+
-+#define AUXPATH NULL
-+
-+
-+#define TMPFILE_NAME_SIZE   1000
-+#define MAX_FILE_NAME_SIZE 1000
-+
-+BEGIN_C_DECLS
-+
-+extern char **environ, *gets();
-+
-+extern char *getenv();
-+extern char *index();
-+extern char *rindex();
-+
-+extern FILE *popen();
-+
-+END_C_DECLS
-+
-+//#ifndef NO_RLIMITS
-+//#include <sys/resource.h>
-+//#endif
-+
-+
-+
-+#define LPRCOMMAND "lp"
-+#define LPRTEMPLATE "lp %s"
-+#define CATCOMMAND "cat"
-+#define CATTEMPLATE "cat %s"
-+#define TMPNAME_MAX NAME_MAX
-+static struct termio MyTtyStateIn, MyTtyStateOut;
-+
-+
-+
-+#endif /* !METAMAIL_COMMON_H */
---- metamail-2.7.orig/metamail/Makefile.am
-+++ metamail-2.7/metamail/Makefile.am
-@@ -0,0 +1,27 @@
-+MAINTAINERCLEANFILES	= Makefile.in
-+
-+INCLUDES 		= -I$(top_builddir) -I$(top_srcdir)
-+
-+pkginclude_HEADERS	= common.h error.h
-+
-+lib_LTLIBRARIES		= libmetamail.la
-+
-+libmetamail_la_SOURCES	= error.c dlist.c xmalloc.c xstrerror.c \
-+			xstrdup.c 
-+
-+common.h: stamp-common
-+	@:
-+stamp-common: $(srcdir)/common-h.in $(top_builddir)/config.status
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES= CONFIGHEADERS= CONFIG_OTHER=metamail/common.h \
-+	  $(SHELL) ./config.status
-+	echo timestamp > $@
-+
-+dist-hook:
-+	rm -f $(distdir)/common.h
-+
-+
-+
-+
-+
-+
---- metamail-2.7.orig/metamail/Makefile.in
-+++ metamail-2.7/metamail/Makefile.in
-@@ -0,0 +1,426 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+MAINTAINERCLEANFILES = Makefile.in
-+
-+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-+
-+pkginclude_HEADERS = common.h error.h
-+
-+lib_LTLIBRARIES = libmetamail.la
-+
-+libmetamail_la_SOURCES = error.c dlist.c xmalloc.c xstrerror.c 			xstrdup.c 
-+
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES = 
-+LTLIBRARIES =  $(lib_LTLIBRARIES)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
-+libmetamail_la_LDFLAGS = 
-+libmetamail_la_LIBADD = 
-+libmetamail_la_OBJECTS =  error.lo dlist.lo xmalloc.lo xstrerror.lo \
-+xstrdup.lo
-+CFLAGS = @CFLAGS@
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+HEADERS =  $(pkginclude_HEADERS)
-+
-+DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in config.h.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+DEP_FILES =  .deps/dlist.P .deps/error.P .deps/xmalloc.P .deps/xstrdup.P \
-+.deps/xstrerror.P
-+SOURCES = $(libmetamail_la_SOURCES)
-+OBJECTS = $(libmetamail_la_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .lo .o .obj .s
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign metamail/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+config.h: stamp-h
-+	@if test ! -f $@; then \
-+		rm -f stamp-h; \
-+		$(MAKE) stamp-h; \
-+	else :; fi
-+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES= CONFIG_HEADERS=metamail/config.h \
-+	     $(SHELL) ./config.status
-+	@echo timestamp > stamp-h 2> /dev/null
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
-+	@if test ! -f $@; then \
-+		rm -f $(srcdir)/stamp-h.in; \
-+		$(MAKE) $(srcdir)/stamp-h.in; \
-+	else :; fi
-+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOHEADER)
-+	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-+
-+mostlyclean-hdr:
-+
-+clean-hdr:
-+
-+distclean-hdr:
-+	-rm -f config.h
-+
-+maintainer-clean-hdr:
-+
-+mostlyclean-libLTLIBRARIES:
-+
-+clean-libLTLIBRARIES:
-+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-+
-+distclean-libLTLIBRARIES:
-+
-+maintainer-clean-libLTLIBRARIES:
-+
-+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
-+	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-libLTLIBRARIES:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-+	done
-+
-+# FIXME: We should only use cygpath when building on Windows,
-+# and only if it is available.
-+.c.obj:
-+	$(COMPILE) -c `cygpath -w $<`
-+
-+.s.o:
-+	$(COMPILE) -c $<
-+
-+.S.o:
-+	$(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+	-rm -f *.o core *.core
-+	-rm -f *.$(OBJEXT)
-+
-+clean-compile:
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+.s.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+.S.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+
-+maintainer-clean-libtool:
-+
-+libmetamail.la: $(libmetamail_la_OBJECTS) $(libmetamail_la_DEPENDENCIES)
-+	$(LINK) -rpath $(libdir) $(libmetamail_la_LDFLAGS) $(libmetamail_la_OBJECTS) $(libmetamail_la_LIBADD) $(LIBS)
-+
-+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
-+	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
-+	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \
-+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \
-+	done
-+
-+uninstall-pkgincludeHEADERS:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(pkginclude_HEADERS)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(pkgincludedir)/$$p; \
-+	done
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = metamail
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign metamail/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-+
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+all-recursive-am: config.h
-+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-+
-+install-exec-am: install-libLTLIBRARIES
-+install-exec: install-exec-am
-+
-+install-data-am: install-pkgincludeHEADERS
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
-+uninstall: uninstall-am
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(pkgincludedir)
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
-+		mostlyclean-compile mostlyclean-libtool \
-+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
-+		clean-tags clean-depend clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
-+		distclean-libtool distclean-tags distclean-depend \
-+		distclean-generic clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-hdr \
-+		maintainer-clean-libLTLIBRARIES \
-+		maintainer-clean-compile maintainer-clean-libtool \
-+		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-+mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
-+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
-+uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
-+distclean-compile clean-compile maintainer-clean-compile \
-+mostlyclean-libtool distclean-libtool clean-libtool \
-+maintainer-clean-libtool uninstall-pkgincludeHEADERS \
-+install-pkgincludeHEADERS tags mostlyclean-tags distclean-tags \
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-+install-exec-am install-exec install-data-am install-data install-am \
-+install uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+common.h: stamp-common
-+	@:
-+stamp-common: $(srcdir)/common-h.in $(top_builddir)/config.status
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES= CONFIGHEADERS= CONFIG_OTHER=metamail/common.h \
-+	  $(SHELL) ./config.status
-+	echo timestamp > $@
-+
-+dist-hook:
-+	rm -f $(distdir)/common.h
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/metamail/libcommon.la
-+++ metamail-2.7/metamail/libcommon.la
-@@ -0,0 +1,28 @@
-+# libcommon.la - a libtool library file
-+# Generated by ltmain.sh - GNU libtool 1.3.5 (1.385.2.206 2000/05/27 11:12:27)
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# The name that we can dlopen(3).
-+dlname=''
-+
-+# Names of this library.
-+library_names='libcommon.so.0.0.0 libcommon.so.0 libcommon.so'
-+
-+# The name of the static archive.
-+old_library='libcommon.a'
-+
-+# Libraries that this one depends upon.
-+dependency_libs=''
-+
-+# Version information for libcommon.
-+current=0
-+age=0
-+revision=0
-+
-+# Is this an already installed library?
-+installed=no
-+
-+# Directory that this library needs to be installed in:
-+libdir='/usr/lib'
---- metamail-2.7.orig/metamail/config.h.in
-+++ metamail-2.7/metamail/config.h.in
-@@ -0,0 +1,119 @@
-+/* metamail/config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
-+
-+/* Define to empty if the keyword does not work.  */
-+#undef const
-+
-+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-+#undef size_t
-+
-+/* Define if you have the ANSI C header files.  */
-+#undef STDC_HEADERS
-+
-+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-+#undef TIME_WITH_SYS_TIME
-+
-+/* Define if you have the basename function.  */
-+#undef HAVE_BASENAME
-+
-+/* Define if you have the bcmp function.  */
-+#undef HAVE_BCMP
-+
-+/* Define if you have the bcopy function.  */
-+#undef HAVE_BCOPY
-+
-+/* Define if you have the bzero function.  */
-+#undef HAVE_BZERO
-+
-+/* Define if you have the calloc function.  */
-+#undef HAVE_CALLOC
-+
-+/* Define if you have the index function.  */
-+#undef HAVE_INDEX
-+
-+/* Define if you have the initstate function.  */
-+#undef HAVE_INITSTATE
-+
-+/* Define if you have the kill function.  */
-+#undef HAVE_KILL
-+
-+/* Define if you have the killpg function.  */
-+#undef HAVE_KILLPG
-+
-+/* Define if you have the memcmp function.  */
-+#undef HAVE_MEMCMP
-+
-+/* Define if you have the memcpy function.  */
-+#undef HAVE_MEMCPY
-+
-+/* Define if you have the memset function.  */
-+#undef HAVE_MEMSET
-+
-+/* Define if you have the putenv function.  */
-+#undef HAVE_PUTENV
-+
-+/* Define if you have the rand function.  */
-+#undef HAVE_RAND
-+
-+/* Define if you have the random function.  */
-+#undef HAVE_RANDOM
-+
-+/* Define if you have the rindex function.  */
-+#undef HAVE_RINDEX
-+
-+/* Define if you have the srand function.  */
-+#undef HAVE_SRAND
-+
-+/* Define if you have the strchr function.  */
-+#undef HAVE_STRCHR
-+
-+/* Define if you have the strerror function.  */
-+#undef HAVE_STRERROR
-+
-+/* Define if you have the strrchr function.  */
-+#undef HAVE_STRRCHR
-+
-+/* Define if you have the vfprintf function.  */
-+#undef HAVE_VFPRINTF
-+
-+/* Define if you have the <assert.h> header file.  */
-+#undef HAVE_ASSERT_H
-+
-+/* Define if you have the <dlfcn.h> header file.  */
-+#undef HAVE_DLFCN_H
-+
-+/* Define if you have the <errno.h> header file.  */
-+#undef HAVE_ERRNO_H
-+
-+/* Define if you have the <signal.h> header file.  */
-+#undef HAVE_SIGNAL_H
-+
-+/* Define if you have the <stdarg.h> header file.  */
-+#undef HAVE_STDARG_H
-+
-+/* Define if you have the <stdlib.h> header file.  */
-+#undef HAVE_STDLIB_H
-+
-+/* Define if you have the <string.h> header file.  */
-+#undef HAVE_STRING_H
-+
-+/* Define if you have the <strings.h> header file.  */
-+#undef HAVE_STRINGS_H
-+
-+/* Define if you have the <sys/time.h> header file.  */
-+#undef HAVE_SYS_TIME_H
-+
-+/* Define if you have the <time.h> header file.  */
-+#undef HAVE_TIME_H
-+
-+/* Define if you have the <unistd.h> header file.  */
-+#undef HAVE_UNISTD_H
-+
-+/* Define if you have the <varargs.h> header file.  */
-+#undef HAVE_VARARGS_H
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Version number of package */
-+#undef VERSION
-+
---- metamail-2.7.orig/metamail/stamp-h.in
-+++ metamail-2.7/metamail/stamp-h.in
-@@ -0,0 +1 @@
-+timestamp
---- metamail-2.7.orig/metamail/patchlevel.h
-+++ metamail-2.7/metamail/patchlevel.h
-@@ -0,0 +1,19 @@
-+/* This is the metamail distribution, version number as given below.
-+
-+Version history:
-+
-+  Version 1.X was Bellcore-internal and pre-MIME.
-+  Version 2.0 was the first MIME-compliant release, also Bellcore-internal.
-+  Version 2.1 was the first public release, January 1992.
-+  Version 2.2 was the second public release, April 1992.  Major changes included:
-+      -- Ports to UNIX variants & MS-DOS.
-+      -- The new "mailto" program
-+      -- Innumerable smaller fixes & enhancements
-+  Version 2.3 was the June, 1992 release, with many more patches and 
-+      enhancements, including a Commodore Amiga port.
-+  Version 2.4 was the December, 1992 release, including many bug fixes and a vastly expanded (and now separately packaged) contrib directory.
-+  Version 2.5 was the June, 1993 release, with mostly just bug fixes from 2.4.
-+  Version 2.6 was the July, 1993 release, with important bug fixes from 2.5.
-+  Version 2.7 was the February, 1994 release, mostly bug fixes.
-+*/
-+#define MM_VERSTRING "2.7"
---- metamail-2.7.orig/metamail/xstrdup.c
-+++ metamail-2.7/metamail/xstrdup.c
-@@ -0,0 +1,35 @@
-+/* xstrdup.c -- strdup implementation with out of memory reporting
-+   Copyright (C) 2000 Gary V. Vaughan
-+  
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+  
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+  
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
-+#ifndef WITH_DMALLOC
-+
-+#if HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "common.h"
-+
-+char *
-+xstrdup (string)
-+     const char *string;
-+{
-+  return string ? strcpy (xmalloc (strlen (string) + 1), string) : NULL;
-+}
-+
-+#endif /* !WITH_DMALLOC */
-+
---- metamail-2.7.orig/src/metamail/codes.c
-+++ metamail-2.7/src/metamail/codes.c
-@@ -0,0 +1,432 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+#include <metamail/common.h>
-+
-+extern char *index();
-+static char basis_64[] =
-+   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+
-+static char index_64[128] = {
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
-+    52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1,-1,-1,-1,
-+    -1, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
-+    15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
-+    -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
-+    41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
-+};
-+
-+#define char64(c)  (((c) < 0 || (c) > 127) ? -1 : index_64[(c)])
-+
-+/*
-+char64(c)
-+char c;
-+{
-+    char *s = (char *) index(basis_64, c);
-+    if (s) return(s-basis_64);
-+    return(-1);
-+}
-+*/
-+
-+/* the following gets a character, but fakes it properly into two chars if there's a newline character */
-+static int InNewline=0;
-+
-+int nextcharin(infile, PortableNewlines)
-+FILE *infile;
-+int PortableNewlines;
-+{
-+    int c;
-+
-+#ifndef NEWLINE_CHAR
-+    return(getc(infile));
-+#else
-+    if (!PortableNewlines) return(getc(infile));
-+    if (InNewline) {
-+        InNewline = 0;
-+        return(10); /* LF */
-+    }
-+    c = getc(infile);
-+    if (c == NEWLINE_CHAR) {
-+        InNewline = 1;
-+        return(13); /* CR */
-+    }
-+    return(c);
-+#endif
-+}
-+
-+to64(infile, outfile, PortableNewlines) 
-+FILE *infile, *outfile;
-+int PortableNewlines;
-+{
-+    int c1, c2, c3, ct=0;
-+    InNewline = 0; /* always reset it */
-+    while ((c1 = nextcharin(infile, PortableNewlines)) != EOF) {
-+        c2 = nextcharin(infile, PortableNewlines);
-+        if (c2 == EOF) {
-+            output64chunk(c1, 0, 0, 2, outfile);
-+        } else {
-+            c3 = nextcharin(infile, PortableNewlines);
-+            if (c3 == EOF) {
-+                output64chunk(c1, c2, 0, 1, outfile);
-+            } else {
-+                output64chunk(c1, c2, c3, 0, outfile);
-+            }
-+        }
-+        ct += 4;
-+        if (ct > 71) {
-+            putc('\n', outfile);
-+            ct = 0;
-+        }
-+    }
-+    if (ct) putc('\n', outfile);
-+    fflush(outfile);
-+}
-+
-+output64chunk(c1, c2, c3, pads, outfile)
-+FILE *outfile;
-+{
-+    putc(basis_64[c1>>2], outfile);
-+    putc(basis_64[((c1 & 0x3)<< 4) | ((c2 & 0xF0) >> 4)], outfile);
-+    if (pads == 2) {
-+        putc('=', outfile);
-+        putc('=', outfile);
-+    } else if (pads) {
-+        putc(basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)], outfile);
-+        putc('=', outfile);
-+    } else {
-+        putc(basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)], outfile);
-+        putc(basis_64[c3 & 0x3F], outfile);
-+    }
-+}
-+
-+PendingBoundary(s, Boundaries, BoundaryCt)
-+char *s;
-+char **Boundaries;
-+int *BoundaryCt;
-+{
-+    int i, len;
-+
-+    if (s[0] != '-' || s[1] != '-') return(0);
-+
-+
-+    for (i=0; i < *BoundaryCt; ++i) {
-+	len = strlen(Boundaries[i]);
-+        if (!strncmp(s, Boundaries[i], len)) {
-+            if (s[len] == '-' && s[len+1] == '-') *BoundaryCt = i;
-+            return(1);
-+        }
-+    }
-+    return(0);
-+}
-+
-+/* If we're in portable newline mode, we have to convert CRLF to the 
-+    local newline convention on output */
-+
-+static int CRpending = 0;
-+
-+#ifdef NEWLINE_CHAR
-+almostputc(c, outfile, PortableNewlines)
-+int c;
-+FILE *outfile;
-+int PortableNewlines;
-+{
-+    if (CRpending) {
-+        if (c == 10) {
-+            putc(NEWLINE_CHAR, outfile);
-+            CRpending = 0;
-+        } else {
-+            putc(13, outfile);
-+	    if (c != 13) {
-+            	putc(c, outfile);
-+		CRpending = 0;
-+	    }
-+        }
-+    } else {
-+        if (PortableNewlines && c == 13) {
-+            CRpending = 1;
-+        } else {
-+            putc(c, outfile);
-+        }
-+    }
-+}
-+#else
-+almostputc(c, outfile, PortableNewlines)
-+int c;
-+FILE *outfile;
-+int PortableNewlines;
-+{
-+    putc(c, outfile);
-+}
-+#endif
-+
-+from64(infile, outfile, boundaries, boundaryct, PortableNewlines) 
-+FILE *infile, *outfile;
-+char **boundaries;
-+int *boundaryct;
-+int PortableNewlines;
-+{
-+    int c1, c2, c3, c4;
-+    int newline = 1, DataDone = 0;
-+
-+    /* always reinitialize */
-+    CRpending = 0;
-+    while ((c1 = getc(infile)) != EOF) {
-+        if (isspace(c1)) {
-+            if (c1 == '\n') {
-+                newline = 1;
-+            } else {
-+                newline = 0;
-+            }
-+            continue;
-+        }
-+        if (newline && boundaries && c1 == '-') {
-+            char Buf[200];
-+            /* a dash is NOT base 64, so all bets are off if NOT a boundary */
-+            ungetc(c1, infile);
-+            fgets(Buf, sizeof(Buf), infile);
-+            if (boundaries
-+                 && (Buf[0] == '-')
-+                 && (Buf[1] == '-')
-+                 && PendingBoundary(Buf, boundaries, boundaryct)) {
-+                return;
-+            }
-+            fprintf(stderr, "Ignoring unrecognized boundary line: %s\n", Buf);
-+            continue;
-+        }
-+        if (DataDone) continue;
-+        newline = 0;
-+        do {
-+            c2 = getc(infile);
-+        } while (c2 != EOF && isspace(c2));
-+        do {
-+            c3 = getc(infile);
-+        } while (c3 != EOF && isspace(c3));
-+        do {
-+            c4 = getc(infile);
-+        } while (c4 != EOF && isspace(c4));
-+        if (c2 == EOF || c3 == EOF || c4 == EOF) {
-+            fprintf(stderr, "Warning: base64 decoder saw premature EOF!\n");
-+            return;
-+        }
-+        if (c1 == '=' || c2 == '=') {
-+            DataDone=1;
-+            continue;
-+        }
-+        c1 = char64(c1);
-+        c2 = char64(c2);
-+        almostputc(((c1<<2) | ((c2&0x30)>>4)), outfile, PortableNewlines);
-+        if (c3 == '=') {
-+            DataDone = 1;
-+        } else {
-+            c3 = char64(c3);
-+            almostputc((((c2&0XF) << 4) | ((c3&0x3C) >> 2)), outfile, PortableNewlines);
-+            if (c4 == '=') {
-+                DataDone = 1;
-+            } else {
-+                c4 = char64(c4);
-+                almostputc((((c3&0x03) <<6) | c4), outfile, PortableNewlines);
-+            }
-+        }
-+    }
-+    if (CRpending) putc(13, outfile); /* Don't drop a lone trailing char 13 */
-+}
-+
-+static char basis_hex[] = "0123456789ABCDEF";
-+static char index_hex[128] = {
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+     0, 1, 2, 3,  4, 5, 6, 7,  8, 9,-1,-1, -1,-1,-1,-1,
-+    -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1
-+};
-+
-+/* The following version generated complaints on Solaris. */
-+/* #define hexchar(c)  (((c) < 0 || (c) > 127) ? -1 : index_hex[(c)])  */
-+/*  Since we're no longer ever calling it with anything signed, this should work: */
-+#define hexchar(c)  (((c) > 127) ? -1 : index_hex[(c)])
-+
-+/*
-+hexchar(c)
-+char c;
-+{
-+    char *s;
-+    if (islower(c)) c = toupper(c);
-+    s = (char *) index(basis_hex, c);
-+    if (s) return(s-basis_hex);
-+    return(-1);
-+}
-+*/
-+
-+toqp(infile, outfile) 
-+FILE *infile, *outfile;
-+{
-+    int c, ct=0, prevc=255;
-+    while ((c = getc(infile)) != EOF) {
-+        if ((c < 32 && (c != '\n' && c != '\t'))
-+             || (c == '=')
-+             || (c >= 127)
-+             /* Following line is to avoid single periods alone on lines,
-+               which messes up some dumb smtp implementations, sigh... */
-+             || (ct == 0 && c == '.')) {
-+            putc('=', outfile);
-+            putc(basis_hex[c>>4], outfile);
-+            putc(basis_hex[c&0xF], outfile);
-+            ct += 3;
-+            prevc = 'A'; /* close enough */
-+        } else if (c == '\n') {
-+            if (prevc == ' ' || prevc == '\t') {
-+                putc('=', outfile); /* soft & hard lines */
-+                putc(c, outfile);
-+            }
-+            putc(c, outfile);
-+            ct = 0;
-+            prevc = c;
-+        } else {
-+            if (c == 'F' && prevc == '\n') {
-+                /* HORRIBLE but clever hack suggested by MTR for sendmail-avoidance */
-+                c = getc(infile);
-+                if (c == 'r') {
-+                    c = getc(infile);
-+                    if (c == 'o') {
-+                        c = getc(infile);
-+                        if (c == 'm') {
-+                            c = getc(infile);
-+                            if (c == ' ') {
-+                                /* This is the case we are looking for */
-+                                fputs("=46rom", outfile);
-+                                ct += 6;
-+                            } else {
-+                                fputs("From", outfile);
-+                                ct += 4;
-+                            }
-+                        } else {
-+                            fputs("Fro", outfile);
-+                            ct += 3;
-+                        }
-+                    } else {
-+                        fputs("Fr", outfile);
-+                        ct += 2;
-+                    }
-+                } else {
-+                    putc('F', outfile);
-+                    ++ct;
-+                }
-+                ungetc(c, infile);
-+                prevc = 'x'; /* close enough -- printable */
-+            } else { /* END horrible hack */
-+                putc(c, outfile);
-+                ++ct;
-+                prevc = c;
-+            }
-+        }
-+        if (ct > 72) {
-+            putc('=', outfile);
-+            putc('\n', outfile);
-+            ct = 0;
-+            prevc = '\n';
-+        }
-+    }
-+    if (ct) {
-+        putc('=', outfile);
-+        putc('\n', outfile);
-+    }
-+}
-+
-+fromqp(infile, outfile, boundaries, boundaryct) 
-+FILE *infile, *outfile;
-+char **boundaries;
-+int *boundaryct;
-+{
-+    unsigned int c1, c2;
-+    int sawnewline = 1, neednewline = 0;
-+    /* The neednewline hack is necessary because the newline leading into 
-+      a multipart boundary is part of the boundary, not the data */
-+
-+    while ((c1 = getc(infile)) != EOF) {
-+        if (sawnewline && boundaries && (c1 == '-')) {
-+            char Buf[200];
-+            unsigned char *s;
-+
-+            ungetc(c1, infile);
-+            fgets(Buf, sizeof(Buf), infile);
-+            if (boundaries
-+                 && (Buf[0] == '-')
-+                 && (Buf[1] == '-')
-+                 && PendingBoundary(Buf, boundaries, boundaryct)) {
-+                return;
-+            }
-+            /* Not a boundary, now we must treat THIS line as q-p, sigh */
-+            if (neednewline) {
-+                putc('\n', outfile);
-+                neednewline = 0;
-+            }
-+            for (s=(unsigned char *) Buf; *s; ++s) {
-+                if (*s == '=') {
-+                    if (!*++s) break;
-+                    if (*s == '\n') {
-+                        /* ignore it */
-+                        sawnewline = 1;
-+                    } else {
-+                        c1 = hexchar(*s);
-+                        if (!*++s) break;
-+                        c2 = hexchar(*s);
-+                        putc(c1<<4 | c2, outfile);
-+                    }
-+                } else {
-+#ifdef MSDOS
-+                    if (*s == '\n')
-+                        putc('\r', outfile);	/* insert CR for binary-mode write */
-+#endif
-+                    putc(*s, outfile);
-+                }
-+            }
-+        } else {
-+            if (neednewline) {
-+                putc('\n', outfile);
-+                neednewline = 0;
-+            }
-+            if (c1 == '=') {
-+                sawnewline = 0;
-+                c1 = getc(infile);
-+                if (c1 == '\n') {
-+                    /* ignore it */
-+                    sawnewline = 1;
-+                } else {
-+                    c2 = getc(infile);
-+                    c1 = hexchar(c1);
-+                    c2 = hexchar(c2);
-+                    putc(c1<<4 | c2, outfile);
-+                    if (c2 == '\n') sawnewline = 1;
-+                }
-+            } else {
-+                if (c1 == '\n') {
-+                    sawnewline = 1;
-+                    neednewline = 1;
-+                } else {
-+                    sawnewline = 0;
-+                    putc(c1, outfile);
-+                }
-+            }
-+        }
-+    }
-+    if (neednewline) {
-+        putc('\n', outfile);
-+        neednewline = 0;
-+    }    
-+}
---- metamail-2.7.orig/src/metamail/dlistold.c
-+++ metamail-2.7/src/metamail/dlistold.c
-@@ -0,0 +1,120 @@
-+// Copyright: Michael Moerz 2000
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License with
-+// the Debian GNU/Linux distribution in file /usr/share/doc/common-licenses/GPL
-+// if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-+// Suite 330, Boston, MA  02111-1307  USA
-+
-+
-+#include <stdlib.h>
-+#include "dlist.h"
-+
-+/* create a new dlist node containing data */
-+DList* 
-+dlist_new(void* data) {
-+  DList* new = malloc( sizeof(DList) * 1 );
-+  
-+  new->next = NULL;
-+  new->prev = NULL;
-+  new->data = data;
-+
-+  return new;
-+}
-+
-+/* concatenate two lists */
-+void
-+dlist_cat(DList* tail_l1, DList* head_l2){
-+  tail_l1->next = head_l2;
-+  head_l2->prev = tail_l1; 
-+}
-+
-+/* to shorten things a bit in some cases */
-+DList*
-+dlist_insertnew(DList** tail, void* data) {
-+  DList* new = dlist_new( data );
-+  return dlist_insert( tail, new );
-+}
-+
-+/* can also be used to append to a list */
-+DList*
-+dlist_insert(DList** tail, DList* new) {
-+  if ( (*tail) ) {
-+    new->next = (*tail)->next;
-+    (*tail)->next = new;
-+    new->prev = (*tail);
-+  }     
-+
-+  if ( new->next )  // if next is defined, then set its prev value correctly
-+    new->next->prev = new;
-+  else
-+    (*tail) = new;
-+  
-+  return new;
-+}
-+
-+/* retrieves the head of a list */
-+DList* 
-+dlist_head(DList* head){
-+  DList* old;
-+
-+  while( head ) {
-+    old = head;
-+    head = head->prev;
-+  }
-+  
-+  return old;
-+}
-+
-+/* retrieves the tail of a list */
-+DList* 
-+dlist_tail(DList* head){
-+  DList* old;
-+
-+  while( head ) {
-+    old = head;
-+    head = head->next;
-+  }
-+  
-+  return old;
-+}
-+
-+/* returns the length of the list */
-+size_t 
-+dlist_length(DList* head){
-+  size_t n;
-+
-+  for (n = 0; head; ++n)
-+    head = head->next;
-+
-+  return n;
-+}
-+
-+/* removes an entry from the list, and returns it so that it might
-+   be destroyed properly */
-+DList*
-+dlist_remove(DList** head, DList** tail, DList* entry) {
-+  if (entry != (*head)) {  // when not head
-+    if (entry->prev)       // and a previous entry exists
-+      entry->prev->next = entry->next; // tell the previous our next entry
-+  } else
-+    (*head) = entry->next; // otherwise next entry is head
-+        
-+  if (entry != (*tail)) {  // when not tail
-+    if (entry->next)       // and next entry exists
-+      entry->next->prev = entry->prev; // tell the next entry our previous one
-+  } else
-+    (*tail) = entry->prev; // otherwise previous is tail
-+
-+  return entry;
-+}
-+
---- metamail-2.7.orig/src/metamail/metamail.c
-+++ metamail-2.7/src/metamail/metamail.c
-@@ -0,0 +1,2223 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+/****************************************************** 
-+    Metamail -- A tool to help diverse mail readers 
-+                cope with diverse multimedia mail formats.
-+
-+    Author:  Nathaniel S. Borenstein, Bellcore
-+
-+ ******************************************************* */
-+
-+#include <metamail/common.h>
-+#include <metamail/patchlevel.h>
-+#include <metamail/dlist.h>
-+
-+#include "metamail.h"
-+#include "metamail_default.h"
-+#include "environment.h" /* for initializing global variables to default or
-+			    environment variables and for manipulating 
-+			    environment variables */
-+#include "mailcap.h" /* mailcap file(s) parsing functions */
-+
-+
-+char fileToDelete[NAME_MAX];
-+
-+char *FindParam();
-+
-+FILE *InputFP = NULL;
-+
-+/* mike extensions */
-+int nDebug = 0;
-+/* exts end */
-+
-+int MightAskBeforeExecuting = 1,
-+    DefinitelyNotTty = 0,
-+    MustNotBeTty = 0,
-+    MaybePageOutput = 0,
-+    MustPageOutput = 0,
-+    EatLeadingNewlines = 0,
-+    PrintSomeHeaders = 1,
-+    DoInBackground = 0,
-+    Quiet = 0,
-+    TransparentMode = 0,
-+    DeleteSourceFileWhenDone = 0,
-+    Is822Format = 1,
-+    DoDebug = 0,
-+    CParamsAlloced = 0,
-+    CParamsUsed = 0,
-+    YankMode = 0,
-+    UsingStandardInput = 0,
-+    PrintingMode = 0,
-+    JustWriteFiles = 0,
-+    ProcessingErrors = 0;
-+
-+int RunAsRootOK = 0;
-+
-+char *ContentType = NULL,
-+    *ContentEncoding = NULL,
-+    *MailerName = "unknown",
-+    *MailSubject = "Mail message",
-+    *MailFrom = "unknown sender",
-+    *MailSummary = "non-text mail message",
-+    *mailheaders = NULL,
-+    **CParams = NULL,
-+    **CParamValues = NULL,
-+    *JunkParameter = NULL;
-+
-+int EncodingCode = ENCODING_NONE;
-+
-+struct part {
-+    char *ctype;
-+    char *fname;
-+    struct part *next;
-+};
-+
-+struct NoAskItem *FirstNoAskItem = NULL, 
-+  *FirstQuietItem = NULL;
-+
-+void PrintHeader();
-+void ConsumeRestOfPart();
-+void ParseContentParameters();
-+
-+sigtype cleanup();
-+
-+char *Cleanse(s) /* no leading or trailing space, all lower case */
-+char *s;
-+{
-+    char *tmp, *news;
-+    
-+    /* strip leading white space */
-+    while (*s && isspace((unsigned char) *s)) ++s;
-+    news = s;
-+    /* put in lower case */
-+    for (tmp=s; *tmp; ++tmp) {
-+        if (isupper((unsigned char) *tmp)) *tmp = 
-+					     tolower((unsigned char) *tmp);
-+    }
-+    /* strip trailing white space */
-+    while (tmp > news && *--tmp && isspace((unsigned char) *tmp)) *tmp = 0;
-+    return(news);
-+}
-+
-+char *UnquoteString(s)
-+char *s;
-+{
-+    char *ans, *t;
-+
-+    if (*s != '"') return(s);
-+    ans = XMALLOC(char, 1+strlen(s)); //malloc(1+strlen(s));
-+    ++s;
-+    t = ans;
-+    while (*s) {
-+        if (*s == '\\') {
-+            *t++ = *++s;
-+        } else if (*s == '"') {
-+            break;
-+        } else {
-+            *t++ = *s;
-+        }
-+        ++s;
-+    }
-+    *t = 0;
-+    return(ans);
-+}
-+
-+sigtype
-+cleanup(signum) 
-+int signum;
-+{
-+    RestoreTtyState();
-+    signal(signum, SIG_DFL);
-+    kill(getpid(), signum);
-+}
-+
-+char **Boundaries = NULL;
-+int BoundaryCt = 0, BoundaryAlloc = 0;
-+struct nextfile {
-+    char *filename;
-+    struct nextfile *next;
-+} *FileQueue=NULL, *LastInQueue = NULL;
-+
-+void
-+ResetGlobals() {
-+    CParamsAlloced = 0;
-+    CParamsUsed = 0;
-+
-+    ContentType = NULL;
-+    ContentEncoding = NULL;
-+    MailSubject = "Mail message";
-+    MailFrom = "unknown sender";
-+    MailSummary = "non-text mail message";
-+    initMailHeadersFromEnvironment();
-+    CParams = NULL;
-+    CParamValues = NULL;
-+    JunkParameter = NULL;
-+}
-+
-+
-+/** initializes signalhandlers to cleanup function */
-+void
-+initSignalHandlers() {
-+    signal(SIGINT,  cleanup);
-+    signal(SIGILL,  cleanup);
-+    signal(SIGTRAP, cleanup);
-+    signal(SIGIOT,  cleanup);
-+    signal(SIGFPE,  cleanup);
-+    signal(SIGSEGV, cleanup);
-+    signal(SIGTERM, cleanup);
-+#ifdef SIGXCPU
-+    signal(SIGXCPU, cleanup);
-+#endif
-+}
-+
-+/** the main function for metamail */
-+main(argc, argv)
-+int argc;
-+char **argv;
-+{
-+    int retcode = 0;
-+
-+    initSignalHandlers;
-+    addToPath(AUXPATH);           /* add additional dirs to PATH */
-+    fileToDelete[0] = 0;
-+
-+    ProcessArguments(argc, argv); /* calls ExitWithError on error */
-+
-+    if (MaybePageOutput) {
-+        /* Want to send stderr to pager too, sigh... */
-+        fflush(stderr);
-+        close(2);
-+        dup2(1, 2);
-+    }
-+
-+    retcode = HandleMessage(NULL, 0);
-+    if (! UsingStandardInput) {
-+        fclose(InputFP);
-+    }
-+    if (fileToDelete[0]) {
-+        RmTmpFileName(fileToDelete);
-+        fileToDelete[0] = 0;
-+    }
-+
-+    while (FileQueue) {
-+        InputFP = fopen(FileQueue->filename, "r");
-+        if (DoDebug) printf("Trying to open input file: %s\n",
-+			    FileQueue->filename);
-+        if (!InputFP) ExitWithError("Can't read input file");
-+        if (DeleteSourceFileWhenDone) {
-+            strcpy(fileToDelete, FileQueue->filename);
-+        }
-+        ResetGlobals();
-+        retcode |= HandleMessage(NULL, 0);
-+        if (! UsingStandardInput) {
-+            fclose(InputFP);
-+        }
-+        if (fileToDelete[0]) {
-+            RmTmpFileName(fileToDelete);
-+            fileToDelete[0] = 0;
-+        }
-+        FileQueue = FileQueue->next;
-+    }
-+    if (MustPageOutput) PauseForUser();
-+    if (DoDebug) fprintf(stderr, "end of metamail\n");
-+    CleanupTmpFiles();
-+    exit(ProcessingErrors? -1 : retcode);
-+}
-+
-+void
-+QueueNextFile(fname)
-+char *fname;
-+{
-+    struct nextfile *tmp = XMALLOC( struct nextfile, 1);
-+    tmp->filename = fname;
-+    tmp->next = NULL;
-+    if (FileQueue) {
-+        LastInQueue->next = tmp;
-+        LastInQueue = tmp;
-+    } else {
-+        FileQueue = tmp;
-+        LastInQueue = tmp;
-+    }
-+}
-+
-+HandleMessage(SquirrelFile, nestingdepth)
-+char *SquirrelFile;
-+/* SquirrelFile, if non-NULL, is a place to save a recognized body instead of executing it. */
-+int nestingdepth;
-+{
-+    char *boundary;
-+    int FileWriteOnly = JustWriteFiles;
-+
-+    if (FileWriteOnly) {
-+        if (!lc2strncmp(ContentType, "message/", 8)
-+             || !lc2strncmp(ContentType, "multipart/", 10)) {
-+            FileWriteOnly = 0; /* only leaf data */
-+        }
-+    }
-+    if (Is822Format) {
-+	if (Read822Prefix(SquirrelFile?0:1, nestingdepth)) {
-+	    return -1;
-+	}
-+    } else /* this property is not recursive for multipart or message */
-+      Is822Format = 1;
-+
-+    PrepareMessage();
-+    if (!FileWriteOnly && !ProcessMailcapFiles(SquirrelFile)) return(0);
-+	
-+    if (!lc2strcmp(ContentType, "message")
-+         || !lc2strcmp(ContentType, "message/rfc822")) { 
-+        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
-+        ContentType = NULL; /* reset default */
-+        ContentEncoding = NULL; /* reset default */
-+        return(HandleMessage(NULL, nestingdepth+1)); /* simple recursion */
-+    }
-+
-+    boundary = FindParam("boundary");
-+    if (!boundary) boundary =JunkParameter; /* backward compatibility hack */
-+    if (!lc2strncmp(ContentType, "multipart", 9)) { 
-+      if (!boundary) {
-+	  fprintf(stderr, "Warning: No boundary for multipart data, treating as unrecognized format.\n");
-+      } else {
-+        char *LineBuf, NewSquirrelFile[TMPNAME_MAX];
-+        char *subtype = NULL;
-+        int currct, result, IsAlternative, WroteSquirrelFile, boundarylen;
-+
-+        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
-+        if (boundary[0] == '"') {
-+            boundary=UnquoteString(boundary);
-+        }
-+        subtype = index(ContentType, '/');
-+        if (subtype) {
-+            ++subtype;
-+            subtype = Cleanse(subtype);
-+        } else subtype = "mixed";
-+
-+        if (!MaybePageOutput && !DoInBackground) 
-+	  DoInBackground = strcmp(subtype, "parallel") ? 0 : 1;
-+
-+        IsAlternative = strcmp(subtype, "alternative") ? 0 : 1;
-+        if (IsAlternative) {
-+            MkTmpFileName(NewSquirrelFile);
-+            WroteSquirrelFile = 0;
-+        }
-+        LineBuf = XMALLOC(char, LINE_BUF_SIZE);
-+        sprintf(LineBuf, "--%s", boundary);
-+        strcpy(boundary, LineBuf);
-+        boundarylen = strlen(boundary);
-+        if (BoundaryCt >= BoundaryAlloc) {
-+            BoundaryAlloc += 5;
-+            if (Boundaries) 
-+	        Boundaries = XREALLOC(char *, Boundaries, BoundaryAlloc);
-+            else 
-+	        Boundaries = XMALLOC(char *, BoundaryAlloc);
-+        }
-+        Boundaries[BoundaryCt++] = boundary;
-+        if (DoDebug) printf("Handling multipart as built-in here.  Boundary: %s\n", boundary);
-+        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
-+            if (!strncmp(LineBuf, boundary, boundarylen)
-+                 && ((LineBuf[boundarylen] == '\n')
-+                      || (LineBuf[boundarylen] == '-'
-+                           && LineBuf[boundarylen+1] == '-'
-+                           && LineBuf[boundarylen+2] == '\n'))) {
-+                break;
-+            }
-+        }
-+        XFREE(LineBuf);
-+        currct = BoundaryCt;
-+        while(currct == BoundaryCt) {
-+            if (!strcmp(subtype, "digest")) {
-+                ContentType = "message/rfc822";
-+            } else {
-+                ContentType = NULL; /* reset default */
-+            }
-+            ContentEncoding = NULL; /* reset default */
-+            if (IsAlternative) {
-+                result = HandleMessage(NewSquirrelFile, nestingdepth+1);
-+            } else{
-+                result = HandleMessage(NULL, nestingdepth+1);
-+            }
-+            if (result) {
-+                /* Need to consume the rest of the part */
-+                ConsumeRestOfPart(NULL);
-+            } else {
-+                ++WroteSquirrelFile;
-+            }
-+        }
-+        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
-+            we must throw it away.*/
-+        if (BoundaryCt > 0) {
-+            ConsumeRestOfPart(NULL);
-+        }
-+        if (IsAlternative) {
-+            if (WroteSquirrelFile) {
-+                int retcode; 
-+                char Cmd[TMPNAME_MAX + 15];
-+                sprintf(Cmd, "%s %s", METAMAIL, NewSquirrelFile);
-+                fflush(stdout); fflush(stderr);
-+                retcode = system(Cmd);
-+                RmTmpFileName(NewSquirrelFile);
-+                return(retcode);
-+            } else {
-+                printf("Cannot handle any part of multipart/alternative message\n");
-+            }
-+        }
-+	return(0);
-+      }
-+    } /* End of multipart handling */
-+    if (!FileWriteOnly && !TryBuiltIns(SquirrelFile)) return(0);
-+    if (!SquirrelFile) { /* Very last resort -- unrecognized types */
-+        char Fname[NAME_MAX], *suggestedname, SugBuf[NAME_MAX];
-+        FILE *fp;
-+        int ans = 0, octetstream, ecode=0;
-+        int JustMadeTheFile=0;
-+
-+        Fname[0] = 0;
-+
-+        suggestedname = FindParam("name");
-+        if (!suggestedname) {
-+            MkTmpFileName(SugBuf);
-+            suggestedname = SugBuf;
-+            JustMadeTheFile=1;
-+        }
-+        if (strlen(suggestedname) > NAME_MAX - 50)
-+             suggestedname[NAME_MAX - 50] = '\0';
-+        if (suggestedname[0] == '"')
-+                suggestedname=UnquoteString(suggestedname);
-+ 
-+        octetstream = ! lc2strcmp(ContentType, "application/octet-stream");
-+        if (MightAskBeforeExecuting && !DefinitelyNotTty && !MustNotBeTty) {
-+            if (FileWriteOnly) {
-+                printf("\nThis message contains '%s`-format data.\n", ContentType);
-+            } else if (octetstream) {
-+                printf("This message contains raw digital data, which can either be viewed as text\nor written to a file.\n");
-+            } else {
-+                printf("\nThis message contains data in an unrecognized format, %s,\nwhich can either be viewed as text or written to a file.\n", ContentType);
-+            }
-+            while (!ans) {
-+                if (FileWriteOnly) {
-+                    ans = 2;
-+                } else {
-+                    printf("\nWhat do you want to do with the %s data?\n1 -- See it as text\n2 -- Write it to a file\n3 -- Just skip it\n4 -- Give another content type\n\n", octetstream ? "raw" : ContentType);
-+                    fgets(Fname, sizeof(Fname), stdin);
-+                    ans = atoi(Fname);
-+                }
-+                switch(ans) {
-+                    case 1:
-+                        TranslateInputToOutput(InputFP, stdout, EncodingCode, "text");
-+                        return(0);
-+                    case 2:
-+                        {
-+                        int needname = 1;
-+                        while (needname) {
-+                            needname = 0;
-+                            printf("Please enter the name of a file to which the data should be written\n(Default: %s) > ", suggestedname);
-+                            fflush(stdout);
-+                            fgets(Fname, sizeof(Fname), stdin);
-+                            Fname[strlen(Fname) - 1] = '\0'; /* bogus newline */
-+                            if (!Fname[0])
-+			      strcpy(Fname, suggestedname);
-+
-+                            if (Fname[0] == '~' && Fname[1] == '/') {
-+                                char Fname2[NAME_MAX];
-+                                int uid = getuid();
-+                                struct passwd *p;
-+                                p = getpwuid(uid);
-+                                if (!p) {
-+				  strcpy( Fname, suggestedname );
-+				  printf("Cannot figure out what ~ means, using temporary file %s instead\n", Fname);
-+                                } else {
-+                                    strcpy(Fname2, p->pw_dir);
-+                                    strcat(Fname2, "/");
-+                                    strcat(Fname2, Fname + 2);
-+                                    strcpy(Fname, Fname2);
-+                                }
-+                            }
-+
-+			    if ( strcmp( Fname, suggestedname ) ) 
-+			      RmTmpFileName( suggestedname );
-+			    else  /* remove from tmp list (should persist) */
-+			      DelTmpFileName( suggestedname ); 
-+			    
-+			    
-+			    if (DoDebug) fprintf(stderr, "pre access");
-+
-+                            if (!JustMadeTheFile && access(Fname, F_OK) == 0) {
-+                                char *s, AnsBuf[50];
-+                                int overwriteans = -1;
-+                                do {
-+                                    printf("File %s exists.  Do you want to overwrite it (y/n) ?\n", Fname);
-+                                    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-+                                    if (!s) {
-+                                        overwriteans = 0;
-+                                    } else {
-+                                        while (s && *s && isspace((unsigned char) *s)) ++s;
-+                                        if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') {
-+                                            overwriteans = 1;
-+                                        } else if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
-+                                            overwriteans=0;
-+                                        }
-+                                    }
-+                                    if (overwriteans == -1) printf("Please answer yes or no.\n");
-+                                } while (overwriteans == -1);
-+                                if (overwriteans == 0) needname = 1;
-+                            }
-+                        }
-+                        }
-+                        break;
-+                    case 3:
-+                        ConsumeRestOfPart(NULL);
-+                        return(0);
-+                        break;
-+		    case 4:
-+		      {
-+			char *savedContentType = ContentType;
-+			ContentType = malloc(64);
-+			printf("Please enter new content type> ");
-+			fflush(stdout);
-+			fgets(ContentType, 64, stdin);
-+			ContentType[strlen(ContentType) - 1] = '\0'; /* bogus newline */
-+			if (!ProcessMailcapFiles(SquirrelFile)) { 
-+			  free(savedContentType); 
-+			  return(0); 
-+			}
-+			printf("\nNo matching mailcap entry found.\n");
-+			free(ContentType);
-+			ContentType = savedContentType;
-+			ans = 0;
-+			break;
-+		      }
-+                    default:
-+                        ans = 0;
-+                        break;
-+                }
-+            }
-+        } else {
-+            int ct = 0;
-+            char *slash = rindex(suggestedname, '/');
-+            if (slash)  {
-+                ++slash;
-+            } else {
-+                slash = suggestedname;
-+            }
-+            do {
-+                if (ct) {
-+                    sprintf(Fname, "%s/%d-%s", tmproot, ct, slash);
-+                } else {
-+                    sprintf(Fname, "%s/%s", tmproot, slash);
-+                }
-+                ++ct;
-+            } while (access(Fname, F_OK) == 0);
-+            if (FileWriteOnly) {
-+                printf("\nThis message contains '%s`-format data.\n", ContentType);
-+            } else if (octetstream) {
-+                printf("\nThis message contains raw digital data,");
-+            } else {
-+                printf("\nThis message contains data in an unrecognized format, %s,", ContentType);
-+            }
-+            printf("\nwhich is being decoded and written to the file named \"%s\".\nIf you do not want this data, you probably should delete that file.\n", Fname);
-+        }
-+        if (Fname[0] == 0 || Fname[0] == '\n') {
-+            ConsumeRestOfPart(NULL);
-+        } else {
-+            fp = fopen(Fname, WRITE_BINARY);
-+            if (!fp) ExitWithError("Cannot open temporary file");
-+            TranslateInputToOutput(InputFP, fp, EncodingCode, ContentType);
-+            ecode = fclose(fp);
-+            if (ecode) {
-+                printf("Could not write file %s\n", Fname);
-+            } else {
-+                printf("Wrote file %s\n", Fname);
-+            }
-+        }
-+        if (!DefinitelyNotTty && MaybePageOutput && BoundaryCt > 0) PauseForUser();
-+        return(ecode);
-+    }
-+    return(-1); /* Unrecognized, really */
-+}
-+
-+ProcessArguments(argc, argv)
-+int argc;
-+char **argv;
-+{
-+  int i;
-+  char *SourceFileName = NULL;
-+
-+  initVarsFromEnvironment(); /* init global vars from environment */
-+
-+    for (i=1; i<argc; ++i) {
-+	if (argv[i][0] == '-') {
-+	    switch (argv[i][1]) {
-+		case '\0':
-+		    /* Not really necessary, but.... */
-+		    SourceFileName = NULL;
-+		    UsingStandardInput = 1;
-+		    break;
-+		case 'b':
-+		    Is822Format = 0;
-+		    break;
-+		case 'B':
-+		    DoInBackground = 1;
-+		    break;
-+                case 'c':
-+		    if (++i >= argc) usage();
-+		    ContentType = XMALLOC(char, 1+strlen(argv[i]));
-+                    strcpy(ContentType,argv[i]);
-+                    /* strip leading white space */
-+                    while (*ContentType && isspace((unsigned char) *ContentType)) ++ContentType;
-+                    StripTrailingSpace(ContentType);
-+                    ParseContentParameters(ContentType);
-+                    break;
-+                case 'd':
-+		    MightAskBeforeExecuting = 0;
-+		    break;
-+		case 'e':
-+		    EatLeadingNewlines = 1;
-+		    break;
-+		case 'E':
-+		    if (++i >= argc) usage();
-+		    ContentEncoding = argv[i];
-+		    break;
-+		case 'f':
-+		    if (++i >= argc) usage();
-+		    MailFrom = argv[i];
-+                    break;
-+                case 'h':
-+                    {
-+                    FILE *tmpfp;
-+                    PrintingMode = 1;
-+                    MightAskBeforeExecuting = 0;
-+		    //#ifdef AMIGA
-+		    //		    freopen("prt:", "w", stdout);
-+		    //#else
-+                    /* Want to make all of stdout go to printer, and this 
-+                      is easier than changing every output statement,
-+                      at least on UNIX... */
-+                    tmpfp = popen(LPRCOMMAND, "w");
-+                    if (!tmpfp) {
-+                        ExitWithError("Cannot execute lpr command");
-+                    }
-+                    fflush(stdout);
-+                    close(1);
-+                    dup2(fileno(tmpfp), 1);
-+		    //#endif
-+                    break;
-+                    }
-+		case 'm':
-+		    if (++i >= argc) usage();
-+		    MailerName = argv[i];
-+		    break;
-+		case 'p':
-+		    MaybePageOutput = 1;
-+		    break;
-+		case 'P':
-+                    MaybePageOutput = 1;
-+                    MustPageOutput = 1;
-+		    break;
-+		case 'r':
-+		    RunAsRootOK = 1;
-+                    break;
-+                case 'R':
-+#ifdef RESET_PROGRAM
-+                    system(RESET_PROGRAM);
-+                    if (DoDebug) printf("Executed reset\n");
-+#else
-+                    fprintf(stderr, "metamail warning: -R flag not supported on this system\n");
-+#endif
-+                    break;
-+		case 's':
-+		    if (++i >= argc) usage();
-+		    MailSubject = argv[i];
-+		    break;
-+                case 'T':
-+                    TransparentMode = 0;
-+                    break;
-+                case 'w':
-+                    JustWriteFiles = 1;
-+                    break;
-+                case 'q':
-+                    Quiet = 1;
-+		    PrintSomeHeaders = 0;
-+		    break;
-+		case 'x':
-+                    DefinitelyNotTty = 1;
-+                    MustNotBeTty = 1;
-+		    break;
-+                case 'y':
-+                    YankMode = 1;
-+                    break;
-+		case 'z':
-+		    DeleteSourceFileWhenDone = 1;
-+		    break;
-+		default:
-+		    usage();
-+	    }
-+	} else {
-+	    if (SourceFileName) {
-+                QueueNextFile(argv[i]);
-+	    } else {
-+		SourceFileName = argv[i];
-+	    }
-+	}
-+    }
-+    if (TransparentMode) {
-+        RunInNewWindow(argv, argc, &SourceFileName);
-+    }
-+    if (MaybePageOutput && DoInBackground) {
-+	MustNotBeTty = 1;
-+        /*fprintf(stderr, "metamail: -B is incompatible with -p, -P, and MM_USEPAGER\n");
-+        usage(); */
-+    }
-+    if (!Is822Format && !ContentType) {
-+	fprintf(stderr, "metamail:  -b requires -c.\n");
-+	usage();
-+    }
-+    if (DeleteSourceFileWhenDone && !SourceFileName) {
-+	fprintf(stderr, "metamail:  -z requires -f.\n");
-+	usage();
-+    }
-+    if (!RunAsRootOK && (getuid() == 0 || geteuid() == 0)) {
-+	fprintf(stderr, "You can not run MetaMail as root unless you use -r or set MM_RUNASROOT.\n");
-+	usage();
-+    }
-+    if (SourceFileName) {
-+        InputFP = fopen(SourceFileName, "r");
-+        if (DoDebug) printf("Trying to open input file: %s\n", SourceFileName);
-+        if (!InputFP) ExitWithError("Can't read input file");
-+        if (DeleteSourceFileWhenDone) {
-+            strcpy(fileToDelete, SourceFileName);
-+        }
-+    } else {  /* input on stdin */
-+        UsingStandardInput = 1;
-+        if (MustNotBeTty) {
-+            InputFP = stdin;
-+/*            MaybePageOutput = 1; */ /* This messed up safe-tcl -- nsb 9/21/93 */
-+            MightAskBeforeExecuting = 0;
-+        } else {
-+            int newfd = dup(0);
-+            FILE *newfp;
-+            if (newfd > 0) {
-+                InputFP = fdopen(newfd, "r");
-+                if (InputFP 
-+                     && ((newfp = fopen("/dev/tty", "r")) != NULL)
-+                     && !dup2(fileno(newfp), 0)) {
-+                    DefinitelyNotTty = 0;
-+                } else {
-+                    InputFP = stdin;
-+                    DefinitelyNotTty = 1;
-+                    MaybePageOutput = 0;
-+                }
-+            }
-+        }
-+    }
-+    if (DefinitelyNotTty && MaybePageOutput) {
-+        RunInNewWindow(argv, argc, &SourceFileName);
-+    }
-+    if (DefinitelyNotTty) {
-+        MaybePageOutput = 0;	/* Disable pager if I/O has been redirected */
-+    }
-+    return(0);
-+}
-+
-+usage() {
-+    fprintf(stderr, "Usage:  metamail [-b] [-B] [-d] [-e] [-h] [-r] [-R] [-p]  [-P] [-x] [-y] [-z] [-c content-type] [-E content-transfer-encoding] [-f from-name] [-m mailername] [-s subject] [message-file-name]\n");
-+    ExitWithError(NULL);
-+}
-+
-+RunInNewWindow(argv, argc, SourceFileNamePtr)
-+char **argv, **SourceFileNamePtr;
-+int argc;
-+{
-+    char *FullCmd, TmpName[TMPNAME_MAX];
-+    int i, createdfile=0;
-+    if (!*SourceFileNamePtr) {
-+        char *LineBuf;
-+        FILE *fptmp;
-+
-+        LineBuf = XMALLOC(char, LINE_BUF_SIZE);
-+        /* Create it, ugh.  Also needs to affect later command. */
-+        MkTmpFileName(TmpName);
-+	DelTmpFileName(TmpName);
-+        DeleteSourceFileWhenDone = 1;
-+        fptmp = fopen(TmpName, WRITE_BINARY);
-+        if (!fptmp) ExitWithError("Can't open temporary file\n");
-+        while (fgets(LineBuf, LINE_BUF_SIZE, stdin)) {
-+            fputs(LineBuf, fptmp);
-+        }
-+        XFREE(LineBuf);
-+        fclose(fptmp);
-+        *SourceFileNamePtr = TmpName;
-+        createdfile = 1;
-+    }
-+    FullCmd = XMALLOC(char, CMDSIZE);
-+    if (TransparentMode) {
-+        /* In transparent mode, we want to produce stdout that is what we get in, and do EVERYTHING externally in a terminal window.  This is to make the truly brain-dead mailers like mailtool happy. I am NOT happy about having to do this.  */
-+        /* So, first we copy everything to stdout */
-+        sprintf(FullCmd, CATTEMPLATE, *SourceFileNamePtr);
-+        system(FullCmd); /* Cheesy way to do it */
-+        fflush(stdout); fflush(stderr);
-+    }
-+    /* Then we run ourselves in a terminal window */
-+    MailSummary = "Metamail"; /* for window label */
-+    CreateNewWindowPrefix(FullCmd);
-+    strcat(FullCmd, METAMAIL);
-+    strcat(FullCmd, " -P ");
-+    if (TransparentMode) strcat(FullCmd, "-T ");
-+    for (i=1; i<argc; ++i) {
-+        if (strncmp(argv[i], "-x", 2)
-+             && strncmp(argv[i], "-B", 2)
-+             && strncmp(argv[i], "-d", 2)) {
-+            strcat(FullCmd, "\"");
-+            strcat(FullCmd, argv[i]);
-+            strcat(FullCmd, "\" ");
-+        }
-+    }
-+    if (createdfile) {
-+        strcat(FullCmd, "-z ");
-+        strcat(FullCmd, *SourceFileNamePtr);
-+    }
-+    if (!MightAskBeforeExecuting) {
-+        strcat(FullCmd, " -d ");
-+        /* The special hack for -d is HORRIBLE, but xterm screws up with the -d option in the middle of the command line! */
-+    }
-+    if (DoInBackground) strcat(FullCmd, " &");
-+    DefinitelyNotTty = 0;
-+    SetUpEnvironment();
-+    if (DoDebug) fprintf(stderr, "Executing %s\n", FullCmd);
-+    fflush(stdout); fflush(stderr);
-+    exit(system(FullCmd));
-+}
-+
-+
-+static char *ThingsToSkip[] = {
-+    "csh ",
-+    "sh ",
-+    "ksh ",
-+    NULL
-+};
-+
-+char *ShortCommand(progname)
-+char *progname;
-+{
-+    int i;
-+    char *s, *oldprogname;
-+    static char FullProgName[500];
-+
-+eatmore:
-+    while (*progname && (*progname == '(' || isspace((unsigned char) *progname))) {
-+        ++progname;
-+    }
-+    oldprogname = progname;
-+    for (i = 0; oldprogname == progname && ThingsToSkip[i]; ++i) {
-+        if (!strncmp(progname, ThingsToSkip[i], strlen(ThingsToSkip[i]))) {
-+            progname += strlen(ThingsToSkip[i]);
-+        }
-+    }
-+    if (*progname == '-') {
-+        ++progname;
-+        while (*progname && !isspace((unsigned char) *progname)) ++progname;
-+    }
-+    if (progname != oldprogname) goto eatmore;
-+    strcpy(FullProgName, progname);
-+    s = index(FullProgName, ' ');
-+    if (s) *s = 0;
-+    s = rindex(FullProgName, '/');
-+    if (s) {
-+	return(s+1);
-+    } else {
-+	return(FullProgName);
-+    }
-+}    
-+
-+TryMailcapEntry(mc, SquirrelFile)
-+struct MailcapEntry mc;
-+char *SquirrelFile;
-+{
-+    StripTrailingSpace(mc.contenttype);
-+    if (DoDebug) fprintf(stderr, "Trying mailcap entry for '%s'.\n", mc.contenttype);
-+    if (PrintingMode && !mc.printcommand) return(-1);
-+    if (CtypeMatch(ContentType, mc.contenttype) && PassesTest(&mc)) {
-+        if (SquirrelFile) {
-+            return(SaveSquirrelFile(SquirrelFile));
-+        } else {
-+            char TmpFileName[TMPNAME_MAX];
-+            MkTmpFileName(TmpFileName);
-+            return(ExecuteMailcapEntry(mc, TmpFileName, ContentType));
-+        }
-+    }
-+    if (mc.needtofree) {
-+        XFREE(mc.contenttype);
-+        XFREE(mc.command);
-+    }
-+    return(-1);
-+}
-+
-+SaveSquirrelFile(SquirrelFile)
-+char *SquirrelFile;
-+{
-+    int j;
-+    FILE *outfp;
-+
-+    if (DoDebug) printf("saving to file %s\n", SquirrelFile);
-+
-+    outfp = fopen(SquirrelFile, WRITE_BINARY);
-+    if (!outfp) {
-+        fprintf(stderr, "Cannot open %s to squirrel away a portion of a multipart/alternative\n", SquirrelFile);
-+        return(-1);
-+    }
-+    fprintf(outfp, "Content-type: %s", ContentType);
-+    for (j=0; j<CParamsUsed; ++j) {
-+        fprintf(outfp, " ; ");
-+        fprintf(outfp, "%s", CParams[j]);
-+        fprintf(outfp, " = ");
-+        fprintf(outfp, "%s", CParamValues[j]);
-+    }
-+    fprintf(outfp, "\n\n"); 
-+    TranslateInputToOutput(InputFP, outfp, EncodingCode, ContentType);
-+    if (fclose(outfp)) {
-+        ExitWithError("fclose failed");
-+    }
-+    return(0);
-+}
-+
-+ExecuteMailcapEntry(mc, TmpFileName, ThisContentType)
-+char *TmpFileName, *ThisContentType;
-+struct MailcapEntry mc;
-+{
-+    int resultcode=0, DidExecute, UsedTmpFileName;
-+    struct part *PartsWritten=NULL;
-+    char *s, *cmd;
-+
-+    cmd = XMALLOC(char, CMDSIZE);
-+    if (PrintingMode && !mc.printcommand) return(-1);
-+    BuildCommand(cmd, PrintingMode ? mc.printcommand : mc.command, TmpFileName, &UsedTmpFileName, &PartsWritten);
-+    if (DoDebug) fprintf(stderr, "Match!  Built command %s.\n", cmd);
-+    if (mc.copiousoutput && MaybePageOutput) {
-+        strcat(cmd, " | ");
-+        s = getenv("METAMAIL_PAGER");
-+        if (s && strncmp(s, "metamail", 8)) {
-+            /* If METAMAIL_PAGER is set to "metamail" we override it */
-+            strcat(cmd, s);
-+            if (!strncmp(s, "less", 4) && strncmp(s+5, "-r", 2)) {
-+                fprintf(stderr, "Warning:  'less' without '-r' behaves badly for some mail types,\n\tnotably richtext.\n");
-+            }
-+        } else {
-+            strcat(cmd, "more");
-+        }
-+    }
-+    if (!DefinitelyNotTty) {
-+        SaveTtyState();
-+    }
-+    if (!NeedToAskBeforeExecuting(ThisContentType)
-+         || OKToRun(ThisContentType, cmd, mc.label)) {
-+        char *FullCmd;
-+        int ReallyNotTty;
-+	//#ifndef NO_RLIMITS
-+        /* Limit size of core dumps */
-+        //struct rlimit rlp;
-+
-+        //rlp.rlim_cur = 0;
-+        //rlp.rlim_max = 0;
-+        //setrlimit(RLIMIT_CORE, &rlp); 
-+	//#endif
-+        FullCmd = XMALLOC(char, CMDSIZE);
-+        ReallyNotTty = DefinitelyNotTty;
-+        if (mc.needsterminal
-+             && DefinitelyNotTty) {
-+            int j;
-+            sprintf(cmd, " %s -P -b -c '%s", METAMAIL, ThisContentType);
-+            for (j=0; j<CParamsUsed; ++j) {
-+                strcat(cmd, " ; ");
-+                strcatquoting(cmd, CParams[j]);
-+                strcat(cmd, " = ");
-+                strcatquoting(cmd, CParamValues[j]);
-+            }
-+            strcat(cmd, "' ");
-+            strcat(cmd, TmpFileName);
-+            CreateNewWindowPrefix(FullCmd);
-+            strcat(FullCmd, cmd);
-+            DefinitelyNotTty = 0; /* For recursive call */
-+        } else {
-+            strcpy(FullCmd, cmd);
-+        }
-+        DidExecute = 0;
-+        if (UsedTmpFileName || PartsWritten) {
-+            int isempty;
-+            if (PartsWritten) {
-+                isempty = 0;
-+            } else {
-+                isempty = WriteTmpFile(TmpFileName, ThisContentType);
-+            }
-+            if (!isempty || strncmp(ThisContentType, "text", 4)) {
-+                if (DoInBackground && !PartsWritten && !mc.needsterminal) {
-+                    char TmpCmd[CMDSIZE];
-+                    sprintf(TmpCmd, "(%s; rm %s) &", FullCmd, TmpFileName);
-+                    DefinitelyNotTty = 1; /* in background */
-+                    SetUpEnvironment();
-+                    resultcode = ExecuteCommand(TmpCmd, 1);
-+		    DelTmpFileName(TmpFileName); /* an rm ... was already added
-+						    to the executing cmd */
-+                    ++DidExecute;
-+                } else {
-+                    SetUpEnvironment();
-+                    resultcode = ExecuteCommand(FullCmd, 1);
-+                    RmTmpFileName(TmpFileName);
-+                    ++DidExecute;
-+                }
-+            } else { /* empty text part, hack to not say "more" */
-+                RmTmpFileName(TmpFileName);
-+            }
-+        } else {
-+            FILE *tmpfp;
-+            SetUpEnvironment();
-+            (void) ExecuteCommand(FullCmd, 0);
-+            tmpfp = popen(FullCmd, WRITE_BINARY);
-+            TranslateInputToOutput(InputFP, tmpfp, EncodingCode, ThisContentType);
-+            resultcode = tmpfp ? pclose(tmpfp) : -1;
-+            ++DidExecute;
-+        }
-+        DefinitelyNotTty = ReallyNotTty;
-+        if (!DefinitelyNotTty && DidExecute) {
-+            RestoreTtyState();
-+            if (mc.copiousoutput && MaybePageOutput && BoundaryCt > 0) PauseForUser();
-+        }
-+        if (!resultcode) {
-+            XFREE(FullCmd);
-+        } else {
-+            fprintf(stderr, "Command failed: %s\n", FullCmd);
-+            if (MaybePageOutput && BoundaryCt > 0) PauseForUser();
-+            ++ProcessingErrors;
-+        }
-+    } else {
-+        /* user does not want to execute command */
-+        if (!DefinitelyNotTty) {
-+            RestoreTtyState();
-+        }
-+        if (DoDebug) fprintf(stderr, "Not executing command.\n");
-+        if (!PartsWritten) ConsumeRestOfPart(NULL);
-+    }
-+    if (PartsWritten) {
-+        struct part *tp;
-+        char HeadFile[NAME_MAX];
-+
-+        while (PartsWritten) {
-+            tp=PartsWritten->next;
-+            XFREE(PartsWritten->ctype);
-+            strcpy(HeadFile, PartsWritten->fname);
-+            strcat(HeadFile, "H");
-+            RmTmpFileName(HeadFile);
-+            RmTmpFileName(PartsWritten->fname);
-+            XFREE(PartsWritten->fname);
-+            XFREE(PartsWritten);
-+            PartsWritten=tp;
-+        }
-+    }
-+    if (!DefinitelyNotTty) {
-+        RestoreTtyState();
-+    }
-+    XFREE(cmd);
-+    return(0);
-+}
-+
-+PassesTest(mc)
-+struct MailcapEntry *mc;
-+{
-+    int result;
-+    char *cmd, TmpFileName[TMPNAME_MAX];
-+
-+    if (!mc->testcommand) return(1);
-+    MkTmpFileName(TmpFileName);
-+    cmd = XMALLOC(char, CMDSIZE);
-+    BuildCommand(cmd, mc->testcommand, TmpFileName, NULL, NULL);
-+    if (DoDebug) printf("Executing test command: %s\n", cmd);
-+    result = system(cmd);
-+    XFREE(cmd);
-+    return(!result);
-+}
-+
-+char *
-+GetCommand(s, t)
-+char *s, **t;
-+{
-+    char *s2;
-+    int quoted = 0;
-+    s2 = XMALLOC(char, strlen(s)*2+1); /* absolute max, if all % signs */
-+    *t = s2;
-+    while (s && *s) {
-+	if (quoted) {
-+            if (*s == '%') *s2++ = '%'; /* Quote through next level, ugh! */
-+
-+            *s2++ = *s++;
-+	    quoted = 0;
-+	} else {
-+	    if (*s == ';') {
-+                *s2 = 0;
-+		return(++s);
-+	    }
-+	    if (*s == '\\') {
-+		quoted = 1;
-+		++s;
-+	    } else {
-+		*s2++ = *s++;
-+	    }
-+	}
-+    }
-+    *s2 = 0;
-+    return(NULL);
-+}	
-+
-+GetMailcapEntry(fp, mc)
-+FILE *fp;
-+struct MailcapEntry *mc;
-+{
-+    int rawentryalloc = 2000, len;
-+    char *rawentry, *s, *t, *LineBuf;
-+
-+    LineBuf = XMALLOC(char, LINE_BUF_SIZE);
-+    rawentry = XMALLOC(char, 1 + rawentryalloc);
-+    *rawentry = 0;
-+    while (fgets(LineBuf, LINE_BUF_SIZE, fp)) {
-+	if (LineBuf[0] == '#') continue;
-+        len = strlen(LineBuf);
-+        if (len == 0) continue;
-+        if (LineBuf[len-1] == '\n') LineBuf[--len] = 0;
-+	if ((len + strlen(rawentry)) > rawentryalloc) {
-+	    rawentryalloc += 2000;
-+	    rawentry = realloc(rawentry, rawentryalloc+1);
-+	}
-+	if (LineBuf[len-1] == '\\') {
-+            LineBuf[len-1] = 0;
-+	    strcat(rawentry, LineBuf);
-+	} else {
-+	    strcat(rawentry, LineBuf);
-+	    break;
-+	}
-+    }
-+    XFREE(LineBuf);
-+    for (s=rawentry; *s && isspace((unsigned char) *s); ++s) ;
-+    if (!*s) {
-+	/* totally blank entry -- quietly ignore */
-+	XFREE(rawentry);
-+	return(0);
-+    }
-+    s = index(rawentry, ';');
-+    if (!s) {
-+	fprintf(stderr, "metamail: Ignoring invalid mailcap entry: %s\n", rawentry);
-+	XFREE(rawentry);
-+	return(0);
-+    }
-+    *s++ = 0;
-+    mc->needsterminal = 0;
-+    mc->copiousoutput = 0;
-+    mc->needtofree = 1;
-+    mc->testcommand = NULL;
-+    mc->label = NULL;
-+    mc->printcommand = NULL;
-+    mc->contenttype = XMALLOC(char, 1+strlen(rawentry));
-+    strcpy(mc->contenttype, rawentry);
-+    t = GetCommand(s, &mc->command);
-+    if (!t) {
-+        XFREE(rawentry);
-+        return(1);
-+    }
-+    while (s && *s && isspace((unsigned char) *s)) ++s;
-+    s = t;
-+    while (s) {
-+	char *arg, *eq;
-+
-+        t = GetCommand(s, &arg);
-+/*        if (t) *t++ = 0; */
-+        eq = index(arg, '=');
-+        if (eq) *eq++ = 0;
-+	if (*arg) {
-+	    arg = Cleanse(arg);
-+	    if (!strcmp(arg, "needsterminal")) {
-+		mc->needsterminal = 1;
-+	    } else if (!strcmp(arg, "copiousoutput")) {
-+		mc->copiousoutput = 1;
-+	    } else if (eq && !strcmp(arg, "test")) {
-+		mc->testcommand = eq;
-+	    } else if (eq && !strcmp(arg, "description")) {
-+		mc->label = eq;
-+	    } else if (eq && !strcmp(arg, "label")) { 
-+		mc->label = eq; /* bogus old name for description */
-+	    } else if (eq && !strcmp(arg, "print")) {
-+		mc->printcommand = eq;
-+	    } else if (eq && !strcmp(arg, "textualnewlines")) {
-+		ExceptionalNewline(mc->contenttype, atoi(eq));
-+	    } else if (strcmp(arg, "notes")) { /* IGNORE notes field */
-+		if (*arg && DoDebug) fprintf(stderr, "metamail: Ignoring mailcap flag: %s\n", arg);
-+	    }
-+	}
-+	s = t;
-+    }
-+    XFREE(rawentry);
-+    return(1);
-+}
-+
-+ExitWithError(txt)
-+char *txt;
-+{
-+    if (txt) fprintf(stderr, "metamail: %s\n", txt);
-+    exit(-1);
-+}
-+
-+char *
-+FreshHeaderCopy(s)
-+char *s;
-+{
-+    char *t, *newcopy;
-+    int len;
-+
-+    while (s && *s && isspace((unsigned char) *s) && *s != '\n') ++s;
-+    t = index(s, '\n');
-+    while (t && (*(t+1) == ' ' || *(t+1) == '\t')) {
-+        t = index(t+1, '\n');
-+    }
-+    len = t ? (t-s+1) : (strlen(s)+1);
-+    newcopy = XMALLOC(char, len+3); /* two extra bytes for a bizarre bug caused
-+                                       by the fact that FindParam calls
-+				       FreshHeaderCopy and sometimes tacks on
-+				       "--".
-+				    */
-+    strncpy(newcopy, s, len);
-+    newcopy[len] = 0;
-+    return(newcopy);
-+}
-+
-+Read822Prefix(PrintHeads, nestingdepth)
-+int PrintHeads, nestingdepth;
-+{
-+    int SawNewline = 1, bytes = 0, alloced = 1000, HasEncodedChars=0;
-+    int c, oldbytes;
-+    char *s, *t, *tmp;
-+
-+    if (!PrintSomeHeaders) PrintHeads = 0;
-+    mailheaders = XMALLOC(char, alloced+1);
-+    strcpy(mailheaders, "MM_HEADERS=\n");
-+    bytes = 12;
-+yankagain:
-+    t = mailheaders + bytes;
-+    oldbytes = bytes-1; /* a hack for YankMode */
-+    while ((c = getc(InputFP)) != EOF) {
-+        if (++bytes >= alloced) {
-+            alloced += 1000;
-+            mailheaders = realloc(mailheaders, alloced);
-+            t = mailheaders + bytes - 1;
-+        }
-+        if (c == '\n') {
-+            if (SawNewline) break;
-+            SawNewline = 1;
-+        } else SawNewline = 0;
-+        *t++ = c;
-+    }
-+    *t = 0;
-+    --bytes;
-+    if (c == EOF) {
-+	if (nestingdepth) {
-+	    fprintf(stderr, "metamail: Incomplete multipart message -- unexpected EOF\n");
-+/*            exit(ProcessingErrors); */
-+        } else {
-+            if (YankMode) {
-+/*                ExitWithError("Could not extract a MIME message from the  body\n"); */
-+		fprintf(stderr, "metamail: Could not extract a MIME message from the body\n");
-+            } else {
-+		fprintf(stderr, "metamail: Could not find end of mail headers.\n");
-+/*                ExitWithError("Could not find end of mail headers"); */
-+            }
-+	}
-+	BoundaryCt=0;
-+	return -1;
-+    }
-+    for (s=mailheaders+oldbytes; *s; ++s) {
-+        if (*s == '\n' && (*(s+1) != ' ') && (*(s+1) != '\t')) {
-+	    if (!ContentType && !lc2strncmp(s, "\ncontent-type:", 14)) {
-+		char *dum;
-+                ContentType = FreshHeaderCopy(s+14);
-+		/* Eliminate white space embedded in content-type */
-+		while (1) {
-+		    dum = index(ContentType, '/');
-+		    if (!dum) break;
-+		    if (isspace(*(dum-1))) {
-+			for (--dum; *dum; ++dum) {
-+			    *dum = *(dum+1);
-+			}
-+		    } else if (isspace(*++dum)) {
-+			for ( ; *dum; ++dum) {
-+			    *dum = *(dum+1);
-+			}
-+		    } else {
-+			break;
-+		    }
-+		}
-+                StripTrailingSpace(ContentType);
-+                ParseContentParameters(ContentType);
-+                if (PrintHeads) maybephead(s+1);
-+            } else if (!ContentEncoding && !lc2strncmp(s, "\ncontent-transfer-encoding:", 27)) {
-+                ContentEncoding = FreshHeaderCopy(s+27);
-+                if (PrintHeads) maybephead(s+1);
-+            } else if (!lc2strncmp(s, "\nsubject:", 9)) {
-+                if (PrintHeads) maybephead(s+1);
-+                MailSubject = FreshHeaderCopy(s+9);
-+            } else if (!lc2strncmp(s, "\nfrom:", 6)) {
-+                if (PrintHeads) maybephead(s+1);
-+                MailFrom = FreshHeaderCopy(s+6);
-+            } else if (!lc2strncmp(s, "\ncontent-description:", 4)) {
-+                if(PrintHeads) maybephead(s+1);
-+                MailSubject = FreshHeaderCopy(s+21);
-+            } else {
-+                /* Print any with encoded variables */
-+                char *dum = s;
-+                while (dum) {
-+                    dum = index(dum, '?');
-+                    if (dum && *++dum == '=') break;
-+                }
-+                if (dum) {
-+                    char *nl = s+1;
-+                    while (nl) {
-+                        nl = index(nl, '\n');
-+                        if (nl && !isspace((unsigned char) *++nl)) break;
-+                    }
-+                    if (nl && nl > dum) ++HasEncodedChars;
-+                }
-+                if (HasEncodedChars) {
-+                    phead(s+1);
-+                } else if (PrintHeads) {
-+                    maybephead(s+1);
-+                }
-+            }
-+        }
-+    }
-+    /* Ugly, but effective */
-+    if (YankMode && !ContentType) {
-+        goto yankagain;
-+    }
-+    if (PrintHeads) printf("\n");
-+    if (!ContentType) {
-+        ContentType = "text/plain";
-+        CParamsUsed=0;
-+    }
-+    for (tmp=ContentType; *tmp; ++tmp) {
-+        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+    }
-+    return 0;
-+}
-+
-+PrepareMessage() {
-+    int c;
-+
-+    EncodingCode = ENCODING_NONE;
-+    if (ContentEncoding) {
-+        /* strip leading white space */
-+        while (*ContentEncoding && isspace((unsigned char) *ContentEncoding)) ++ContentEncoding;
-+        StripTrailingSpace(ContentEncoding);
-+        if (!lc2strcmp(ContentEncoding, "base64")) {
-+            EncodingCode = ENCODING_BASE64;
-+        } else if (!lc2strcmp(ContentEncoding, "quoted-printable")) {
-+            EncodingCode = ENCODING_QUOTEDPRINTABLE;
-+        } else if (!lc2strncmp (ContentEncoding, "x-uue", 5)) {
-+            fprintf (stderr, "WARNING:  Using nonstandard %s encoding, trying uuencode algorithm.\n", ContentEncoding);
-+ 	    EncodingCode = ENCODING_UUENCODE;
-+        } else {
-+            if (lc2strcmp(ContentEncoding, "none")
-+                 && !lc2strcmp(ContentEncoding, "8bit")
-+                 && !lc2strcmp(ContentEncoding, "7bit")) {
-+                fprintf(stderr, "Ignoring unrecognized Content-Transfer-Encoding value: %s\n", ContentEncoding);
-+            }
-+        }
-+    }
-+    if (EatLeadingNewlines) {
-+        while ((c = getc(InputFP)) != EOF) {
-+            if (c != '\n') {
-+                ungetc(c, InputFP);
-+                break;
-+            }
-+        }
-+    }
-+    SetUpEnvironment();  
-+}
-+
-+SetUpEnvironment() { 
-+    int i, j, environsize;
-+    char **newenviron, *mailervar, *summaryvar, *ctypevar, *s;
-+    static char ttyenv[15], debugenv[15], *noaskenv, pagerenv[15], *quietenv, rootenv[25];
-+
-+    /* Hack to make the code look similar for unix & dos */
-+#define putenv(var)        newenviron[i++] = var;
-+    for (environsize=0; environ[environsize]; ++environsize) {
-+	;
-+    }
-+    newenviron = XMALLOC(char *, 17+environsize);
-+    mailervar = XMALLOC(char, 13+strlen(MailerName));
-+    sprintf(mailervar, "MM_MAILER=%s", MailerName);
-+    summaryvar = XMALLOC(char, 26 + strlen(MailFrom) + strlen(MailSubject));
-+    sprintf(summaryvar, "MM_SUMMARY=%s (from %s)", MailSubject, MailFrom);
-+    MailSummary = summaryvar+11;
-+    EliminateNastyChars(MailSummary);
-+    i = 0;
-+    if (ContentType) {
-+        int ctypelen = 22+strlen(ContentType);
-+        for (j=0; j<CParamsUsed; ++j) {
-+            ctypelen += 6 + strlen(CParams[j]) + strlen(CParamValues[j]);
-+        }
-+        ctypevar = XMALLOC(char, ctypelen);
-+        for (s=ContentType; *s; ++s) {
-+            if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
-+        }
-+        while (isspace((unsigned char) *--s)) *s = 0;
-+        sprintf(ctypevar, "MM_CONTENTTYPE=%s", ContentType);
-+        for (j=0; j<CParamsUsed; ++j) {
-+            strcat(ctypevar, " ; ");
-+            strcat(ctypevar, CParams[j]);
-+            strcat(ctypevar, " = ");
-+            strcat(ctypevar, CParamValues[j]);
-+        }
-+        putenv(ctypevar);
-+    }
-+    putenv(mailheaders ? mailheaders : "MM_HEADERS=unknown");
-+    putenv(mailervar);
-+    putenv(summaryvar);
-+    sprintf(ttyenv, "MM_NOTTTY=%d", DefinitelyNotTty);
-+    putenv(ttyenv);
-+    sprintf(debugenv, "MM_DEBUG=%d", DoDebug);
-+    putenv(debugenv);
-+    s = getenv("MM_QUIET");
-+    if (!s) s = QuietDefault;
-+    quietenv = XMALLOC(char, 15 + strlen(s));
-+    if (Quiet) {
-+        strcpy(quietenv, "MM_QUIET=1");
-+    } else {
-+        sprintf(quietenv, "MM_QUIET=%s", s);
-+    }
-+    putenv(quietenv);
-+    s = getenv("MM_NOASK");
-+    if (!s) s = NoAskDefault;
-+    noaskenv = XMALLOC(char, 15 + strlen(s));
-+    if (MightAskBeforeExecuting) {
-+        sprintf(noaskenv, "MM_NOASK=%s", s);
-+    } else {
-+        strcpy(noaskenv, "MM_NOASK=1");
-+    }
-+    putenv(noaskenv);
-+    s = getenv("MM_RUNASROOT");
-+    if (!s) s = "0";
-+    sprintf(rootenv, "MM_RUNASROOT=%s", s);
-+    putenv(rootenv);
-+    sprintf(pagerenv, "MM_USEPAGER=%d", MaybePageOutput);
-+    putenv(pagerenv);
-+    for (j=0; j<environsize; ++j) {
-+        if (strncmp(environ[j], "MM_", 3) || !strncmp(environ[j], "MM_CHARSET", 10)) {
-+            putenv(environ[j]);
-+        }
-+    }
-+    newenviron[i] = NULL;
-+    environ = newenviron;
-+    if (DoDebug) {
-+        printf("Here is the environment:\n\n");
-+        system("printenv");
-+    }
-+}
-+
-+
-+OKToRun(ctype, progname, label)
-+char *ctype, *progname, *label;
-+{
-+    char AnsBuf[100], *s;
-+
-+    if (DoInBackground) return(1);
-+    if (DefinitelyNotTty || MustNotBeTty) return(1);
-+    while (1) {
-+        printf("\n");
-+        if (label) {
-+            printf("This message contains %s.\nDo you want to view it using the '%s' command (y/n) [y] ? ", label, ShortCommand(progname));
-+        } else {
-+            printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
-+        }
-+        s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-+        if (!s) return(0); /* EOF */
-+	while (s && *s && isspace((unsigned char) *s)) ++s;
-+	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
-+	if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
-+	    return(0);
-+	}
-+	printf("Please answer yes or no.\n");
-+    }
-+}
-+
-+EliminateNastyChars(s)
-+char *s;
-+{
-+    if (s) for( ; *s ;++s) {
-+        if (isalnum((unsigned char) *s)) continue;
-+	if (index(" ,.;:/?\\|[]{}()*&^%#@-_=+~<>\"", *s)) continue;
-+	if (*s == '\'' || *s == '`') {
-+	    *s = '"';
-+	} else {
-+	    *s = ' ';
-+	}
-+    }
-+}
-+
-+StripTrailingSpace(s)
-+char *s;
-+{
-+    char *t = s+strlen(s) -1;
-+    while (isspace((unsigned char) *t) && (t >= s)) *t-- = 0;
-+}
-+
-+static char *KeyHeads=NULL;
-+static char **KeyHeadList;
-+static int KeyKeep = 0;
-+
-+void setKeyHeads()
-+{
-+    char *s;
-+    int numkeys = 0;
-+
-+    if ((KeyHeads = getenv("KEYHEADS")) != 0) {
-+        for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
-+    } else if ((KeyHeads = getenv("KEYIGNHEADS")) != 0) {
-+	for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
-+	KeyKeep = 1;
-+    } else {
-+	static char khtmp[] = "to:cc:subject:from:content-description:date";
-+	KeyHeads = khtmp;
-+    }
-+    for (s=KeyHeads; *s; ++s) if (*s == ':') ++numkeys;
-+    numkeys += 2;
-+    KeyHeadList = XMALLOC(char *, numkeys);
-+    numkeys = 0;
-+    KeyHeadList[0] = KeyHeads;
-+    for(s=KeyHeads; *s; ++s) {
-+	if (*s == ':') {
-+	    *s = '\0';
-+	    KeyHeadList[++numkeys] = s+1;
-+	}
-+    }
-+    KeyHeadList[++numkeys] = NULL;
-+}
-+
-+/* find the first colon in a header line which appears before any spaces or control characters */
-+char *
-+findcolon(hdr)
-+char *hdr;
-+{
-+    while (*hdr && !isspace(*hdr) && !iscntrl(*hdr))
-+	if (*hdr == ':') return hdr;
-+	else hdr++;
-+    return 0;
-+}
-+
-+/* check the header given to see if it matches any in the KeyHeadList */
-+maybephead(hdr)
-+char *hdr;
-+{
-+    char *s;
-+    int numkeys=0;
-+
-+    if (!KeyHeads) setKeyHeads();
-+
-+    s = findcolon(hdr);
-+    if (s) {
-+	int len = s - hdr;
-+        for (numkeys=0; KeyHeadList[numkeys]; ++numkeys) {
-+            if (!strcmp(KeyHeadList[numkeys], "*")
-+                 || !lc2strncmp(hdr, KeyHeadList[numkeys], len)) {
-+		if (!KeyKeep) phead(hdr);
-+		return;
-+            }
-+        }
-+	if (KeyKeep) phead(hdr);
-+	return;
-+    }
-+    if (!strncmp(hdr, "From ", 5) || !strncmp(hdr, ">From ", 6)) {
-+	for (numkeys = 0; KeyHeadList[numkeys]; ++numkeys) {
-+	    if (!strcmp(KeyHeadList[numkeys], "*")
-+		 || !lc2strncmp(">from", KeyHeadList[numkeys], 5)) {
-+		if (!KeyKeep) phead(hdr);
-+		return;
-+	    }
-+	}
-+	if (KeyKeep) phead(hdr);
-+    }
-+}
-+
-+/* This next routine prints out a mail header, and needs to deal with the new extended charset headers. */
-+phead(s)
-+char *s;
-+{
-+    char *t = s;
-+
-+    while (1) {
-+	t = index(t, '\n');
-+	if (!t) break;
-+        if (!isspace((unsigned char) *(t+1))) {
-+            *t = 0;
-+	    break;
-+	} else ++t;
-+    }
-+    PrintHeader(s, 1);
-+    printf("\n");
-+    if (t) *t = '\n';
-+}
-+
-+static char PrevCharset[100] = "us-ascii";
-+
-+/* This is the part that actually handles the charset issues */
-+void PrintHeader(s, ShowLeadingWhitespace)
-+char *s;
-+int ShowLeadingWhitespace;
-+{
-+    char *charset, *encoding, *txt, *txtend, TmpFile[TMPNAME_MAX];
-+    int ecode = ENCODING_NONE, CorrectedCharset = 0;
-+    FILE *fp;
-+
-+    while (*s && (*s != '=')) {
-+        if (isspace((unsigned char) *s)) {
-+            if (ShowLeadingWhitespace) {
-+                putchar(' ');
-+            }
-+        } else {
-+            putchar(*s);
-+            if (!CorrectedCharset) {
-+                CorrectedCharset = 1;
-+                strcpy(PrevCharset, "us-ascii");
-+            }
-+        }
-+        if (!ShowLeadingWhitespace) {
-+            /* Only at most one leading space is ignored */
-+            ShowLeadingWhitespace = 1;
-+        }
-+        ++s;
-+    }
-+    if (!*s) return;
-+    if (*(s+1) != '?') {
-+        putchar('=');
-+        PrintHeader(++s, 1);
-+        return;
-+    }
-+    charset = s+2;
-+    encoding = index(charset, '?');
-+    if (!encoding) {
-+        putchar('=');
-+        PrintHeader(++s,1);
-+        return;
-+    }
-+    txt = index(encoding+1, '?');
-+    if (!txt) {
-+        putchar('=');
-+        PrintHeader(++s, 1);
-+        return;
-+    }
-+    txtend = txt;
-+    do {
-+        txtend = index(txtend+1, '?');
-+    } while(txtend && (*(txtend+1) != '='));
-+    if (!txtend) {
-+        putchar('=');
-+        PrintHeader(++s, 1);
-+    }
-+    /* Proper parse! Ready to dissect... */
-+    *encoding = 0;
-+    *txt = 0;
-+    *txtend = 0;
-+    if ((*(encoding+1) == 'q') || (*(encoding+1) == 'Q')) {
-+        ecode = ENCODING_QUOTEDPRINTABLE;
-+    } else if ((*(encoding+1) == 'b') || (*(encoding+1) == 'B')) {
-+        ecode = ENCODING_BASE64;
-+    } else {
-+        fprintf(stderr, "Bad encoding value in non-ASCII header string: %s\n", encoding+1);
-+    }
-+    if (lc2strcmp(charset, PrevCharset)) {
-+        char *s2, *charsetinuse;
-+
-+        strncpy(PrevCharset, charset, sizeof(PrevCharset));
-+        PrevCharset[sizeof(PrevCharset) - 1] = '\0';
-+        for (s2=PrevCharset; *s2; ++s2) {
-+            if (isupper((unsigned char) *s2)) *s2 = tolower((unsigned char) *s2);
-+        }
-+        charsetinuse = getenv("MM_CHARSET");
-+        if (!charsetinuse || lc2strcmp(charsetinuse, PrevCharset)) {
-+            printf("[** %s charset **] ", charset);
-+        }
-+    }
-+    if (ecode == ENCODING_NONE) {
-+        printf("%s", txt+1);
-+    } else {
-+        /* What follows is REALLY bogus, but all my encoding stuff is pipe-oriented right now... */
-+        MkTmpFileName(TmpFile);
-+        fp = fopen(TmpFile, WRITE_BINARY);
-+        if (!fp) {
-+            fprintf(stderr, "Could not open temporary file\n");
-+        } else {
-+            char *t;
-+            for (t=txt+1; *t; ++t) {
-+                if (*t == '_') {
-+                    putc(' ', fp);
-+                } else if (*t == '\n') {
-+                    putc(' ', fp);
-+                } else {
-+                    putc(*t, fp);
-+                }
-+            }
-+            fclose(fp);
-+            fp = fopen(TmpFile, "r");
-+            if (!fp) {
-+                fprintf(stderr, "Could not open temporary file\n");
-+            } else {
-+                TranslateInputToOutput(fp, stdout, ecode, "text");
-+                fclose(fp);
-+            }
-+            RmTmpFileName(TmpFile);
-+        }
-+    }
-+    *encoding = '?';
-+    *txt = '?';
-+    *txtend = '?';
-+    PrintHeader(txtend + 2, 0);
-+}
-+
-+BuildCommand(Buf, controlstring, TmpFileName, UsedTmpFileName, PartsWritten)
-+char *Buf, *controlstring, *TmpFileName;
-+int *UsedTmpFileName;
-+struct part **PartsWritten;
-+{
-+    char *from, *to, *s, *p, *tmp;
-+    int prefixed = 0, UsedBigFile=0, UsedLittleFiles=0, numparts=0;
-+    struct part *firstpart=NULL, *thispart=NULL, *tmppart=NULL;
-+
-+    if (UsedTmpFileName) *UsedTmpFileName = 0;
-+    if (PartsWritten) *PartsWritten = NULL;
-+    for (from=controlstring, to=Buf; *from; ++from) {
-+        if (prefixed) {
-+            prefixed = 0;
-+            switch(*from) {
-+                case '%':
-+                    *to++ = '%';
-+                    break;
-+                case 'n':
-+                case 'F':
-+		    if (!PartsWritten) {
-+			fprintf(stderr, "metamail: Bad mailcap \"test\" clause: %s\n", controlstring);
-+			ExitWithError("%%n and %%F may not be used in \"test\" clauses.  Execution terminated.");
-+		    }
-+                    if (UsedBigFile) {
-+                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
-+                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
-+                    }
-+                    if (!UsedLittleFiles) {
-+                        /* Set up parts */
-+                        char *LineBuf, *boundary, TmpFileNameBuf[TMPNAME_MAX];
-+                        char *oldct, *oldce, *newct;
-+                        int currct, boundarylen, newctlen, j;
-+                        int oldcparmsused, oldcparamsalloced;
-+                        char **oldcparams, **oldcparamvalues;
-+                        FILE *headfp;
-+
-+                        LineBuf = XMALLOC(char, LINE_BUF_SIZE);
-+                        boundary = FindParam("boundary");
-+			if (!boundary) {
-+			    fprintf(stderr, "Bad message format: This multipart message has no boundary parameter,\n");
-+			    fprintf(stderr, "but the mailcap entry for %s uses %%F or %%n.\n\n", ContentType);
-+			    ExitWithError("A change to the mailcap file might make this message viewable.");
-+                        }
-+                        if (boundary[0] == '"') {
-+                            boundary=UnquoteString(boundary);
-+                        }
-+                        sprintf(LineBuf, "--%s", boundary);
-+                        strcpy(boundary, LineBuf);
-+                        boundarylen = strlen(boundary);
-+                        if (BoundaryCt >= BoundaryAlloc) {
-+                            BoundaryAlloc += 5;
-+                            if (Boundaries) {
-+                                Boundaries = XREALLOC(char *, Boundaries,
-+						      BoundaryAlloc);
-+                            } else {
-+                                Boundaries = XMALLOC(char *, BoundaryAlloc);
-+                            }
-+                        }
-+                        Boundaries[BoundaryCt++] = boundary;
-+                        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
-+                            if (!strncmp(LineBuf, boundary, boundarylen)
-+                                 && ((LineBuf[boundarylen] == '\n')
-+                                      || (LineBuf[boundarylen] == '-'
-+                                           && LineBuf[boundarylen+1] == '-'
-+                                           && LineBuf[boundarylen+2] == '\n'))) {
-+                                break;
-+                            }
-+                        }
-+                        XFREE(LineBuf);
-+                        currct = BoundaryCt;
-+                        oldct=ContentType;
-+                        oldce=ContentEncoding;
-+                        oldcparmsused = CParamsUsed;
-+                        oldcparamsalloced = CParamsAlloced;
-+                        oldcparams = CParams;
-+                        oldcparamvalues = CParamValues;
-+                        CParams = NULL;
-+                        CParamValues = NULL;
-+                        CParamsUsed = 0;
-+                        CParamsAlloced = 0;
-+                        while(currct == BoundaryCt) {
-+                            tmppart = XMALLOC(struct part, 1);
-+                            if (firstpart) {
-+                                thispart->next = tmppart;
-+                                thispart = tmppart;
-+                            } else {
-+                                firstpart = thispart = tmppart;
-+                            }
-+                            tmppart->next = NULL;
-+                            ContentType=NULL;
-+                            ContentEncoding=NULL;
-+                            Read822Prefix(0,0);
-+                            PrepareMessage();
-+                            newctlen=5+strlen(ContentType);
-+                            for (j=0; j<CParamsUsed; ++j) {
-+                                newctlen += 11+strlen(CParams[j]) + strlen(CParamValues[j]);
-+                            }
-+                            newct= XMALLOC(char, newctlen);
-+                            strcpy(newct, "'");
-+                            strcat(newct, ContentType);
-+                            for (j=0; j<CParamsUsed; ++j) {
-+                                strcat(newct, "; ");
-+                                strcat(newct, CParams[j]);
-+                                if (CParamValues[j][0] == '\"') {
-+                                    strcat(newct, " = ");
-+                                    strcat(newct, CParamValues[j]);
-+                                } else {
-+                                    strcat(newct, " = \"");
-+                                    strcat(newct, CParamValues[j]);
-+                                    strcat(newct, "\"");
-+                                }
-+                            }
-+                            strcat(newct, "'");
-+                            thispart->ctype = newct;
-+                            MkTmpFileName(TmpFileNameBuf);
-+                            thispart->fname = XMALLOC(char,
-+						     1+strlen(TmpFileNameBuf));
-+                            strcpy(thispart->fname, TmpFileNameBuf);
-+                            WriteTmpFile(thispart->fname, thispart->ctype);
-+                            strcat(TmpFileNameBuf, "H");
-+                            headfp = fopen(TmpFileNameBuf, "w");
-+                            if (headfp) {
-+                                fputs(mailheaders+12, headfp);
-+                                /* The +12 gets rid of MM_HEADERS=\n */
-+                                fclose(headfp);
-+                            }
-+                            ++numparts;
-+                        }
-+                        ContentType=oldct;
-+                        ContentEncoding=oldce;
-+                        CParamsUsed = oldcparmsused;
-+                        CParamsAlloced = oldcparamsalloced;
-+                        CParams = oldcparams;
-+                        CParamValues = oldcparamvalues;
-+                        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
-+                            we must throw it away.*/
-+                        if (BoundaryCt > 0) {
-+                            ConsumeRestOfPart(NULL);
-+                        }
-+                        *PartsWritten = firstpart;
-+                        UsedLittleFiles=1;
-+                    }
-+                    if (*from == 'n') {
-+                        char numbuf[10];
-+                        sprintf(numbuf, "%d", numparts);
-+                        strcpy(to, numbuf);
-+                        to += strlen(numbuf);
-+                    } else { /* %F */
-+                        for (tmppart = firstpart; tmppart != NULL; tmppart = tmppart->next) {
-+                            sprintf(to, "%s %s ", tmppart->ctype, tmppart->fname);
-+                            to += (strlen(tmppart->ctype) + strlen(tmppart->fname) + 2);
-+                        }
-+                    }
-+                    break;
-+                case 's':
-+                    if (UsedLittleFiles) {
-+                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
-+                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
-+                    }
-+                    if (TmpFileName) {
-+                        strcpy(to, TmpFileName);
-+                        to += strlen(TmpFileName);
-+                        if (UsedTmpFileName) ++(*UsedTmpFileName);
-+                    }
-+                    UsedBigFile = 1;
-+                    break;
-+                case '{':
-+                    s = index(from, '}');
-+                    if (!s) {
-+                        fprintf(stderr, "Ignoring ill-formed parameter reference in mailcap file: %s\n", from);
-+                        break;
-+                    }
-+                    ++from;
-+                    *s = 0;
-+                    /* put in lower case */
-+                    for (tmp=from; *tmp; ++tmp) {
-+                        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+                    }
-+                    p = FindParam(from);
-+                    if (p && p[0] == '"') {
-+                        p=UnquoteString(p);
-+                    }
-+                    if (!p) p = "";
-+                    *to++ = '\'';
-+                    strcpynoquotes(to, p);
-+                    to += strlen(p);
-+                    *to++ = '\'';
-+                    *s = '}'; /* restore */
-+                    from = s;
-+                    break;
-+                case 't':
-+                    /* type/subtype */
-+                    strcpynoquotes(to, ContentType);
-+                    to += strlen(ContentType);
-+                    break;
-+                default:
-+                    fprintf(stderr, "Ignoring unrecognized format code in mailcap file: %%%c\n", *from);
-+                    break;
-+            }
-+        } else if (*from == '%') {
-+            prefixed = 1;
-+        } else {
-+            *to++ = *from;
-+        }
-+    }
-+    *to = 0;
-+}
-+
-+strcpynoquotes(t,f)
-+char *t, *f;
-+{
-+    static char *badchars="|<>%*?\"`'";
-+
-+    while (*f) {
-+        if (index(badchars, *f)) *t++ = ' '; else *t++ = *f;
-+        ++f;
-+    }
-+}
-+
-+WriteTmpFile(fname, ctype)
-+char *fname;
-+char *ctype;
-+{
-+    FILE *fpout;
-+    int retval = 0;
-+
-+    fpout = fopen(fname, WRITE_BINARY);
-+    if (!fpout) {
-+        perror("WriteTmpFile");
-+        metamail_fatal("Can't create temporary file: ", fname);
-+    }
-+    TranslateInputToOutput(InputFP, fpout, EncodingCode, ctype);
-+    if (ftell(fpout) == 0) retval = 1;
-+    if (fclose(fpout)) ExitWithError("Can't write temporary file");
-+    return(retval);
-+}
-+
-+
-+TranslateInputToOutput(InputFP, OutputFP, Ecode, ctype)
-+FILE *InputFP, *OutputFP;
-+int Ecode;
-+char *ctype;
-+{
-+    int InMultipart = BoundaryCt > 0 ? 1 : 0;
-+
-+    switch(Ecode) {
-+        case ENCODING_BASE64:
-+            from64(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt, DoesNeedPortableNewlines(ctype));
-+            break;
-+        case ENCODING_QUOTEDPRINTABLE:
-+            fromqp(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt);
-+            break;
-+ 	case ENCODING_UUENCODE:
-+ 	    fromuue(InputFP, OutputFP, InMultipart ? Boundaries: NULL, &BoundaryCt);
-+ 	    break;
-+        default:
-+            ConsumeRestOfPart(OutputFP);
-+    }
-+    if (UsingStandardInput && feof(InputFP) && !freopen("/dev/tty", "r", stdin)) {
-+        fprintf(stderr, "Warning: Cannot freopen /dev/tty to stdin");
-+    } else InputFP = stdin;
-+}
-+
-+CreateNewWindowPrefix(Prefix)
-+char *Prefix;
-+{
-+    char *override = getenv("TERMINAL_CMD");
-+    if (override) {
-+        strcpy(Prefix, override);
-+    } else if (getenv("DISPLAY")) {
-+        /* X11 */
-+        strcpy(Prefix, "xterm -title '");
-+        strcat(Prefix, MailSummary);
-+        strcat(Prefix, "' -e ");
-+    } else if (getenv("WINDOW_PARENT")) {
-+        /* SunView */
-+        strcpy(Prefix, "shelltool ");
-+    } else if (getenv("WMHOST")) {
-+        /* old Andrew WM */
-+        strcpy(Prefix, "h19 ");
-+    } else {
-+        /* last resort is to look for /dev/tty */
-+        if (!freopen("/dev/tty", "r", stdin)){
-+            ExitWithError("Don't know how to create a terminal window");
-+        }
-+        InputFP = stdin;
-+        fprintf(stderr, "Warning, reopened /dev/tty, could be strange.\n");
-+        Prefix[0] = 0;
-+    }
-+}
-+
-+int HasSavedTtyState=0;
-+
-+SaveTtyState() {
-+    /* Bogus -- would like a good portable way to reset the terminal state here */
-+  ioctl(fileno(stdin), TCGETA, &MyTtyStateIn);
-+  ioctl(fileno(stdout), TCGETA, &MyTtyStateOut);
-+
-+  HasSavedTtyState = 1;
-+  }
-+
-+RestoreTtyState() {
-+    if (HasSavedTtyState) {
-+        ioctl(fileno(stdout), TCSETA, &MyTtyStateOut);
-+        ioctl(fileno(stdin), TCSETA, &MyTtyStateIn);
-+    }
-+}
-+
-+NeedToAskBeforeExecuting(type)
-+char *type;
-+{
-+    struct NoAskItem *nai;
-+    if (!MightAskBeforeExecuting || DoInBackground) return(0);
-+    for (nai = FirstNoAskItem; nai; nai = nai->next) {
-+        if (CtypeMatch(type, nai->type)) return(0);
-+    }
-+    return(1);
-+}
-+
-+NeedToBeQuiet(cmd)
-+char *cmd;
-+{
-+    struct NoAskItem *nai;
-+    for (nai = FirstQuietItem; nai; nai = nai->next) {
-+        if (!lc2strcmp(nai->type, cmd)) return(1);
-+    }
-+    return(0);
-+}
-+
-+CtypeMatch(ctype, pat)
-+char *ctype, *pat;
-+{
-+    int len;
-+    char pat2[200];
-+
-+    if (!lc2strcmp(ctype, pat)) {
-+        return(1); /* exact match, case-insensitive */
-+    }
-+    if (index(pat, '/') == NULL) {
-+        /* implicit wildcard */
-+        strcpy(pat2, pat);
-+        strcat(pat2, "/*");
-+        pat = pat2;
-+    }
-+    len = strlen(pat);
-+    if ((pat[--len] == '*')
-+         && (pat[--len] == '/')
-+         && (!lc2strncmp(ctype, pat, len))
-+         && ((ctype[len] == '/') || (ctype[len] == '\0'))){
-+        /* wildcard match */
-+        return(1);
-+    }
-+    return(0);
-+}
-+
-+ExecuteCommand(cmd, really)
-+char *cmd;
-+int really;
-+{
-+    int code;
-+    if (!Quiet || DoDebug) {
-+        if (!NeedToBeQuiet(ShortCommand(cmd))) {
-+            printf("---Executing: %s\n", DoDebug ? cmd : ShortCommand(cmd));
-+        } else if (EatLeadingNewlines) {
-+            printf("\n");
-+        } 
-+        fflush(stdout);
-+    }
-+    if (really) {
-+        fflush(stdout); fflush(stderr);
-+        code = system(cmd);
-+        if (DoDebug) printf("Command exit status: %d\n", code);
-+        return(code);
-+    }
-+    return(0);
-+}
-+
-+void
-+ConsumeRestOfPart(outfp)
-+FILE *outfp;
-+{
-+    char *Buf;
-+    int c;
-+
-+    if (BoundaryCt <= 0) {
-+        while ((c=getc(InputFP)) != EOF) {
-+            if (outfp) putc(c, outfp);
-+        }
-+        return;
-+    }
-+    Buf = XMALLOC(char, LINE_BUF_SIZE);
-+    while (fgets(Buf, LINE_BUF_SIZE, InputFP)) {
-+        if ((BoundaryCt > 0)
-+             && (Buf[0] == '-')
-+             && (Buf[1] == '-')
-+             && PendingBoundary(Buf, Boundaries, &BoundaryCt)) {
-+            break;
-+        }
-+        if (outfp) fputs(Buf, outfp);
-+    }
-+    XFREE(Buf);
-+}
-+
-+char *paramend(s)
-+char *s;
-+{
-+    int inquotes=0;
-+    while (*s) {
-+        if (inquotes) {
-+            if (*s == '"') {
-+                inquotes = 0;
-+            } else if (*s == '\\') {
-+                ++s; /* skip a char */
-+            }
-+        } else if (*s == ';') {
-+            return(s);
-+        } else if (*s == '"') {
-+            inquotes = 1;
-+        }
-+        ++s;
-+    }
-+    return(NULL);
-+}        
-+
-+void
-+ParseContentParameters(ct)
-+char *ct;
-+{
-+    char *s, *t, *eq;
-+
-+    CParamsUsed = 0;
-+    s = index(ct, ';');
-+    if (!s) return;
-+    *s++ = 0;
-+    do {
-+        t = paramend(s);
-+        if (t) *t++ = 0;
-+        eq = index(s, '=');
-+        if (!eq) {
-+            fprintf(stderr, "Ignoring unparsable content-type parameter: '%s'\n", s);
-+            JunkParameter=Cleanse(s);
-+        } else {
-+            if (CParamsUsed >= CParamsAlloced) {
-+                CParamsAlloced += 10;
-+                if (CParams) {
-+                    CParams = XREALLOC(char *, CParams, 1+CParamsAlloced);
-+                    CParamValues = XREALLOC(char *, CParamValues, 
-+					    1+CParamsAlloced);
-+                } else {
-+                    CParams = XMALLOC(char*, 1+CParamsAlloced);
-+                    CParamValues = XMALLOC(char *, 1+CParamsAlloced);
-+                }
-+            }
-+            *eq++ = 0;
-+            s = Cleanse(s);
-+            CParams[CParamsUsed] = s;
-+            /* strip leading white space */
-+            while (*eq && isspace((unsigned char) *eq)) ++eq;
-+            /* strip trailing white space */
-+            StripTrailingSpace(eq);
-+            CParamValues[CParamsUsed++] = eq; 
-+            if (DoDebug) printf("NEW PARAMETER: %s VALUE: %s\n", s, eq);
-+        }
-+        s = t;
-+    } while (t);
-+}
-+
-+char *FindParam(s)
-+char *s;
-+{
-+    int i;
-+    for (i=0; i<CParamsUsed; ++i) {
-+        if (!strcmp(s, CParams[i])) {
-+            return(CParamValues[i]);
-+        }
-+    }
-+    return(NULL);
-+}
-+
-+strcatquoting(s1, s2)
-+char *s1;
-+char *s2;
-+{
-+    strcat(s1, s2);
-+#ifdef NOTDEF
-+    while (*s1) ++s1;
-+    while (*s2) {
-+        if (*s2 == '\"' || *s2 == '\\') *s1++ = '\\';
-+        *s1++ = *s2++;
-+    }
-+    *s1 = '\0';
-+#endif
-+}
-+
-+PauseForUser() {
-+    if (DefinitelyNotTty || MustNotBeTty) return;	
-+
-+    fflush(stdout);
-+    SaveTtyState();
-+    if (StartRawStdin() != -1) {
-+        printf("--Press any key to go on.--");
-+    } else {
-+        printf("Press RETURN to go on.\n");
-+    }
-+    fflush(stdout);
-+    getchar();
-+    RestoreTtyState();
-+    printf("\n");
-+}
-+
-+StartRawStdin() {
-+    struct termio   orterm, fterm;
-+    ioctl(0, TCGETA, &orterm);	/* get current (i.e. cooked) termio */
-+    fterm = orterm;		/* get termio to modify */
-+
-+    fterm.c_lflag &= ~ICANON;	/* clear ICANON giving raw mode */
-+    fterm.c_cc[VMIN] = 1;	/* set MIN char count to 1 */
-+    fterm.c_cc[VTIME] = 0;	/* set NO time limit */
-+    return ioctl(0, TCSETAW, &fterm);	/* modify termio for raw mode */
-+}
-+
-+
-+int IsDirectory(fname)
-+char *fname;
-+{
-+    struct stat stbuf;
-+    if (stat(fname, &stbuf)) {
-+	return(-1);
-+    }
-+    return (((stbuf.st_mode & S_IFMT) == S_IFDIR) ? 1 : 0);
-+}
-+
---- metamail-2.7.orig/src/metamail/dlistold.h
-+++ metamail-2.7/src/metamail/dlistold.h
-@@ -0,0 +1,36 @@
-+// Copyright: Michael Moerz 2000
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License with
-+// the Debian GNU/Linux distribution in file /usr/share/doc/common-licenses/GPL
-+// if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-+// Suite 330, Boston, MA  02111-1307  USA
-+
-+#ifndef DRF_LIST_H
-+#define DRF_LIST_H 1
-+
-+typedef struct dlist {
-+  struct dlist* next;
-+  struct dlist* prev;
-+  void* data;
-+} DList;
-+
-+extern DList* dlist_new        (void* data);
-+extern void   dlist_cat        (DList* tail_l1, DList* head_l2);
-+extern DList* dlist_insertnew  (DList** tail, void* data);
-+extern DList* dlist_insert     (DList** tail, DList* new);
-+extern DList* dlist_head       (DList* head);
-+extern DList* dlist_tail       (DList* head);
-+extern size_t dlist_length     (DList* head);
-+extern DList* dlist_remove     (DList** head, DList** tail, DList* entry);
-+
-+#endif /* !DRF_LIST_H */
---- metamail-2.7.orig/src/metamail/mimencode.c
-+++ metamail-2.7/src/metamail/mimencode.c
-@@ -0,0 +1,95 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+#include <metamail/common.h>
-+
-+//#ifdef MSDOS
-+//#include <fcntl.h>
-+//#endif
-+
-+#define BASE64 1
-+#define QP 2 /* quoted-printable */
-+
-+main(argc, argv)
-+int argc;
-+char **argv;
-+{
-+    int encode = 1, which = BASE64, i, portablenewlines = 0;
-+    FILE *fp = stdin;
-+    FILE *fpo = stdout;
-+
-+    for (i=1; i<argc; ++i) {
-+        if (argv[i][0] == '-') {
-+	    switch (argv[i][1]) {
-+		case 'o':
-+		    if (++i >= argc) {
-+			fprintf(stderr, "mimencode: -o requires a file name.\n");
-+			exit(-1);
-+		    }
-+		    fpo = fopen(argv[i], "w");
-+		    if (!fpo) {
-+			perror(argv[i]);
-+			exit(-1);
-+		    }
-+		    break;
-+                case 'u':
-+                    encode = 0;
-+                    break;
-+                case 'q':
-+                    which = QP;
-+                    break;
-+                case 'p':
-+                    portablenewlines = 1;
-+                    break;
-+                case 'b':
-+                    which = BASE64;
-+                    break;
-+		default:
-+                    fprintf(stderr,
-+                       "Usage: %s [-u] [-q] [-b] [-p] [-o outputfile] [file name]\n", *argv);
-+                    exit(-1);
-+            }
-+        } else {
-+	  //#ifdef MSDOS
-+	  //            if (encode)
-+          //      fp = fopen(argv[i], "rb");
-+          //  else
-+          //  {
-+          //      fp = fopen(argv[i], "rt");
-+          //      setmode(fileno(fpo), O_BINARY);
-+          //  } /* else */
-+	  //#else
-+            fp = fopen(argv[i], "r");
-+	    //#endif /* MSDOS */
-+            if (!fp) {
-+                perror(argv[i]);
-+                exit(-1);
-+            }
-+        }
-+    }
-+    //#ifdef MSDOS
-+    //if (fp == stdin) setmode(fileno(fp), O_BINARY);
-+    //#endif /* MSDOS */
-+    if (which == BASE64) {
-+        if (encode) {
-+            to64(fp, fpo, portablenewlines);
-+        } else {
-+            from64(fp,fpo, (char **) NULL, (int *) 0, portablenewlines);
-+        }
-+    } else {
-+        if (encode) toqp(fp, fpo); else fromqp(fp, fpo, NULL, 0);
-+    }
-+    return(0);
-+}
-+
---- metamail-2.7.orig/src/metamail/tmpfile.c
-+++ metamail-2.7/src/metamail/tmpfile.c
-@@ -0,0 +1,120 @@
-+#include <metamail/common.h>
-+#include <metamail/dlist.h> /* double linked list management */
-+
-+#include "tmpfile.h"
-+#include "metamail.h"
-+
-+DList TmpNameList = { NULL, NULL };
-+
-+void
-+MkTmpFileName(name)
-+     char *name;
-+{
-+  int   tmpfd   = 0;
-+
-+  if (DoDebug) 
-+    fprintf(stderr, "MkTmpFileName:\n");
-+
-+  if (!name) {
-+    if (DoDebug)
-+      fprintf(stderr, "name is null\nMkTmpFileName END\n");
-+    return;
-+  }
-+  
-+  strcpy(name, tmproot);
-+  strcat(name, "/MXXXXXX");
-+ 
-+  if ((tmpfd = mkstemp(name)) > 0) {
-+    if (close(tmpfd) == -1) {
-+      metamail_warning( "couldn't close tmpfile: ", xstrerror( errno ) );
-+      name[0] = 0;
-+      return;
-+    }
-+    if (DoDebug)
-+      fprintf(stderr, "name = \"%s\"\n", name);
-+    AddTmpFileName( name );
-+    if (DoDebug)
-+      fprintf( stderr, "MkTmpFileName END\n", name);
-+  } else {
-+    metamail_warning( "couldn't optain tmpfile: ", xstrerror( errno ) );
-+    return;
-+  }
-+}
-+
-+void
-+AddTmpFileName(name)
-+     char *name;
-+{
-+  char *tmpname = NULL;
-+  if ( name ) {
-+    tmpname = XMALLOC( char, strlen(name) + 1 );
-+  
-+    strcpy( tmpname, name );
-+    dlist_insertnew( &TmpNameList, (void*) tmpname, TmpNameList.tail );
-+    if (DoDebug)
-+      fprintf( stderr, "AddTmpFileName: %s\n", name );
-+  }
-+}
-+
-+void
-+DelTmpFileName(name)
-+     char *name;
-+{
-+  DListEntry *help = NULL;
-+  
-+  if ( (help = dlist_remove( &TmpNameList, dlist_search( &TmpNameList, name, 
-+							 dlist_strcmp ) ) ) ) {
-+    XFREE( help->data );
-+    XFREE( help );
-+  } else
-+    fprintf(stderr, "tried to remove non tmplist file %s\n", name);
-+}
-+
-+void
-+RmTmpFileName(name)
-+     char *name;
-+{
-+  DListEntry* help = NULL;
-+  
-+  if (DoDebug) 
-+    fprintf( stderr, "RmTmpFileName:\n" );
-+
-+  if( (help = dlist_remove( &TmpNameList, 
-+			    dlist_search( &TmpNameList, name, 
-+					  dlist_strcmp ) ) ) ) {
-+    if (DoDebug) fprintf( stderr, "filename: %s\n", name );
-+    if (!access( name, R_OK ) ) { 
-+      if(unlink( name ) == -1)
-+	metamail_error( stderr, "error unlinking: ", xstrerror( errno ) );
-+    }
-+    XFREE( help->data );
-+    XFREE( help );
-+  }
-+}
-+
-+void
-+CleanupTmpFiles( void )
-+{
-+  DListEntry* help = NULL;
-+  
-+  if (DoDebug) 
-+    fprintf( stderr, "CleanupTmpFiles:\n" );
-+
-+  while ( TmpNameList.head ) {
-+    if (DoDebug) fprintf(stderr, "tmpfile: %s  %X\n", TmpNameList.head->data,
-+			 TmpNameList.head->next);
-+    if (!access( (char*) TmpNameList.head->data, R_OK )) {
-+      if (DoDebug) fprintf( stderr, "access file yes\n" );
-+      if (unlink( (char*) TmpNameList.head->data ) < 0) {
-+	if (DoDebug) 
-+	  metamail_error( stderr, "error unlinking: ", 
-+			  (char*) TmpNameList.head->data );
-+      }
-+    }
-+    
-+    help = dlist_remove( &TmpNameList, TmpNameList.head );
-+    if (DoDebug) fprintf( stderr, "%X\n", help );
-+    XFREE( help->data );
-+    XFREE( help );
-+  }
-+}
---- metamail-2.7.orig/src/metamail/tmpfile.h
-+++ metamail-2.7/src/metamail/tmpfile.h
-@@ -0,0 +1,15 @@
-+#ifndef METAMAIL_TMPFILE_H
-+#define METAMAIL_TMPFILE_H 1
-+
-+/* create and remove tmpfiles */
-+void MkTmpFileName( char* );
-+void RmTmpFileName( char* );
-+/* and cleanup after doing all kind of things */
-+void CleanupTmpFiles( void );
-+
-+/* register and unregister tmpfiles */
-+/* these functions should not be invoked directly (there are exceptions) */
-+void AddTmpFileName( char* );
-+void DelTmpFileName( char* );
-+
-+#endif /* METAMAIL_TMP_FILE_H */
---- metamail-2.7.orig/src/metamail/metamail.old
-+++ metamail-2.7/src/metamail/metamail.old
-@@ -0,0 +1,2756 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+/****************************************************** 
-+    Metamail -- A tool to help diverse mail readers 
-+                cope with diverse multimedia mail formats.
-+
-+    Author:  Nathaniel S. Borenstein, Bellcore
-+
-+ ******************************************************* */
-+
-+#include <stdio.h>
-+#include <ctype.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include "../config.h"
-+#include <patchlevel.h>
-+#include "dlist.h"
-+
-+#ifdef BORLAND
-+#define F_OK 0
-+extern unsigned _stklen = 16384;
-+extern char *mktemp(char *);
-+#define WRITE_BINARY	"w"
-+#else /* BORLAND */
-+#ifdef MICROSOFT
-+#include <malloc.h>
-+#include <stdlib.h>
-+#include <time.h>
-+#include <signal.h>
-+#define F_OK 0
-+#else
-+#include <pwd.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/file.h>
-+#include <signal.h>
-+#ifndef AMIGA
-+#ifdef SYSV
-+#include <termio.h>
-+#include <unistd.h>
-+#else /* SYSV */
-+#include <sgtty.h>
-+#endif /* SYSV */
-+#endif /* AMIGA */
-+#endif /* MICROSOFT */
-+#endif /* BORLAND */
-+
-+#if defined(SYSV) && !defined(linux)
-+#define LPRTEMPLATE "lp %s"
-+#define LPRCOMMAND "lp"
-+#else
-+#define LPRTEMPLATE "lpr %s"
-+#define LPRCOMMAND "lpr"
-+#endif
-+#ifdef MSDOS
-+#define CATCOMMAND  "cat"
-+#define CATTEMPLATE "cat %s"
-+#define METAMAIL    "metamail"
-+#define TMPFILE_NAME_SIZE   128
-+#define MAX_FILE_NAME_SIZE 128
-+#define WRITE_BINARY	"wb"
-+#else /* MSDOS */
-+#ifdef AMIGA
-+extern char *MkRmScript();
-+#ifndef F_OK
-+#define F_OK (0)
-+#endif
-+#define CATCOMMAND  "Type"
-+#define CATTEMPLATE "Type %s"
-+#define METAMAIL    "metamail <*"
-+#define TMPFILE_NAME_SIZE     50
-+#define MAX_FILE_NAME_SIZE 256
-+#define WRITE_BINARY	"w"
-+#else /* AMIGA */
-+extern char **environ, *gets();
-+#define CATCOMMAND  "cat"
-+#define CATTEMPLATE "cat %s"
-+#define METAMAIL    "metamail"
-+#define TMPFILE_NAME_SIZE   1000
-+#define MAX_FILE_NAME_SIZE 1000
-+#define WRITE_BINARY	"w"
-+#endif /* AMIGA */
-+#endif /* MSDOS */
-+
-+#ifndef NO_RLIMITS
-+#include <sys/resource.h>
-+#endif
-+
-+#define CMDSIZE 1200 /* Maximum size of command to execute */
-+
-+#define LINE_BUF_SIZE       2000
-+#ifndef MICROSOFT
-+extern char *malloc();
-+extern char *realloc();
-+#endif
-+extern char *getenv();
-+extern char *index();
-+extern char *rindex();
-+char fileToDelete[MAX_FILE_NAME_SIZE];
-+
-+char *FindParam();
-+extern FILE *popen();
-+static char *nomem = "Out of memory!";
-+static char *mmversion = MM_VERSTRING;
-+static char *NoAskDefault = "text,text/plain,text/richtext";
-+static char *QuietDefault = CATCOMMAND;
-+static char *tmproot="";
-+
-+struct MailcapEntry {
-+    char *contenttype;
-+    char *command;
-+    char *testcommand;
-+    int needsterminal;
-+    int copiousoutput;
-+    int needtofree;
-+    char *label;
-+    char *printcommand;
-+};
-+
-+FILE *InputFP = NULL;
-+
-+int MightAskBeforeExecuting = 1,
-+    DefinitelyNotTty = 0,
-+    MustNotBeTty = 0,
-+    MaybePageOutput = 0,
-+    MustPageOutput = 0,
-+    EatLeadingNewlines = 0,
-+    PrintSomeHeaders = 1,
-+    DoInBackground = 0,
-+    Quiet = 0,
-+    TransparentMode = 0,
-+    DeleteSourceFileWhenDone = 0,
-+    Is822Format = 1,
-+    DoDebug = 0,
-+    CParamsAlloced = 0,
-+    CParamsUsed = 0,
-+    YankMode = 0,
-+    UsingStandardInput = 0,
-+    PrintingMode = 0,
-+    JustWriteFiles = 0,
-+    ProcessingErrors = 0;
-+
-+char *ContentType = NULL,
-+    *ContentEncoding = NULL,
-+    *MailerName = "unknown",
-+    *MailSubject = "Mail message",
-+    *MailFrom = "unknown sender",
-+    *MailSummary = "non-text mail message",
-+    *mailheaders = NULL,
-+    **CParams = NULL,
-+    **CParamValues = NULL,
-+    *JunkParameter = NULL;
-+
-+DList* TmpNameListTail;
-+
-+#define ENCODING_NONE 0
-+#define ENCODING_BASE64 1
-+#define ENCODING_QUOTEDPRINTABLE 2
-+#define ENCODING_8BIT 3
-+#define ENCODING_UUENCODE -1	/* non-standard */
-+int EncodingCode = ENCODING_NONE;
-+
-+struct part {
-+    char *ctype;
-+    char *fname;
-+    struct part *next;
-+};
-+
-+struct NoAskItem {
-+    char *type;
-+    struct NoAskItem *next;
-+} *FirstNoAskItem = NULL,
-+  *FirstQuietItem = NULL;
-+
-+#ifdef MICROSOFT
-+/* Need a function prototype for TryMailcapEntry because without it MSC
-+ * passes a pointer to the structure rather than the structure itself.
-+ */
-+TryMailcapEntry(struct MailcapEntry mc, char *SquirrelFile);
-+#endif
-+
-+void PrintHeader();
-+void ConsumeRestOfPart();
-+void ParseContentParameters();
-+
-+void CleanupTmpFiles();
-+
-+sigtype cleanup();
-+
-+char *Cleanse(s) /* no leading or trailing space, all lower case */
-+char *s;
-+{
-+    char *tmp, *news;
-+    
-+    /* strip leading white space */
-+    while (*s && isspace((unsigned char) *s)) ++s;
-+    news = s;
-+    /* put in lower case */
-+    for (tmp=s; *tmp; ++tmp) {
-+        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+    }
-+    /* strip trailing white space */
-+    while (tmp > news && *--tmp && isspace((unsigned char) *tmp)) *tmp = 0;
-+    return(news);
-+}
-+
-+char *UnquoteString(s)
-+char *s;
-+{
-+    char *ans, *t;
-+
-+    if (*s != '"') return(s);
-+    ans = malloc(1+strlen(s));
-+    if (!ans) ExitWithError(nomem);
-+    ++s;
-+    t = ans;
-+    while (*s) {
-+        if (*s == '\\') {
-+            *t++ = *++s;
-+        } else if (*s == '"') {
-+            break;
-+        } else {
-+            *t++ = *s;
-+        }
-+        ++s;
-+    }
-+    *t = 0;
-+    return(ans);
-+}
-+
-+sigtype
-+cleanup(signum) 
-+int signum;
-+{
-+    RestoreTtyState();
-+#if defined(MSDOS) || defined(AMIGA)
-+    exit(signum);
-+#else
-+    signal(signum, SIG_DFL);
-+    kill(getpid(), signum);
-+#endif
-+}
-+
-+char **Boundaries = NULL;
-+int BoundaryCt = 0, BoundaryAlloc = 0;
-+struct nextfile {
-+    char *filename;
-+    struct nextfile *next;
-+} *FileQueue=NULL, *LastInQueue = NULL;
-+
-+void
-+ResetGlobals() {
-+    CParamsAlloced = 0;
-+    CParamsUsed = 0;
-+
-+    ContentType = NULL;
-+    ContentEncoding = NULL;
-+    MailSubject = "Mail message";
-+    MailFrom = "unknown sender";
-+    MailSummary = "non-text mail message";
-+    mailheaders = getenv("MM_HEADERS");
-+    if (mailheaders) {
-+        char *s;
-+        s = malloc(15+strlen(mailheaders));
-+        if (!s) ExitWithError(nomem);
-+        sprintf(s, "MM_HEADERS=%s", mailheaders);
-+        mailheaders = s;
-+    }
-+    CParams = NULL;
-+    CParamValues = NULL;
-+    JunkParameter = NULL;
-+}
-+
-+void modpath(auxpath)
-+char *auxpath;
-+{
-+    if (auxpath && *auxpath) {
-+        static char *newpath = 0;
-+	char *oldpath = newpath;
-+        char *path = getenv("PATH");
-+
-+	if (!path) path = "";	/* give a default if no current path */
-+	newpath = malloc(7 + strlen(path) + strlen(auxpath));
-+        if (!newpath) ExitWithError(nomem);
-+        sprintf(newpath, "PATH=%s:%s", auxpath, path);
-+        putenv(newpath);
-+	if (oldpath) free(oldpath); 	/* free up any old allocated PATH */
-+    }
-+}
-+
-+main(argc, argv)
-+int argc;
-+char **argv;
-+{
-+    int retcode;
-+
-+    modpath(AUXPATH);
-+#ifndef MSDOS
-+    signal(SIGINT, cleanup);
-+#ifndef AMIGA
-+    signal(SIGILL, cleanup);
-+    signal(SIGTRAP, cleanup);
-+    signal(SIGIOT, cleanup);
-+    signal(SIGFPE, cleanup);
-+#ifndef linux
-+    signal(SIGEMT, cleanup);
-+    signal(SIGBUS, cleanup);
-+#endif
-+    signal(SIGSEGV, cleanup);
-+    signal(SIGTERM, cleanup);
-+#endif
-+#endif
-+#ifdef SIGXCPU
-+    signal(SIGXCPU, cleanup);
-+#endif
-+    tmproot = getenv("METAMAIL_TMPDIR");
-+    if (!tmproot) tmproot="/tmp";
-+    mailheaders = getenv("MM_HEADERS");
-+    if (mailheaders) {
-+        char *s;
-+        s = malloc(15+strlen(mailheaders));
-+        if (!s) ExitWithError(nomem);
-+        sprintf(s, "MM_HEADERS=%s", mailheaders);
-+        mailheaders = s;
-+    }
-+    fileToDelete[0] = 0;
-+    ProcessArguments(argc, argv); /* calls ExitWithError on error */
-+#if !defined(AMIGA) && !defined(MSDOS)
-+    if (MaybePageOutput) {
-+        /* Want to send stderr to pager too, sigh... */
-+        fflush(stderr);
-+        close(2);
-+        dup2(1, 2);
-+    }
-+#endif
-+    retcode = HandleMessage(NULL, 0);
-+    if (! UsingStandardInput) {
-+        fclose(InputFP);
-+    }
-+    if (fileToDelete[0]) {
-+        unlink(fileToDelete);
-+        fileToDelete[0] = 0;
-+    }
-+    while (FileQueue) {
-+        InputFP = fopen(FileQueue->filename, "r");
-+        if (DoDebug) printf("Trying to open input file: %s\n", FileQueue->filename);
-+        if (!InputFP) ExitWithError("Can't read input file");
-+        if (DeleteSourceFileWhenDone) {
-+            strcpy(fileToDelete, FileQueue->filename);
-+        }
-+        ResetGlobals();
-+        retcode |= HandleMessage(NULL, 0);
-+        if (! UsingStandardInput) {
-+            fclose(InputFP);
-+        }
-+        if (fileToDelete[0]) {
-+            unlink(fileToDelete);
-+            fileToDelete[0] = 0;
-+        }
-+        FileQueue = FileQueue->next;
-+    }
-+    if (MustPageOutput) PauseForUser();
-+    CleanupTmpFiles();
-+    exit(ProcessingErrors? -1 : retcode);
-+}
-+
-+void
-+QueueNextFile(fname)
-+char *fname;
-+{
-+    struct nextfile *tmp = (struct nextfile *) malloc(sizeof (struct nextfile));
-+    if (!tmp) ExitWithError(nomem);
-+    tmp->filename = fname;
-+    tmp->next = NULL;
-+    if (FileQueue) {
-+        LastInQueue->next = tmp;
-+        LastInQueue = tmp;
-+    } else {
-+        FileQueue = tmp;
-+        LastInQueue = tmp;
-+    }
-+}
-+
-+HandleMessage(SquirrelFile, nestingdepth)
-+char *SquirrelFile;
-+/* SquirrelFile, if non-NULL, is a place to save a recognized body instead of executing it. */
-+int nestingdepth;
-+{
-+    char *boundary;
-+    int FileWriteOnly = JustWriteFiles;
-+
-+    if (FileWriteOnly) {
-+        if (!lc2strncmp(ContentType, "message/", 8)
-+             || !lc2strncmp(ContentType, "multipart/", 10)) {
-+            FileWriteOnly = 0; /* only leaf data */
-+        }
-+    }
-+    if (Is822Format) {
-+	if (Read822Prefix(SquirrelFile?0:1, nestingdepth)) {
-+	    return -1;
-+	}
-+    } else Is822Format = 1; /* this property is not recursive for multipart or message */
-+    PrepareMessage();
-+    if (!FileWriteOnly && !ProcessMailcapFiles(SquirrelFile)) return(0);
-+    if (!lc2strcmp(ContentType, "message")
-+         || !lc2strcmp(ContentType, "message/rfc822")) { 
-+        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
-+        ContentType = NULL; /* reset default */
-+        ContentEncoding = NULL; /* reset default */
-+        return(HandleMessage(NULL, nestingdepth+1)); /* simple recursion */
-+    }
-+    boundary = FindParam("boundary");
-+    if (!boundary) boundary =JunkParameter; /* backward compatibility hack */
-+    if (!lc2strncmp(ContentType, "multipart", 9)) { 
-+      if (!boundary) {
-+	  fprintf(stderr, "Warning: No boundary for multipart data, treating as unrecognized format.\n");
-+      } else {
-+        char *LineBuf, NewSquirrelFile[TMPFILE_NAME_SIZE];
-+        char *subtype = NULL;
-+        int currct, result, IsAlternative, WroteSquirrelFile, boundarylen;
-+
-+        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
-+        if (boundary[0] == '"') {
-+            boundary=UnquoteString(boundary);
-+        }
-+        subtype = index(ContentType, '/');
-+        if (subtype) {
-+            ++subtype;
-+            subtype = Cleanse(subtype);
-+        } else subtype = "mixed";
-+#ifndef MSDOS
-+        if (!MaybePageOutput && !DoInBackground) DoInBackground = strcmp(subtype, "parallel") ? 0 : 1;
-+#endif
-+
-+        IsAlternative = strcmp(subtype, "alternative") ? 0 : 1;
-+        if (IsAlternative) {
-+            MkTmpFileName(NewSquirrelFile);
-+            WroteSquirrelFile = 0;
-+        }
-+        LineBuf = malloc(LINE_BUF_SIZE);
-+        if (!LineBuf) ExitWithError(nomem);
-+        sprintf(LineBuf, "--%s", boundary);
-+        strcpy(boundary, LineBuf);
-+        boundarylen = strlen(boundary);
-+        if (BoundaryCt >= BoundaryAlloc) {
-+            BoundaryAlloc += 5;
-+            if (Boundaries) {
-+                Boundaries = (char **) realloc(Boundaries, BoundaryAlloc*sizeof(char *));
-+            } else {
-+                Boundaries = (char **) malloc(BoundaryAlloc*sizeof(char *));
-+            }
-+            if (!Boundaries) ExitWithError(nomem);
-+        }
-+        Boundaries[BoundaryCt++] = boundary;
-+        if (DoDebug) printf("Handling multipart as built-in here.  Boundary: %s\n", boundary);
-+        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
-+            if (!strncmp(LineBuf, boundary, boundarylen)
-+                 && ((LineBuf[boundarylen] == '\n')
-+                      || (LineBuf[boundarylen] == '-'
-+                           && LineBuf[boundarylen+1] == '-'
-+                           && LineBuf[boundarylen+2] == '\n'))) {
-+                break;
-+            }
-+        }
-+        free(LineBuf);
-+        currct = BoundaryCt;
-+        while(currct == BoundaryCt) {
-+            if (!strcmp(subtype, "digest")) {
-+                ContentType = "message/rfc822";
-+            } else {
-+                ContentType = NULL; /* reset default */
-+            }
-+            ContentEncoding = NULL; /* reset default */
-+            if (IsAlternative) {
-+                result = HandleMessage(NewSquirrelFile, nestingdepth+1);
-+            } else{
-+                result = HandleMessage(NULL, nestingdepth+1);
-+            }
-+            if (result) {
-+                /* Need to consume the rest of the part */
-+                ConsumeRestOfPart(NULL);
-+            } else {
-+                ++WroteSquirrelFile;
-+            }
-+        }
-+        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
-+            we must throw it away.*/
-+        if (BoundaryCt > 0) {
-+            ConsumeRestOfPart(NULL);
-+        }
-+        if (IsAlternative) {
-+            if (WroteSquirrelFile) {
-+                int retcode; 
-+                char Cmd[TMPFILE_NAME_SIZE + 15];
-+                sprintf(Cmd, "%s %s", METAMAIL, NewSquirrelFile);
-+                fflush(stdout); fflush(stderr);
-+                retcode = system(Cmd);
-+#ifdef MSDOS
-+                retcode = 0;
-+#endif
-+                unlink(NewSquirrelFile);
-+                return(retcode);
-+            } else {
-+                printf("Cannot handle any part of multipart/alternative message\n");
-+            }
-+        }
-+	return(0);
-+      }
-+    } /* End of multipart handling */
-+    if (!FileWriteOnly && !TryBuiltIns(SquirrelFile)) return(0);
-+    if (!SquirrelFile) { /* Very last resort -- unrecognized types */
-+        char Fname[MAX_FILE_NAME_SIZE], *suggestedname, SugBuf[MAX_FILE_NAME_SIZE];
-+        FILE *fp;
-+        int ans = 0, octetstream, ecode=0;
-+        suggestedname = FindParam("name");
-+        if (!suggestedname) {
-+            MkTmpFileName(SugBuf);
-+            suggestedname = SugBuf;
-+        } else if (suggestedname[0] == '"') {
-+            suggestedname=UnquoteString(suggestedname);
-+        }
-+        octetstream = ! lc2strcmp(ContentType, "application/octet-stream");
-+        if (MightAskBeforeExecuting
-+             && !DefinitelyNotTty && !MustNotBeTty) {
-+            if (FileWriteOnly) {
-+                printf("\nThis message contains '%s`-format data.\n", ContentType);
-+            } else if (octetstream) {
-+                printf("This message contains raw digital data, which can either be viewed as text\nor written to a file.\n");
-+            } else {
-+                printf("\nThis message contains data in an unrecognized format, %s,\nwhich can either be viewed as text or written to a file.\n", ContentType);
-+            }
-+            while (!ans) {
-+                if (FileWriteOnly) {
-+                    ans = 2;
-+                } else {
-+                    printf("\nWhat do you want to do with the %s data?\n1 -- See it as text\n2 -- Write it to a file\n3 -- Just skip it\n\n", octetstream ? "raw" : ContentType);
-+                    fgets(Fname, sizeof(Fname), stdin);
-+                    ans = atoi(Fname);
-+                }
-+                switch(ans) {
-+                    case 1:
-+                        TranslateInputToOutput(InputFP, stdout, EncodingCode, "text");
-+                        return(0);
-+                    case 2:
-+                        {
-+                        int needname = 1;
-+                        while (needname) {
-+                            needname = 0;
-+                            printf("Please enter the name of a file to which the data should be written\n(Default: %s) > ", suggestedname);
-+                            fflush(stdout);
-+                            fgets(Fname, sizeof(Fname), stdin);
-+                            Fname[strlen(Fname) - 1] = '\0'; /* bogus newline */
-+#if !defined(AMIGA) && !defined(MSDOS)
-+                            if (!Fname[0]) strcpy(Fname, suggestedname);
-+                            if (Fname[0] == '~' && Fname[1] == '/') {
-+                                char Fname2[1000];
-+                                int uid = getuid();
-+                                struct passwd *p;
-+                                p = getpwuid(uid);
-+                                if (!p) {
-+                                    MkTmpFileName(Fname);
-+                                    printf("Cannot figure out what ~ means, using temporary file %s instead\n", Fname);
-+                                } else {
-+                                    strcpy(Fname2, p->pw_dir);
-+                                    strcat(Fname2, "/");
-+                                    strcat(Fname2, Fname + 2);
-+                                    strcpy(Fname, Fname2);
-+                                }
-+                            }
-+#endif
-+                            if (access(Fname, F_OK) == 0) {
-+                                char *s, AnsBuf[50];
-+                                int overwriteans = -1;
-+                                do {
-+                                    printf("File %s exists.  Do you want to overwrite it (y/n) ?\n", Fname);
-+                                    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-+                                    if (!s) {
-+                                        overwriteans = 0;
-+                                    } else {
-+                                        while (s && *s && isspace((unsigned char) *s)) ++s;
-+                                        if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') {
-+                                            overwriteans = 1;
-+                                        } else if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
-+                                            overwriteans=0;
-+                                        }
-+                                    }
-+                                    if (overwriteans == -1) printf("Please answer yes or no.\n");
-+                                } while (overwriteans == -1);
-+                                if (overwriteans == 0) needname = 1;
-+                            }
-+                        }
-+                        }
-+                        break;
-+                    case 3:
-+                        ConsumeRestOfPart(NULL);
-+                        return(0);
-+                        break;
-+                    default:
-+                        ans = 0;
-+                        break;
-+                }
-+            }
-+        } else {
-+            int ct = 0;
-+            char *slash = rindex(suggestedname, '/');
-+#ifdef AMIGA
-+	    if (slash == NULL) {
-+                slash = rindex(suggestedname, ':');
-+            }
-+#endif
-+            if (slash)  {
-+                ++slash;
-+            } else {
-+                slash = suggestedname;
-+            }
-+            do {
-+                if (ct) {
-+#ifdef AMIGA
-+                    sprintf(Fname, "T:%d-%s", ct, slash);
-+                } else {
-+                    sprintf(Fname, "T:%s", slash);
-+#else
-+                    sprintf(Fname, "%s/%d-%s", tmproot, ct, slash);
-+                } else {
-+                    sprintf(Fname, "%s/%s", tmproot, slash);
-+#endif
-+                }
-+                ++ct;
-+            } while (access(Fname, F_OK) == 0);
-+            if (FileWriteOnly) {
-+                printf("\nThis message contains '%s`-format data.\n", ContentType);
-+            } else if (octetstream) {
-+                printf("\nThis message contains raw digital data,");
-+            } else {
-+                printf("\nThis message contains data in an unrecognized format, %s,", ContentType);
-+            }
-+            printf("\nwhich is being decoded and written to the file named \"%s\".\nIf you do not want this data, you probably should delete that file.\n", Fname);
-+        }
-+        if (Fname[0] == 0 || Fname[0] == '\n') {
-+            ConsumeRestOfPart(NULL);
-+        } else {
-+            fp = fopen(Fname, WRITE_BINARY);
-+            if (!fp) ExitWithError("Cannot open temporary file");
-+            TranslateInputToOutput(InputFP, fp, EncodingCode, ContentType);
-+            ecode = fclose(fp);
-+            if (ecode) {
-+                printf("Could not write file %s\n", Fname);
-+            } else {
-+                printf("Wrote file %s\n", Fname);
-+            }
-+        }
-+        if (!DefinitelyNotTty && MaybePageOutput && BoundaryCt > 0) PauseForUser();
-+        return(ecode);
-+    }
-+    return(-1); /* Unrecognized, really */
-+}
-+
-+ProcessArguments(argc, argv)
-+int argc;
-+char **argv;
-+{
-+    int i, RunAsRootOK = 0;
-+    char *SourceFileName = NULL, *NoAskStr, *QuietStr;
-+
-+    QuietStr = getenv("MM_QUIET");
-+    if (!QuietStr) {
-+        QuietStr=QuietDefault;
-+    }
-+    if (!strcmp(QuietStr, "1")) {
-+        Quiet = 1;
-+    } else {
-+        struct NoAskItem *qitem;
-+        char *s, *tmp;
-+        char *QuietCopy;
-+
-+        Quiet = 0;
-+        QuietCopy = malloc(1+strlen(QuietStr));
-+        if (!QuietCopy) ExitWithError(nomem);
-+        strcpy(QuietCopy, QuietStr);
-+        for (tmp=QuietCopy; *tmp; ++tmp) {
-+            if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+        }
-+        do {
-+            s = index(QuietCopy, ',');
-+            if (s) *s++ = 0;
-+            qitem = (struct NoAskItem *) malloc(sizeof (struct NoAskItem));
-+            if (!qitem) ExitWithError(nomem);
-+            qitem->next = FirstQuietItem;
-+            qitem->type = QuietCopy;
-+            FirstQuietItem = qitem;
-+            QuietCopy = s;
-+        } while (QuietCopy);
-+    }
-+    if (getenv("MM_TRANSPARENT")) {
-+        TransparentMode = atoi(getenv("MM_TRANSPARENT")); /* Will not propogate recursively */
-+    }
-+    if (getenv("MM_RUNASROOT")) {
-+        RunAsRootOK = atoi(getenv("MM_RUNASROOT"));
-+    }
-+    if (getenv("MM_YANKMODE")) {
-+        YankMode = atoi(getenv("MM_YANKMODE")); /* Will not propogate recursively */
-+    }
-+    if (getenv("MM_DEBUG")) {
-+        DoDebug = atoi(getenv("MM_DEBUG"));
-+    }
-+    if (DoDebug) printf("Metamail Version %s, debugging turned on.\n", mmversion);
-+    NoAskStr = getenv("MM_NOASK");
-+    if (!NoAskStr) NoAskStr = NoAskDefault;
-+    if (!strcmp(NoAskStr, "1")) {
-+        MightAskBeforeExecuting = 0;
-+    } else {
-+        struct NoAskItem *nai;
-+        char *s, *tmp;
-+        char *NoAskCopy;
-+
-+        NoAskCopy = malloc(1+strlen(NoAskStr));
-+        if (!NoAskCopy) ExitWithError(nomem);
-+        strcpy(NoAskCopy, NoAskStr);
-+        for (tmp=NoAskCopy; *tmp; ++tmp) {
-+            if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+        }
-+        do {
-+            s = index(NoAskCopy, ',');
-+            if (s) *s++ = 0;
-+            nai = (struct NoAskItem *) malloc(sizeof (struct NoAskItem));
-+            if (!nai) ExitWithError(nomem);
-+            nai->next = FirstNoAskItem;
-+            nai->type = NoAskCopy;
-+            FirstNoAskItem = nai;
-+            NoAskCopy = s;
-+        } while (NoAskCopy);
-+    }
-+    MailerName = getenv("MM_MAILER");
-+    if (!MailerName) MailerName = "unknown";
-+    if (getenv("MM_USEPAGER")) {
-+        MaybePageOutput = atoi(getenv("MM_USEPAGER"));
-+    }
-+    if ((getenv("MM_NOTTTY") && ((atoi(getenv("MM_NOTTTY"))) != 0))) {
-+        MustNotBeTty = 1;
-+    }
-+    if (MustNotBeTty
-+         || !isatty(0)
-+         || !isatty(1)) {
-+        DefinitelyNotTty = 1;
-+    }
-+    for (i=1; i<argc; ++i) {
-+	if (argv[i][0] == '-') {
-+	    switch (argv[i][1]) {
-+		case '\0':
-+		    /* Not really necessary, but.... */
-+		    SourceFileName = NULL;
-+		    UsingStandardInput = 1;
-+		    break;
-+		case 'b':
-+		    Is822Format = 0;
-+		    break;
-+		case 'B':
-+#ifdef MSDOS
-+                    fprintf(stderr, "metamail warning: -B flag not supported on this system\n");
-+#else
-+		    DoInBackground = 1;
-+#endif
-+		    break;
-+                case 'c':
-+		    if (++i >= argc) usage();
-+		    ContentType = malloc(1+strlen(argv[i]));
-+		    if (!ContentType) ExitWithError(nomem);
-+                    strcpy(ContentType,argv[i]);
-+                    /* strip leading white space */
-+                    while (*ContentType && isspace((unsigned char) *ContentType)) ++ContentType;
-+                    StripTrailingSpace(ContentType);
-+                    ParseContentParameters(ContentType);
-+                    break;
-+                case 'd':
-+		    MightAskBeforeExecuting = 0;
-+		    break;
-+		case 'e':
-+		    EatLeadingNewlines = 1;
-+		    break;
-+		case 'E':
-+		    if (++i >= argc) usage();
-+		    ContentEncoding = argv[i];
-+		    break;
-+		case 'f':
-+		    if (++i >= argc) usage();
-+		    MailFrom = argv[i];
-+                    break;
-+                case 'h':
-+                    {
-+                    FILE *tmpfp;
-+                    PrintingMode = 1;
-+                    MightAskBeforeExecuting = 0;
-+#ifdef AMIGA
-+		    freopen("prt:", "w", stdout);
-+#else
-+                    /* Want to make all of stdout go to printer, and this 
-+                      is easier than changing every output statement,
-+                      at least on UNIX... */
-+                    tmpfp = popen(LPRCOMMAND, "w");
-+                    if (!tmpfp) {
-+                        ExitWithError("Cannot execute lpr command");
-+                    }
-+                    fflush(stdout);
-+                    close(1);
-+                    dup2(fileno(tmpfp), 1);
-+#endif
-+                    break;
-+                    }
-+		case 'm':
-+		    if (++i >= argc) usage();
-+		    MailerName = argv[i];
-+		    break;
-+		case 'p':
-+		    MaybePageOutput = 1;
-+		    break;
-+		case 'P':
-+                    MaybePageOutput = 1;
-+                    MustPageOutput = 1;
-+		    break;
-+		case 'r':
-+#ifdef MSDOS
-+                    fprintf(stderr, "metamail warning: -r flag not supported on this system\n");
-+#else
-+		    RunAsRootOK = 1;
-+#endif
-+                    break;
-+                case 'R':
-+#ifdef RESET_PROGRAM
-+                    system(RESET_PROGRAM);
-+                    if (DoDebug) printf("Executed reset\n");
-+#else
-+                    fprintf(stderr, "metamail warning: -R flag not supported on this system\n");
-+#endif
-+                    break;
-+		case 's':
-+		    if (++i >= argc) usage();
-+		    MailSubject = argv[i];
-+		    break;
-+                case 'T':
-+                    TransparentMode = 0;
-+                    break;
-+                case 'w':
-+                    JustWriteFiles = 1;
-+                    break;
-+                case 'q':
-+                    Quiet = 1;
-+		    PrintSomeHeaders = 0;
-+		    break;
-+		case 'x':
-+                    DefinitelyNotTty = 1;
-+                    MustNotBeTty = 1;
-+		    break;
-+                case 'y':
-+                    YankMode = 1;
-+                    break;
-+		case 'z':
-+		    DeleteSourceFileWhenDone = 1;
-+		    break;
-+		default:
-+		    usage();
-+	    }
-+	} else {
-+	    if (SourceFileName) {
-+                QueueNextFile(argv[i]);
-+	    } else {
-+		SourceFileName = argv[i];
-+	    }
-+	}
-+    }
-+    if (TransparentMode) {
-+        RunInNewWindow(argv, argc, &SourceFileName);
-+    }
-+    if (MaybePageOutput && DoInBackground) {
-+	MustNotBeTty = 1;
-+        /*fprintf(stderr, "metamail: -B is incompatible with -p, -P, and MM_USEPAGER\n");
-+        usage(); */
-+    }
-+    if (!Is822Format && !ContentType) {
-+	fprintf(stderr, "metamail:  -b requires -c.\n");
-+	usage();
-+    }
-+    if (DeleteSourceFileWhenDone && !SourceFileName) {
-+	fprintf(stderr, "metamail:  -z requires -f.\n");
-+	usage();
-+    }
-+#if !defined(AMIGA) && !defined(MSDOS)
-+    if (!RunAsRootOK && (getuid() == 0 || geteuid() == 0)) {
-+	fprintf(stderr, "You can not run MetaMail as root unless you use -r or set MM_RUNASROOT.\n");
-+	usage();
-+    }
-+#endif
-+    if (SourceFileName) {
-+        InputFP = fopen(SourceFileName, "r");
-+        if (DoDebug) printf("Trying to open input file: %s\n", SourceFileName);
-+        if (!InputFP) ExitWithError("Can't read input file");
-+        if (DeleteSourceFileWhenDone) {
-+            strcpy(fileToDelete, SourceFileName);
-+        }
-+    } else {  /* input on stdin */
-+        UsingStandardInput = 1;
-+        if (MustNotBeTty) {
-+            InputFP = stdin;
-+/*            MaybePageOutput = 1; */ /* This messed up safe-tcl -- nsb 9/21/93 */
-+            MightAskBeforeExecuting = 0;
-+        } else {
-+#if defined(MSDOS) || defined(AMIGA)
-+            InputFP = stdin;
-+            DefinitelyNotTty = 1;
-+            MaybePageOutput = 0;
-+#else
-+            int newfd = dup(0);
-+            FILE *newfp;
-+            if (newfd > 0) {
-+                InputFP = fdopen(newfd, "r");
-+                if (InputFP 
-+                     && ((newfp = fopen("/dev/tty", "r")) != NULL)
-+                     && !dup2(fileno(newfp), 0)) {
-+                    DefinitelyNotTty = 0;
-+                } else {
-+                    InputFP = stdin;
-+                    DefinitelyNotTty = 1;
-+                    MaybePageOutput = 0;
-+                }
-+            }
-+#endif
-+        }
-+    }
-+    if (DefinitelyNotTty && MaybePageOutput) {
-+        RunInNewWindow(argv, argc, &SourceFileName);
-+    }
-+    if (DefinitelyNotTty) {
-+        MaybePageOutput = 0;	/* Disable pager if I/O has been redirected */
-+    }
-+    return(0);
-+}
-+
-+usage() {
-+    fprintf(stderr, "Usage:  metamail [-b] [-B] [-d] [-e] [-h] [-r] [-R] [-p]  [-P] [-x] [-y] [-z] [-c content-type] [-E content-transfer-encoding] [-f from-name] [-m mailername] [-s subject] [message-file-name]\n");
-+    ExitWithError(NULL);
-+}
-+
-+RunInNewWindow(argv, argc, SourceFileNamePtr)
-+char **argv, **SourceFileNamePtr;
-+int argc;
-+{
-+    char *FullCmd, TmpName[TMPFILE_NAME_SIZE];
-+    int i, createdfile=0;
-+    if (!*SourceFileNamePtr) {
-+        char *LineBuf;
-+        FILE *fptmp;
-+
-+        LineBuf = malloc(LINE_BUF_SIZE);
-+        if (!LineBuf) ExitWithError(nomem);
-+        /* Create it, ugh.  Also needs to affect later command. */
-+        MkTmpFileName(TmpName);
-+        DeleteSourceFileWhenDone = 1;
-+        fptmp = fopen(TmpName, WRITE_BINARY);
-+        if (!fptmp) ExitWithError("Can't open temporary file\n");
-+        while (fgets(LineBuf, LINE_BUF_SIZE, stdin)) {
-+            fputs(LineBuf, fptmp);
-+        }
-+        free(LineBuf);
-+        fclose(fptmp);
-+        *SourceFileNamePtr = TmpName;
-+        createdfile = 1;
-+    }
-+    FullCmd = malloc(CMDSIZE);
-+    if (!FullCmd) ExitWithError(nomem);
-+    if (TransparentMode) {
-+        /* In transparent mode, we want to produce stdout that is what we get in, and do EVERYTHING externally in a terminal window.  This is to make the truly brain-dead mailers like mailtool happy. I am NOT happy about having to do this.  */
-+        /* So, first we copy everything to stdout */
-+        sprintf(FullCmd, CATTEMPLATE, *SourceFileNamePtr);
-+        system(FullCmd); /* Cheesy way to do it */
-+        fflush(stdout); fflush(stderr);
-+    }
-+    /* Then we run ourselves in a terminal window */
-+    MailSummary = "Metamail"; /* for window label */
-+    CreateNewWindowPrefix(FullCmd);
-+    strcat(FullCmd, METAMAIL);
-+    strcat(FullCmd, " -P ");
-+    if (TransparentMode) strcat(FullCmd, "-T ");
-+    for (i=1; i<argc; ++i) {
-+        if (strncmp(argv[i], "-x", 2)
-+             && strncmp(argv[i], "-B", 2)
-+             && strncmp(argv[i], "-d", 2)) {
-+            strcat(FullCmd, "\"");
-+            strcat(FullCmd, argv[i]);
-+            strcat(FullCmd, "\" ");
-+        }
-+    }
-+    if (createdfile) {
-+        strcat(FullCmd, "-z ");
-+        strcat(FullCmd, *SourceFileNamePtr);
-+    }
-+    if (!MightAskBeforeExecuting) {
-+        strcat(FullCmd, " -d ");
-+        /* The special hack for -d is HORRIBLE, but xterm screws up with the -d option in the middle of the command line! */
-+    }
-+    if (DoInBackground) strcat(FullCmd, " &");
-+    DefinitelyNotTty = 0;
-+    SetUpEnvironment();
-+    if (DoDebug) fprintf(stderr, "Executing %s\n", FullCmd);
-+    fflush(stdout); fflush(stderr);
-+#ifdef MSDOS
-+    system(FullCmd);
-+    exit(0);	/* system() returns random number under MS-DOS */
-+#else
-+    exit(system(FullCmd));
-+#endif
-+}
-+
-+/* Only one or the other set up builtins gets used,
-+  depending on whether or not we're in the middle of 
-+          a multipart/alternative body part */
-+struct MailcapEntry BuiltIns[] = {
-+    {"text/*", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
-+    {NULL, NULL, NULL, 0, 0, 0}};
-+
-+struct MailcapEntry BuiltInsAlternative[] = {
-+    {"text/plain", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
-+    {NULL, NULL, NULL, 0, 0, 0}};
-+
-+ProcessMailcapFiles(SquirrelFile) 
-+char *SquirrelFile;
-+{
-+    char *s, *pathcopy = NULL;
-+#ifdef MICROSOFT
-+    /* For the Microsoft compiler, we use the library function _searchenv
-+     * to find the mailcap file.  It will search all the directories
-+     * listed in the given environment variable (PATH in this case), then
-+     * construct a path to the file if it finds it.
-+     */
-+    /* BOGUS -- this only finds the FIRST mailcap file, we want ALL mailcap files */
-+    char path[128];
-+
-+    _searchenv("mailcap", "PATH", path);
-+    if (path[0])
-+        if (!ProcessMailcapFile(path, SquirrelFile)) return(0);
-+    return(-1);
-+#else /* MICROSOFT */
-+#ifdef BORLAND
-+    char *path = getenv("MAILCAPS");
-+    if (!path)
-+       path = STDPATH;
-+#else /* BORLAND */
-+#ifdef AMIGA
-+    char *path = STDPATH;
-+#else /* AMIGA */
-+    char *path = getenv("MAILCAPS");
-+    if (!path) {
-+        int uid = getuid();
-+        struct passwd *p;
-+        p = getpwuid(uid);
-+        if (p) path = malloc(5+strlen(p->pw_dir) + sizeof(STDPATH));
-+        if (!p || !path) ExitWithError(nomem);
-+        strcpy(path, p->pw_dir);
-+        strcat(path, STDPATH);
-+        pathcopy = path;
-+    } else 
-+#endif /* AMIGA */
-+#endif /* BORLAND */
-+    {
-+        pathcopy = malloc(1+strlen(path));
-+        if (!pathcopy) ExitWithError(nomem);
-+        strcpy(pathcopy, path);
-+        path = pathcopy;
-+    }
-+    while(path) {
-+        s = index(path, PATH_SEPARATOR);
-+        if (s) *s++ = 0;
-+        if (!ProcessMailcapFile(path, SquirrelFile)) return(0);
-+        path = s;
-+    }
-+    if (pathcopy) free(pathcopy);
-+    return(-1);
-+#endif /* MICROSOFT */
-+}
-+
-+TryBuiltIns(SquirrelFile) 
-+char *SquirrelFile;
-+{
-+    int i;
-+    /* Last resort -- for sites that didn't bother putting a "text" line in their mailcap files... */
-+    if (DoDebug) fprintf(stderr, "Looking for '%s' in built-in content-type handling settings.\n", ContentType);
-+    for (i=0; BuiltIns[i].contenttype; ++i) {
-+        if (!TryMailcapEntry(SquirrelFile ? BuiltInsAlternative[i] : BuiltIns[i], SquirrelFile))    return(0);
-+    }
-+    return(-1);
-+}
-+
-+ProcessMailcapFile(file, SquirrelFile)
-+char *file, *SquirrelFile;
-+{
-+    struct MailcapEntry mc;
-+    FILE *fp;
-+    int res;
-+
-+    res = IsDirectory(file);
-+    if (res) {
-+	if (res == 1) {
-+	    fprintf(stderr, "Mailcap path entry '%s' is a directory, should be a readable file.\n", file);
-+	} else if (DoDebug) {
-+	/* Quietly ignore non-existent mailcap files unless debugging */
-+	    fprintf(stderr, "Mailcap path entry '%s' does not exist.\n", file);
-+	}
-+	return(-1);
-+    }
-+    fp = fopen(file, "r");
-+    if (DoDebug) fprintf(stderr, "Looking for '%s' in mailcap file '%s'.\n", ContentType, file);
-+    while (fp && !feof(fp)) {
-+        mc.needtofree = 0;
-+	if (GetMailcapEntry(fp, &mc)) {
-+            if (!TryMailcapEntry(mc, SquirrelFile)) {
-+                fclose(fp);
-+                return(0);
-+            }
-+	}
-+    }
-+    if (fp) fclose(fp);
-+    return(-1);
-+}
-+
-+static char *ThingsToSkip[] = {
-+    "csh ",
-+    "sh ",
-+    "ksh ",
-+    NULL
-+};
-+
-+char *ShortCommand(progname)
-+char *progname;
-+{
-+    int i;
-+    char *s, *oldprogname;
-+    static char FullProgName[500];
-+
-+eatmore:
-+    while (*progname && (*progname == '(' || isspace((unsigned char) *progname))) {
-+        ++progname;
-+    }
-+    oldprogname = progname;
-+    for (i = 0; oldprogname == progname && ThingsToSkip[i]; ++i) {
-+        if (!strncmp(progname, ThingsToSkip[i], strlen(ThingsToSkip[i]))) {
-+            progname += strlen(ThingsToSkip[i]);
-+        }
-+    }
-+    if (*progname == '-') {
-+        ++progname;
-+        while (*progname && !isspace((unsigned char) *progname)) ++progname;
-+    }
-+    if (progname != oldprogname) goto eatmore;
-+    strcpy(FullProgName, progname);
-+    s = index(FullProgName, ' ');
-+    if (s) *s = 0;
-+    s = rindex(FullProgName, '/');
-+    if (s) {
-+	return(s+1);
-+    } else {
-+	return(FullProgName);
-+    }
-+}    
-+
-+TryMailcapEntry(mc, SquirrelFile)
-+struct MailcapEntry mc;
-+char *SquirrelFile;
-+{
-+    StripTrailingSpace(mc.contenttype);
-+    if (DoDebug) fprintf(stderr, "Trying mailcap entry for '%s'.\n", mc.contenttype);
-+    if (PrintingMode && !mc.printcommand) return(-1);
-+    if (CtypeMatch(ContentType, mc.contenttype) && PassesTest(&mc)) {
-+        if (SquirrelFile) {
-+            return(SaveSquirrelFile(SquirrelFile));
-+        } else {
-+            char TmpFileName[TMPFILE_NAME_SIZE];
-+            MkTmpFileName(TmpFileName);
-+            return(ExecuteMailcapEntry(mc, TmpFileName, ContentType));
-+        }
-+    }
-+    if (mc.needtofree) {
-+        free(mc.contenttype);
-+        free(mc.command);
-+    }
-+    return(-1);
-+}
-+
-+SaveSquirrelFile(SquirrelFile)
-+char *SquirrelFile;
-+{
-+    int j;
-+    FILE *outfp;
-+
-+    if (DoDebug) printf("saving to file %s\n", SquirrelFile);
-+
-+    outfp = fopen(SquirrelFile, WRITE_BINARY);
-+    if (!outfp) {
-+        fprintf(stderr, "Cannot open %s to squirrel away a portion of a multipart/alternative\n", SquirrelFile);
-+        return(-1);
-+    }
-+    fprintf(outfp, "Content-type: %s", ContentType);
-+    for (j=0; j<CParamsUsed; ++j) {
-+        fprintf(outfp, " ; ");
-+        fprintf(outfp, CParams[j]);
-+        fprintf(outfp, " = ");
-+        fprintf(outfp, CParamValues[j]);
-+    }
-+    fprintf(outfp, "\n\n"); 
-+    TranslateInputToOutput(InputFP, outfp, EncodingCode, ContentType);
-+    if (fclose(outfp)) {
-+        ExitWithError("fclose failed");
-+    }
-+    return(0);
-+}
-+
-+ExecuteMailcapEntry(mc, TmpFileName, ThisContentType)
-+char *TmpFileName, *ThisContentType;
-+struct MailcapEntry mc;
-+{
-+    int resultcode=0, DidExecute, UsedTmpFileName;
-+    struct part *PartsWritten=NULL;
-+    char *s, *cmd;
-+
-+    cmd = malloc(CMDSIZE);
-+    if (!cmd) ExitWithError(nomem);
-+    if (PrintingMode && !mc.printcommand) return(-1);
-+    BuildCommand(cmd, PrintingMode ? mc.printcommand : mc.command, TmpFileName, &UsedTmpFileName, &PartsWritten);
-+    if (DoDebug) fprintf(stderr, "Match!  Built command %s.\n", cmd);
-+    if (mc.copiousoutput && MaybePageOutput) {
-+        strcat(cmd, " | ");
-+        s = getenv("METAMAIL_PAGER");
-+        if (s && strncmp(s, "metamail", 8)) {
-+            /* If METAMAIL_PAGER is set to "metamail" we override it */
-+            strcat(cmd, s);
-+#ifndef AMIGA
-+            if (!strncmp(s, "less", 4) && strncmp(s+5, "-r", 2)) {
-+                fprintf(stderr, "Warning:  'less' without '-r' behaves badly for some mail types,\n\tnotably richtext.\n");
-+            }
-+#endif
-+        } else {
-+            strcat(cmd, "more");
-+        }
-+    }
-+    if (!DefinitelyNotTty) {
-+        SaveTtyState();
-+    }
-+    if (!NeedToAskBeforeExecuting(ThisContentType)
-+         || OKToRun(ThisContentType, cmd, mc.label)) {
-+        char *FullCmd;
-+        int ReallyNotTty;
-+#ifndef NO_RLIMITS
-+        /* Limit size of core dumps */
-+        struct rlimit rlp;
-+
-+        rlp.rlim_cur = 0;
-+        rlp.rlim_max = 0;
-+        setrlimit(RLIMIT_CORE, &rlp); 
-+#endif
-+        FullCmd = malloc(CMDSIZE);
-+        if (!FullCmd) ExitWithError(nomem);
-+        ReallyNotTty = DefinitelyNotTty;
-+        if (mc.needsterminal
-+             && DefinitelyNotTty) {
-+            int j;
-+            sprintf(cmd, " %s -P -b -c '%s", METAMAIL, ThisContentType);
-+            for (j=0; j<CParamsUsed; ++j) {
-+                strcat(cmd, " ; ");
-+                strcatquoting(cmd, CParams[j]);
-+                strcat(cmd, " = ");
-+                strcatquoting(cmd, CParamValues[j]);
-+            }
-+            strcat(cmd, "' ");
-+            strcat(cmd, TmpFileName);
-+            CreateNewWindowPrefix(FullCmd);
-+            strcat(FullCmd, cmd);
-+            DefinitelyNotTty = 0; /* For recursive call */
-+        } else {
-+            strcpy(FullCmd, cmd);
-+        }
-+        DidExecute = 0;
-+        if (UsedTmpFileName || PartsWritten) {
-+            int isempty;
-+            if (PartsWritten) {
-+                isempty = 0;
-+            } else {
-+                isempty = WriteTmpFile(TmpFileName, ThisContentType);
-+            }
-+            if (!isempty || strncmp(ThisContentType, "text", 4)) {
-+                if (DoInBackground && !PartsWritten && !mc.needsterminal) {
-+#ifdef AMIGA
-+                    char TmpCmd[80], TmpScriptName[40];
-+                    sprintf(TmpCmd, "run execRmScript %s",
-+                            MkRmScript(FullCmd, TmpFileName, TmpScriptName));
-+#else
-+                    char TmpCmd[CMDSIZE];
-+                    sprintf(TmpCmd, "(%s; rm %s) &", FullCmd, TmpFileName);
-+#endif
-+                    DefinitelyNotTty = 1; /* in background */
-+                    SetUpEnvironment();
-+                    resultcode = ExecuteCommand(TmpCmd, 1);
-+                    ++DidExecute;
-+                } else {
-+                    SetUpEnvironment();
-+                    resultcode = ExecuteCommand(FullCmd, 1);
-+                    unlink(TmpFileName);
-+                    ++DidExecute;
-+                }
-+            } else { /* empty text part, hack to not say "more" */
-+                unlink(TmpFileName);
-+            }
-+        } else {
-+            FILE *tmpfp;
-+            SetUpEnvironment();
-+            (void) ExecuteCommand(FullCmd, 0);
-+            tmpfp = popen(FullCmd, WRITE_BINARY);
-+            TranslateInputToOutput(InputFP, tmpfp, EncodingCode, ThisContentType);
-+            resultcode = tmpfp ? pclose(tmpfp) : -1;
-+            ++DidExecute;
-+        }
-+        DefinitelyNotTty = ReallyNotTty;
-+        if (!DefinitelyNotTty && DidExecute) {
-+            RestoreTtyState();
-+            if (mc.copiousoutput && MaybePageOutput && BoundaryCt > 0) PauseForUser();
-+        }
-+        if (!resultcode) {
-+            free(FullCmd);
-+        } else {
-+            fprintf(stderr, "Command failed: %s\n", FullCmd);
-+            if (MaybePageOutput && BoundaryCt > 0) PauseForUser();
-+            ++ProcessingErrors;
-+        }
-+    } else {
-+        /* user does not want to execute command */
-+        if (!DefinitelyNotTty) {
-+            RestoreTtyState();
-+        }
-+        if (DoDebug) fprintf(stderr, "Not executing command.\n");
-+        if (!PartsWritten) ConsumeRestOfPart(NULL);
-+    }
-+    if (PartsWritten) {
-+        struct part *tp;
-+        char HeadFile[MAX_FILE_NAME_SIZE];
-+
-+        while (PartsWritten) {
-+            tp=PartsWritten->next;
-+            free(PartsWritten->ctype);
-+            strcpy(HeadFile, PartsWritten->fname);
-+            strcat(HeadFile, "H");
-+            unlink(HeadFile);
-+            unlink(PartsWritten->fname);
-+            free(PartsWritten->fname);
-+            free(PartsWritten);
-+            PartsWritten=tp;
-+        }
-+    }
-+    if (!DefinitelyNotTty) {
-+        RestoreTtyState();
-+    }
-+    free(cmd);
-+    return(0);
-+}
-+
-+PassesTest(mc)
-+struct MailcapEntry *mc;
-+{
-+    int result;
-+    char *cmd, TmpFileName[TMPFILE_NAME_SIZE];
-+
-+    if (!mc->testcommand) return(1);
-+    MkTmpFileName(TmpFileName);
-+    cmd = malloc(CMDSIZE);
-+    if (!cmd) ExitWithError(nomem);
-+    BuildCommand(cmd, mc->testcommand, TmpFileName, NULL, NULL);
-+    if (DoDebug) printf("Executing test command: %s\n", cmd);
-+    result = system(cmd);
-+#ifdef MSDOS
-+    result = 0;	    /* system doesn't return a valid exit code on MS-DOS */
-+                    /* note that this makes the test feature useless... */
-+#endif
-+    free(cmd);
-+    return(!result);
-+}
-+
-+char *
-+GetCommand(s, t)
-+char *s, **t;
-+{
-+    char *s2;
-+    int quoted = 0;
-+    s2 = malloc(strlen(s)*2+1); /* absolute max, if all % signs */
-+    if (!s2) ExitWithError(nomem);
-+    *t = s2;
-+    while (s && *s) {
-+	if (quoted) {
-+            if (*s == '%') *s2++ = '%'; /* Quote through next level, ugh! */
-+
-+            *s2++ = *s++;
-+	    quoted = 0;
-+	} else {
-+	    if (*s == ';') {
-+                *s2 = 0;
-+		return(++s);
-+	    }
-+	    if (*s == '\\') {
-+		quoted = 1;
-+		++s;
-+	    } else {
-+		*s2++ = *s++;
-+	    }
-+	}
-+    }
-+    *s2 = 0;
-+    return(NULL);
-+}	
-+
-+GetMailcapEntry(fp, mc)
-+FILE *fp;
-+struct MailcapEntry *mc;
-+{
-+    int rawentryalloc = 2000, len;
-+    char *rawentry, *s, *t, *LineBuf;
-+
-+    LineBuf = malloc(LINE_BUF_SIZE);
-+    if (!LineBuf) ExitWithError(nomem);
-+    rawentry = malloc(1 + rawentryalloc);
-+    if (!rawentry) ExitWithError(nomem);
-+    *rawentry = 0;
-+    while (fgets(LineBuf, LINE_BUF_SIZE, fp)) {
-+	if (LineBuf[0] == '#') continue;
-+        len = strlen(LineBuf);
-+        if (len == 0) continue;
-+        if (LineBuf[len-1] == '\n') LineBuf[--len] = 0;
-+	if ((len + strlen(rawentry)) > rawentryalloc) {
-+	    rawentryalloc += 2000;
-+	    rawentry = realloc(rawentry, rawentryalloc+1);
-+	    if (!rawentry) ExitWithError(nomem);
-+	}
-+	if (LineBuf[len-1] == '\\') {
-+            LineBuf[len-1] = 0;
-+	    strcat(rawentry, LineBuf);
-+	} else {
-+	    strcat(rawentry, LineBuf);
-+	    break;
-+	}
-+    }
-+    free(LineBuf);
-+    for (s=rawentry; *s && isspace((unsigned char) *s); ++s) ;
-+    if (!*s) {
-+	/* totally blank entry -- quietly ignore */
-+	free(rawentry);
-+	return(0);
-+    }
-+    s = index(rawentry, ';');
-+    if (!s) {
-+	fprintf(stderr, "metamail: Ignoring invalid mailcap entry: %s\n", rawentry);
-+	free(rawentry);
-+	return(0);
-+    }
-+    *s++ = 0;
-+    mc->needsterminal = 0;
-+    mc->copiousoutput = 0;
-+    mc->needtofree = 1;
-+    mc->testcommand = NULL;
-+    mc->label = NULL;
-+    mc->printcommand = NULL;
-+    mc->contenttype = malloc(1+strlen(rawentry));
-+    if (!mc->contenttype) ExitWithError(nomem);
-+    strcpy(mc->contenttype, rawentry);
-+    t = GetCommand(s, &mc->command);
-+    if (!t) {
-+        free(rawentry);
-+        return(1);
-+    }
-+    while (s && *s && isspace((unsigned char) *s)) ++s;
-+    s = t;
-+    while (s) {
-+	char *arg, *eq;
-+
-+        t = GetCommand(s, &arg);
-+/*        if (t) *t++ = 0; */
-+        eq = index(arg, '=');
-+        if (eq) *eq++ = 0;
-+	if (*arg) {
-+	    arg = Cleanse(arg);
-+	    if (!strcmp(arg, "needsterminal")) {
-+		mc->needsterminal = 1;
-+	    } else if (!strcmp(arg, "copiousoutput")) {
-+		mc->copiousoutput = 1;
-+	    } else if (eq && !strcmp(arg, "test")) {
-+		mc->testcommand = eq;
-+	    } else if (eq && !strcmp(arg, "description")) {
-+		mc->label = eq;
-+	    } else if (eq && !strcmp(arg, "label")) { 
-+		mc->label = eq; /* bogus old name for description */
-+	    } else if (eq && !strcmp(arg, "print")) {
-+		mc->printcommand = eq;
-+	    } else if (eq && !strcmp(arg, "textualnewlines")) {
-+		ExceptionalNewline(mc->contenttype, atoi(eq));
-+	    } else if (strcmp(arg, "notes")) { /* IGNORE notes field */
-+		if (*arg && DoDebug) fprintf(stderr, "metamail: Ignoring mailcap flag: %s\n", arg);
-+	    }
-+	}
-+	s = t;
-+    }
-+    free(rawentry);
-+    return(1);
-+}
-+
-+ExitWithError(txt)
-+char *txt;
-+{
-+    if (txt) fprintf(stderr, "metamail: %s\n", txt);
-+    exit(-1);
-+}
-+
-+char *
-+FreshHeaderCopy(s)
-+char *s;
-+{
-+    char *t, *newcopy;
-+    int len;
-+
-+    while (s && *s && isspace((unsigned char) *s) && *s != '\n') ++s;
-+    t = index(s, '\n');
-+    while (t && (*(t+1) == ' ' || *(t+1) == '\t')) {
-+        t = index(t+1, '\n');
-+    }
-+    len = t ? (t-s+1) : (strlen(s)+1);
-+    newcopy = malloc(len+3);/* two extra bytes for a bizarre bug caused by the fact that FindParam calls FreshHeaderCopy and sometimes tacks on "--". */
-+    if (!newcopy) ExitWithError(nomem);
-+    strncpy(newcopy, s, len);
-+    newcopy[len] = 0;
-+    return(newcopy);
-+}
-+
-+Read822Prefix(PrintHeads, nestingdepth)
-+int PrintHeads, nestingdepth;
-+{
-+    int SawNewline = 1, bytes = 0, alloced = 1000, HasEncodedChars=0;
-+    int c, oldbytes;
-+    char *s, *t, *tmp;
-+
-+    if (!PrintSomeHeaders) PrintHeads = 0;
-+    mailheaders = malloc(alloced+1);
-+    if (!mailheaders) ExitWithError(nomem);
-+    strcpy(mailheaders, "MM_HEADERS=\n");
-+    bytes = 12;
-+yankagain:
-+    t = mailheaders + bytes;
-+    oldbytes = bytes-1; /* a hack for YankMode */
-+    while ((c = getc(InputFP)) != EOF) {
-+        if (++bytes >= alloced) {
-+            alloced += 1000;
-+            mailheaders = realloc(mailheaders, alloced);
-+            if (!mailheaders) ExitWithError(nomem);
-+            t = mailheaders + bytes - 1;
-+        }
-+        if (c == '\n') {
-+            if (SawNewline) break;
-+            SawNewline = 1;
-+        } else SawNewline = 0;
-+        *t++ = c;
-+    }
-+    *t = 0;
-+    --bytes;
-+    if (c == EOF) {
-+	if (nestingdepth) {
-+	    fprintf(stderr, "metamail: Incomplete multipart message -- unexpected EOF\n");
-+/*            exit(ProcessingErrors); */
-+        } else {
-+            if (YankMode) {
-+/*                ExitWithError("Could not extract a MIME message from the  body\n"); */
-+		fprintf(stderr, "metamail: Could not extract a MIME message from the body\n");
-+            } else {
-+		fprintf(stderr, "metamail: Could not find end of mail headers.\n");
-+/*                ExitWithError("Could not find end of mail headers"); */
-+            }
-+	}
-+	BoundaryCt=0;
-+	return -1;
-+    }
-+    for (s=mailheaders+oldbytes; *s; ++s) {
-+        if (*s == '\n' && (*(s+1) != ' ') && (*(s+1) != '\t')) {
-+	    if (!ContentType && !lc2strncmp(s, "\ncontent-type:", 14)) {
-+		char *dum;
-+                ContentType = FreshHeaderCopy(s+14);
-+		/* Eliminate white space embedded in content-type */
-+		while (1) {
-+		    dum = index(ContentType, '/');
-+		    if (!dum) break;
-+		    if (isspace(*(dum-1))) {
-+			for (--dum; *dum; ++dum) {
-+			    *dum = *(dum+1);
-+			}
-+		    } else if (isspace(*++dum)) {
-+			for ( ; *dum; ++dum) {
-+			    *dum = *(dum+1);
-+			}
-+		    } else {
-+			break;
-+		    }
-+		}
-+                StripTrailingSpace(ContentType);
-+                ParseContentParameters(ContentType);
-+                if (PrintHeads) maybephead(s+1);
-+            } else if (!ContentEncoding && !lc2strncmp(s, "\ncontent-transfer-encoding:", 27)) {
-+                ContentEncoding = FreshHeaderCopy(s+27);
-+                if (PrintHeads) maybephead(s+1);
-+            } else if (!lc2strncmp(s, "\nsubject:", 9)) {
-+                if (PrintHeads) maybephead(s+1);
-+                MailSubject = FreshHeaderCopy(s+9);
-+            } else if (!lc2strncmp(s, "\nfrom:", 6)) {
-+                if (PrintHeads) maybephead(s+1);
-+                MailFrom = FreshHeaderCopy(s+6);
-+            } else if (!lc2strncmp(s, "\ncontent-description:", 4)) {
-+                if(PrintHeads) maybephead(s+1);
-+                MailSubject = FreshHeaderCopy(s+21);
-+            } else {
-+                /* Print any with encoded variables */
-+                char *dum = s;
-+                while (dum) {
-+                    dum = index(dum, '?');
-+                    if (dum && *++dum == '=') break;
-+                }
-+                if (dum) {
-+                    char *nl = s+1;
-+                    while (nl) {
-+                        nl = index(nl, '\n');
-+                        if (nl && !isspace((unsigned char) *++nl)) break;
-+                    }
-+                    if (nl && nl > dum) ++HasEncodedChars;
-+                }
-+                if (HasEncodedChars) {
-+                    phead(s+1);
-+                } else if (PrintHeads) {
-+                    maybephead(s+1);
-+                }
-+            }
-+        }
-+    }
-+    /* Ugly, but effective */
-+    if (YankMode && !ContentType) {
-+        goto yankagain;
-+    }
-+    if (PrintHeads) printf("\n");
-+    if (!ContentType) {
-+        ContentType = "text/plain";
-+        CParamsUsed=0;
-+    }
-+    for (tmp=ContentType; *tmp; ++tmp) {
-+        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+    }
-+    return 0;
-+}
-+
-+PrepareMessage() {
-+    int c;
-+
-+    EncodingCode = ENCODING_NONE;
-+    if (ContentEncoding) {
-+        /* strip leading white space */
-+        while (*ContentEncoding && isspace((unsigned char) *ContentEncoding)) ++ContentEncoding;
-+        StripTrailingSpace(ContentEncoding);
-+        if (!lc2strcmp(ContentEncoding, "base64")) {
-+            EncodingCode = ENCODING_BASE64;
-+        } else if (!lc2strcmp(ContentEncoding, "quoted-printable")) {
-+            EncodingCode = ENCODING_QUOTEDPRINTABLE;
-+        } else if (!lc2strncmp (ContentEncoding, "x-uue", 5)) {
-+            fprintf (stderr, "WARNING:  Using nonstandard %s encoding, trying uuencode algorithm.\n", ContentEncoding);
-+ 	    EncodingCode = ENCODING_UUENCODE;
-+        } else {
-+            if (lc2strcmp(ContentEncoding, "none")
-+                 && !lc2strcmp(ContentEncoding, "8bit")
-+                 && !lc2strcmp(ContentEncoding, "7bit")) {
-+                fprintf(stderr, "Ignoring unrecognized Content-Transfer-Encoding value: %s\n", ContentEncoding);
-+            }
-+        }
-+    }
-+    if (EatLeadingNewlines) {
-+        while ((c = getc(InputFP)) != EOF) {
-+            if (c != '\n') {
-+                ungetc(c, InputFP);
-+                break;
-+            }
-+        }
-+    }
-+    SetUpEnvironment();  
-+}
-+
-+SetUpEnvironment() { 
-+    int i, j, environsize;
-+    char **newenviron, *mailervar, *summaryvar, *ctypevar, *s;
-+    static char ttyenv[15], debugenv[15], *noaskenv, pagerenv[15], *quietenv, rootenv[25];
-+
-+#if !defined(AMIGA) && !defined(MSDOS)
-+    /* Hack to make the code look similar for unix & dos */
-+#define putenv(var)        newenviron[i++] = var;
-+    for (environsize=0; environ[environsize]; ++environsize) {
-+	;
-+    }
-+    newenviron = (char **) malloc(sizeof(char *) * (17+environsize));
-+    if (!newenviron) ExitWithError(nomem);
-+#endif
-+    mailervar = malloc(13+strlen(MailerName));
-+    if (!mailervar) ExitWithError(nomem);
-+    sprintf(mailervar, "MM_MAILER=%s", MailerName);
-+    summaryvar = malloc(26 + strlen(MailFrom) + strlen(MailSubject));
-+    if (!summaryvar) ExitWithError(nomem);
-+    sprintf(summaryvar, "MM_SUMMARY=%s (from %s)", MailSubject, MailFrom);
-+    MailSummary = summaryvar+11;
-+    EliminateNastyChars(MailSummary);
-+    i = 0;
-+    if (ContentType) {
-+        int ctypelen = 22+strlen(ContentType);
-+        for (j=0; j<CParamsUsed; ++j) {
-+            ctypelen += 6 + strlen(CParams[j]) + strlen(CParamValues[j]);
-+        }
-+        ctypevar = malloc(ctypelen);
-+        if (!ctypevar) ExitWithError(nomem);
-+        for (s=ContentType; *s; ++s) {
-+            if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
-+        }
-+        while (isspace((unsigned char) *--s)) *s = 0;
-+        sprintf(ctypevar, "MM_CONTENTTYPE=%s", ContentType);
-+        for (j=0; j<CParamsUsed; ++j) {
-+            strcat(ctypevar, " ; ");
-+            strcat(ctypevar, CParams[j]);
-+            strcat(ctypevar, " = ");
-+            strcat(ctypevar, CParamValues[j]);
-+        }
-+        putenv(ctypevar);
-+    }
-+    putenv(mailheaders ? mailheaders : "MM_HEADERS=unknown");
-+    putenv(mailervar);
-+    putenv(summaryvar);
-+    sprintf(ttyenv, "MM_NOTTTY=%d", DefinitelyNotTty);
-+    putenv(ttyenv);
-+    sprintf(debugenv, "MM_DEBUG=%d", DoDebug);
-+    putenv(debugenv);
-+    s = getenv("MM_QUIET");
-+    if (!s) s = QuietDefault;
-+    quietenv = malloc(15 + strlen(s));
-+    if (!quietenv) ExitWithError(nomem);
-+    if (Quiet) {
-+        strcpy(quietenv, "MM_QUIET=1");
-+    } else {
-+        sprintf(quietenv, "MM_QUIET=%s", s);
-+    }
-+    putenv(quietenv);
-+    s = getenv("MM_NOASK");
-+    if (!s) s = NoAskDefault;
-+    noaskenv = malloc(15 + strlen(s));
-+    if (!noaskenv) ExitWithError(nomem);
-+    if (MightAskBeforeExecuting) {
-+        sprintf(noaskenv, "MM_NOASK=%s", s);
-+    } else {
-+        strcpy(noaskenv, "MM_NOASK=1");
-+    }
-+    putenv(noaskenv);
-+    s = getenv("MM_RUNASROOT");
-+    if (!s) s = "0";
-+    sprintf(rootenv, "MM_RUNASROOT=%s", s);
-+    putenv(rootenv);
-+    sprintf(pagerenv, "MM_USEPAGER=%d", MaybePageOutput);
-+    putenv(pagerenv);
-+#if !defined(AMIGA) && !defined(MSDOS)
-+    for (j=0; j<environsize; ++j) {
-+        if (strncmp(environ[j], "MM_", 3) || !strncmp(environ[j], "MM_CHARSET", 10)) {
-+            putenv(environ[j]);
-+        }
-+    }
-+    newenviron[i] = NULL;
-+    environ = newenviron;
-+    if (DoDebug) {
-+        printf("Here is the environment:\n\n");
-+        system("printenv");
-+    }
-+#endif
-+}
-+
-+
-+#ifdef AMIGA
-+int
-+putenv(def)
-+char *def;
-+{
-+    char *cp;
-+    char nameBuf[100];
-+    FILE *envFile;
-+
-+    if ((cp = index(def, '=')) == NULL || def == cp) {
-+        return(1);
-+    }
-+
-+    strcpy(nameBuf, "ENV:");
-+    strncat(nameBuf, def, cp - def);
-+    nameBuf[(cp - def) + 4] = 0;
-+    cp++;               /* Now points to value part of environment string. */
-+
-+    if ((envFile = fopen(nameBuf, "w")) == NULL) {
-+        return(2);
-+    }
-+
-+    fputs(cp, envFile);
-+    fclose(envFile);
-+
-+    return(0);
-+}
-+#endif
-+
-+OKToRun(ctype, progname, label)
-+char *ctype, *progname, *label;
-+{
-+    char AnsBuf[100], *s;
-+
-+    if (DoInBackground) return(1);
-+    if (DefinitelyNotTty || MustNotBeTty) return(1);
-+    while (1) {
-+        printf("\n");
-+        if (label) {
-+            printf("This message contains %s.\nDo you want to view it using the '%s' command (y/n) [y] ? ", label, ShortCommand(progname));
-+        } else {
-+            printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
-+        }
-+        s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-+        if (!s) return(0); /* EOF */
-+	while (s && *s && isspace((unsigned char) *s)) ++s;
-+	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
-+	if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
-+	    return(0);
-+	}
-+	printf("Please answer yes or no.\n");
-+    }
-+}
-+
-+EliminateNastyChars(s)
-+char *s;
-+{
-+    if (s) for( ; *s ;++s) {
-+        if (isalnum((unsigned char) *s)) continue;
-+	if (index(" ,.;:/?\\|[]{}()*&^%#@-_=+~<>\"", *s)) continue;
-+	if (*s == '\'' || *s == '`') {
-+	    *s = '"';
-+	} else {
-+	    *s = ' ';
-+	}
-+    }
-+}
-+
-+StripTrailingSpace(s)
-+char *s;
-+{
-+    char *t = s+strlen(s) -1;
-+    while (isspace((unsigned char) *t) && (t >= s)) *t-- = 0;
-+}
-+
-+static char *KeyHeads=NULL;
-+static char **KeyHeadList;
-+static int KeyKeep = 0;
-+
-+void setKeyHeads()
-+{
-+    char *s;
-+    int numkeys = 0;
-+
-+    if ((KeyHeads = getenv("KEYHEADS")) != 0) {
-+        for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
-+    } else if ((KeyHeads = getenv("KEYIGNHEADS")) != 0) {
-+	for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
-+	KeyKeep = 1;
-+    } else {
-+	static char khtmp[] = "to:cc:subject:from:content-description:date";
-+	KeyHeads = khtmp;
-+    }
-+    for (s=KeyHeads; *s; ++s) if (*s == ':') ++numkeys;
-+    numkeys += 2;
-+    KeyHeadList = (char **) malloc((numkeys) * sizeof(char *));
-+    if (!KeyHeadList) ExitWithError(nomem);
-+    numkeys = 0;
-+    KeyHeadList[0] = KeyHeads;
-+    for(s=KeyHeads; *s; ++s) {
-+	if (*s == ':') {
-+	    *s = '\0';
-+	    KeyHeadList[++numkeys] = s+1;
-+	}
-+    }
-+    KeyHeadList[++numkeys] = NULL;
-+}
-+
-+/* find the first colon in a header line which appears before any spaces or control characters */
-+char *
-+findcolon(hdr)
-+char *hdr;
-+{
-+    while (*hdr && !isspace(*hdr) && !iscntrl(*hdr))
-+	if (*hdr == ':') return hdr;
-+	else hdr++;
-+    return 0;
-+}
-+
-+/* check the header given to see if it matches any in the KeyHeadList */
-+maybephead(hdr)
-+char *hdr;
-+{
-+    char *s;
-+    int numkeys=0;
-+
-+    if (!KeyHeads) setKeyHeads();
-+
-+    s = findcolon(hdr);
-+    if (s) {
-+	int len = s - hdr;
-+        for (numkeys=0; KeyHeadList[numkeys]; ++numkeys) {
-+            if (!strcmp(KeyHeadList[numkeys], "*")
-+                 || !lc2strncmp(hdr, KeyHeadList[numkeys], len)) {
-+		if (!KeyKeep) phead(hdr);
-+		return;
-+            }
-+        }
-+	if (KeyKeep) phead(hdr);
-+	return;
-+    }
-+    if (!strncmp(hdr, "From ", 5) || !strncmp(hdr, ">From ", 6)) {
-+	for (numkeys = 0; KeyHeadList[numkeys]; ++numkeys) {
-+	    if (!strcmp(KeyHeadList[numkeys], "*")
-+		 || !lc2strncmp(">from", KeyHeadList[numkeys], 5)) {
-+		if (!KeyKeep) phead(hdr);
-+		return;
-+	    }
-+	}
-+	if (KeyKeep) phead(hdr);
-+    }
-+}
-+
-+/* This next routine prints out a mail header, and needs to deal with the new extended charset headers. */
-+phead(s)
-+char *s;
-+{
-+    char *t = s;
-+
-+    while (1) {
-+	t = index(t, '\n');
-+	if (!t) break;
-+        if (!isspace((unsigned char) *(t+1))) {
-+            *t = 0;
-+	    break;
-+	} else ++t;
-+    }
-+    PrintHeader(s, 1);
-+    printf("\n");
-+    if (t) *t = '\n';
-+}
-+
-+static char PrevCharset[100] = "us-ascii";
-+
-+/* This is the part that actually handles the charset issues */
-+void PrintHeader(s, ShowLeadingWhitespace)
-+char *s;
-+int ShowLeadingWhitespace;
-+{
-+    char *charset, *encoding, *txt, *txtend, TmpFile[TMPFILE_NAME_SIZE];
-+    int ecode = ENCODING_NONE, CorrectedCharset = 0;
-+    FILE *fp;
-+
-+    while (*s && (*s != '=')) {
-+        if (isspace((unsigned char) *s)) {
-+            if (ShowLeadingWhitespace) {
-+                putchar(' ');
-+            }
-+        } else {
-+            putchar(*s);
-+            if (!CorrectedCharset) {
-+                CorrectedCharset = 1;
-+                strcpy(PrevCharset, "us-ascii");
-+            }
-+        }
-+        if (!ShowLeadingWhitespace) {
-+            /* Only at most one leading space is ignored */
-+            ShowLeadingWhitespace = 1;
-+        }
-+        ++s;
-+    }
-+    if (!*s) return;
-+    if (*(s+1) != '?') {
-+        putchar('=');
-+        PrintHeader(++s, 1);
-+        return;
-+    }
-+    charset = s+2;
-+    encoding = index(charset, '?');
-+    if (!encoding) {
-+        putchar('=');
-+        PrintHeader(++s,1);
-+        return;
-+    }
-+    txt = index(encoding+1, '?');
-+    if (!txt) {
-+        putchar('=');
-+        PrintHeader(++s, 1);
-+        return;
-+    }
-+    txtend = txt;
-+    do {
-+        txtend = index(txtend+1, '?');
-+    } while(txtend && (*(txtend+1) != '='));
-+    if (!txtend) {
-+        putchar('=');
-+        PrintHeader(++s, 1);
-+    }
-+    /* Proper parse! Ready to dissect... */
-+    *encoding = 0;
-+    *txt = 0;
-+    *txtend = 0;
-+    if ((*(encoding+1) == 'q') || (*(encoding+1) == 'Q')) {
-+        ecode = ENCODING_QUOTEDPRINTABLE;
-+    } else if ((*(encoding+1) == 'b') || (*(encoding+1) == 'B')) {
-+        ecode = ENCODING_BASE64;
-+    } else {
-+        fprintf(stderr, "Bad encoding value in non-ASCII header string: %s\n", encoding+1);
-+    }
-+    if (lc2strcmp(charset, PrevCharset)) {
-+        char *s2, *charsetinuse;
-+
-+        strcpy(PrevCharset, charset);
-+        for (s2=PrevCharset; *s2; ++s2) {
-+            if (isupper((unsigned char) *s2)) *s2 = tolower((unsigned char) *s2);
-+        }
-+        charsetinuse = getenv("MM_CHARSET");
-+        if (!charsetinuse || lc2strcmp(charsetinuse, PrevCharset)) {
-+            printf("[** %s charset **] ", charset);
-+        }
-+    }
-+    if (ecode == ENCODING_NONE) {
-+        printf(txt+1);
-+    } else {
-+        /* What follows is REALLY bogus, but all my encoding stuff is pipe-oriented right now... */
-+        MkTmpFileName(TmpFile);
-+        fp = fopen(TmpFile, WRITE_BINARY);
-+        if (!fp) {
-+            fprintf(stderr, "Could not open temporary file\n");
-+        } else {
-+            char *t;
-+            for (t=txt+1; *t; ++t) {
-+                if (*t == '_') {
-+                    putc(' ', fp);
-+                } else if (*t == '\n') {
-+                    putc(' ', fp);
-+                } else {
-+                    putc(*t, fp);
-+                }
-+            }
-+            fclose(fp);
-+            fp = fopen(TmpFile, "r");
-+            if (!fp) {
-+                fprintf(stderr, "Could not open temporary file\n");
-+            } else {
-+                TranslateInputToOutput(fp, stdout, ecode, "text");
-+                fclose(fp);
-+            }
-+            unlink(TmpFile);
-+        }
-+    }
-+    *encoding = '?';
-+    *txt = '?';
-+    *txtend = '?';
-+    PrintHeader(txtend + 2, 0);
-+}
-+
-+BuildCommand(Buf, controlstring, TmpFileName, UsedTmpFileName, PartsWritten)
-+char *Buf, *controlstring, *TmpFileName;
-+int *UsedTmpFileName;
-+struct part **PartsWritten;
-+{
-+    char *from, *to, *s, *p, *tmp;
-+    int prefixed = 0, UsedBigFile=0, UsedLittleFiles=0, numparts=0;
-+    struct part *firstpart=NULL, *thispart=NULL, *tmppart=NULL;
-+
-+    if (UsedTmpFileName) *UsedTmpFileName = 0;
-+    if (PartsWritten) *PartsWritten = NULL;
-+    for (from=controlstring, to=Buf; *from; ++from) {
-+        if (prefixed) {
-+            prefixed = 0;
-+            switch(*from) {
-+                case '%':
-+                    *to++ = '%';
-+                    break;
-+                case 'n':
-+                case 'F':
-+		    if (!PartsWritten) {
-+			fprintf(stderr, "metamail: Bad mailcap \"test\" clause: %s\n", controlstring);
-+			ExitWithError("%%n and %%F may not be used in \"test\" clauses.  Execution terminated.");
-+		    }
-+                    if (UsedBigFile) {
-+                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
-+                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
-+                    }
-+                    if (!UsedLittleFiles) {
-+                        /* Set up parts */
-+                        char *LineBuf, *boundary, TmpFileNameBuf[TMPFILE_NAME_SIZE];
-+                        char *oldct, *oldce, *newct;
-+                        int currct, boundarylen, newctlen, j;
-+                        int oldcparmsused, oldcparamsalloced;
-+                        char **oldcparams, **oldcparamvalues;
-+                        FILE *headfp;
-+
-+                        LineBuf = malloc(LINE_BUF_SIZE);
-+                        if (!LineBuf) ExitWithError(nomem);
-+                        boundary = FindParam("boundary");
-+			if (!boundary) {
-+			    fprintf(stderr, "Bad message format: This multipart message has no boundary parameter,\n");
-+			    fprintf(stderr, "but the mailcap entry for %s uses %%F or %%n.\n\n", ContentType);
-+			    ExitWithError("A change to the mailcap file might make this message viewable.");
-+                        }
-+                        if (boundary[0] == '"') {
-+                            boundary=UnquoteString(boundary);
-+                        }
-+                        sprintf(LineBuf, "--%s", boundary);
-+                        strcpy(boundary, LineBuf);
-+                        boundarylen = strlen(boundary);
-+                        if (BoundaryCt >= BoundaryAlloc) {
-+                            BoundaryAlloc += 5;
-+                            if (Boundaries) {
-+                                Boundaries = (char **) realloc(Boundaries, BoundaryAlloc*sizeof(char *));
-+                            } else {
-+                                Boundaries = (char **) malloc(BoundaryAlloc*sizeof(char *));
-+                            }
-+                            if (!Boundaries) ExitWithError(nomem);
-+                        }
-+                        Boundaries[BoundaryCt++] = boundary;
-+                        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
-+                            if (!strncmp(LineBuf, boundary, boundarylen)
-+                                 && ((LineBuf[boundarylen] == '\n')
-+                                      || (LineBuf[boundarylen] == '-'
-+                                           && LineBuf[boundarylen+1] == '-'
-+                                           && LineBuf[boundarylen+2] == '\n'))) {
-+                                break;
-+                            }
-+                        }
-+                        free(LineBuf);
-+                        currct = BoundaryCt;
-+                        oldct=ContentType;
-+                        oldce=ContentEncoding;
-+                        oldcparmsused = CParamsUsed;
-+                        oldcparamsalloced = CParamsAlloced;
-+                        oldcparams = CParams;
-+                        oldcparamvalues = CParamValues;
-+                        CParams = NULL;
-+                        CParamValues = NULL;
-+                        CParamsUsed = 0;
-+                        CParamsAlloced = 0;
-+                        while(currct == BoundaryCt) {
-+                            tmppart = (struct part *) malloc(sizeof(struct part));
-+                            if (!tmppart) ExitWithError(nomem);
-+                            if (firstpart) {
-+                                thispart->next = tmppart;
-+                                thispart = tmppart;
-+                            } else {
-+                                firstpart = thispart = tmppart;
-+                            }
-+                            tmppart->next = NULL;
-+                            ContentType=NULL;
-+                            ContentEncoding=NULL;
-+                            Read822Prefix(0,0);
-+                            PrepareMessage();
-+                            newctlen=5+strlen(ContentType);
-+                            for (j=0; j<CParamsUsed; ++j) {
-+                                newctlen += 11+strlen(CParams[j]) + strlen(CParamValues[j]);
-+                            }
-+                            newct= malloc(newctlen);
-+                            if (!newct) ExitWithError(nomem);
-+                            strcpy(newct, "'");
-+                            strcat(newct, ContentType);
-+                            for (j=0; j<CParamsUsed; ++j) {
-+                                strcat(newct, "; ");
-+                                strcat(newct, CParams[j]);
-+                                if (CParamValues[j][0] == '\"') {
-+                                    strcat(newct, " = ");
-+                                    strcat(newct, CParamValues[j]);
-+                                } else {
-+                                    strcat(newct, " = \"");
-+                                    strcat(newct, CParamValues[j]);
-+                                    strcat(newct, "\"");
-+                                }
-+                            }
-+                            strcat(newct, "'");
-+                            thispart->ctype = newct;
-+                            MkTmpFileName(TmpFileNameBuf);
-+                            thispart->fname = malloc(1+strlen(TmpFileNameBuf));
-+                            if (!thispart->fname) ExitWithError(nomem);
-+                            strcpy(thispart->fname, TmpFileNameBuf);
-+                            WriteTmpFile(thispart->fname, thispart->ctype);
-+                            strcat(TmpFileNameBuf, "H");
-+                            headfp = fopen(TmpFileNameBuf, "w");
-+                            if (headfp) {
-+                                fputs(mailheaders+12, headfp);
-+                                /* The +12 gets rid of MM_HEADERS=\n */
-+                                fclose(headfp);
-+                            }
-+                            ++numparts;
-+                        }
-+                        ContentType=oldct;
-+                        ContentEncoding=oldce;
-+                        CParamsUsed = oldcparmsused;
-+                        CParamsAlloced = oldcparamsalloced;
-+                        CParams = oldcparams;
-+                        CParamValues = oldcparamvalues;
-+                        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
-+                            we must throw it away.*/
-+                        if (BoundaryCt > 0) {
-+                            ConsumeRestOfPart(NULL);
-+                        }
-+                        *PartsWritten = firstpart;
-+                        UsedLittleFiles=1;
-+                    }
-+                    if (*from == 'n') {
-+                        char numbuf[10];
-+                        sprintf(numbuf, "%d", numparts);
-+                        strcpy(to, numbuf);
-+                        to += strlen(numbuf);
-+                    } else { /* %F */
-+                        for (tmppart = firstpart; tmppart != NULL; tmppart = tmppart->next) {
-+                            sprintf(to, "%s %s ", tmppart->ctype, tmppart->fname);
-+                            to += (strlen(tmppart->ctype) + strlen(tmppart->fname) + 2);
-+                        }
-+                    }
-+                    break;
-+                case 's':
-+                    if (UsedLittleFiles) {
-+                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
-+                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
-+                    }
-+                    if (TmpFileName) {
-+                        strcpy(to, TmpFileName);
-+                        to += strlen(TmpFileName);
-+                        if (UsedTmpFileName) ++(*UsedTmpFileName);
-+                    }
-+                    UsedBigFile = 1;
-+                    break;
-+                case '{':
-+                    s = index(from, '}');
-+                    if (!s) {
-+                        fprintf(stderr, "Ignoring ill-formed parameter reference in mailcap file: %s\n", from);
-+                        break;
-+                    }
-+                    ++from;
-+                    *s = 0;
-+                    /* put in lower case */
-+                    for (tmp=from; *tmp; ++tmp) {
-+                        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+                    }
-+                    p = FindParam(from);
-+                    if (p && p[0] == '"') {
-+                        p=UnquoteString(p);
-+                    }
-+                    if (!p) p = "";
-+                    *to++ = '\'';
-+                    strcpynoquotes(to, p);
-+                    to += strlen(p);
-+                    *to++ = '\'';
-+                    *s = '}'; /* restore */
-+                    from = s;
-+                    break;
-+                case 't':
-+                    /* type/subtype */
-+                    strcpynoquotes(to, ContentType);
-+                    to += strlen(ContentType);
-+                    break;
-+                default:
-+                    fprintf(stderr, "Ignoring unrecognized format code in mailcap file: %%%c\n", *from);
-+                    break;
-+            }
-+        } else if (*from == '%') {
-+            prefixed = 1;
-+        } else {
-+            *to++ = *from;
-+        }
-+    }
-+    *to = 0;
-+}
-+
-+strcpynoquotes(t,f)
-+char *t, *f;
-+{
-+    static char *badchars="|<>%*?\"`'";
-+
-+    while (*f) {
-+        if (index(badchars, *f)) *t++ = ' '; else *t++ = *f;
-+        ++f;
-+    }
-+}
-+
-+WriteTmpFile(fname, ctype)
-+char *fname;
-+char *ctype;
-+{
-+    FILE *fpout;
-+    int retval = 0;
-+
-+    fpout = fopen(fname, WRITE_BINARY);
-+    if (!fpout) {
-+        perror("WriteTmpFile");
-+        ExitWithError("Can't create temporary file");
-+    }
-+    TranslateInputToOutput(InputFP, fpout, EncodingCode, ctype);
-+    if (ftell(fpout) == 0) retval = 1;
-+    if (fclose(fpout)) ExitWithError("Can't write temporary file");
-+    return(retval);
-+}
-+
-+
-+TranslateInputToOutput(InputFP, OutputFP, Ecode, ctype)
-+FILE *InputFP, *OutputFP;
-+int Ecode;
-+char *ctype;
-+{
-+    int InMultipart = BoundaryCt > 0 ? 1 : 0;
-+
-+    switch(Ecode) {
-+        case ENCODING_BASE64:
-+            from64(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt, DoesNeedPortableNewlines(ctype));
-+            break;
-+        case ENCODING_QUOTEDPRINTABLE:
-+            fromqp(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt);
-+            break;
-+ 	case ENCODING_UUENCODE:
-+ 	    fromuue(InputFP, OutputFP, InMultipart ? Boundaries: NULL, &BoundaryCt);
-+ 	    break;
-+        default:
-+            ConsumeRestOfPart(OutputFP);
-+    }
-+#if !defined(AMIGA) && !defined(MSDOS)
-+    if (UsingStandardInput && feof(InputFP) && !freopen("/dev/tty", "r", stdin)) {
-+        fprintf(stderr, "Warning: Cannot freopen /dev/tty to stdin");
-+    } else InputFP = stdin;
-+#endif
-+}
-+
-+CreateNewWindowPrefix(Prefix)
-+char *Prefix;
-+{
-+    char *override = getenv("TERMINAL_CMD");
-+    if (override) {
-+        strcpy(Prefix, override);
-+#ifdef AMIGA
-+    } else {
-+        /* The window should *not* run in background. We are thus unable
-+         * to use NewWsh or NewCLI.
-+         */
-+        /* strcpy(Prefix, "newwsh CMD "); */
-+        Prefix[0] = 0;
-+#else
-+    } else if (getenv("DISPLAY")) {
-+        /* X11 */
-+        strcpy(Prefix, "xterm -title '");
-+        strcat(Prefix, MailSummary);
-+        strcat(Prefix, "' -e ");
-+    } else if (getenv("WINDOW_PARENT")) {
-+        /* SunView */
-+        strcpy(Prefix, "shelltool ");
-+    } else if (getenv("WMHOST")) {
-+        /* old Andrew WM */
-+        strcpy(Prefix, "h19 ");
-+    } else {
-+        /* last resort is to look for /dev/tty */
-+        if (!freopen("/dev/tty", "r", stdin)){
-+            ExitWithError("Don't know how to create a terminal window");
-+        }
-+        InputFP = stdin;
-+        fprintf(stderr, "Warning, reopened /dev/tty, could be strange.\n");
-+        Prefix[0] = 0;
-+#endif
-+    }
-+}
-+
-+int HasSavedTtyState=0;
-+#if !defined(AMIGA) && !defined(MSDOS)
-+#ifdef SYSV
-+static struct termio MyTtyStateIn, MyTtyStateOut;
-+#else
-+static struct sgttyb MyTtyStateIn, MyTtyStateOut;
-+#endif
-+#endif
-+
-+SaveTtyState() {
-+    /* Bogus -- would like a good portable way to reset the terminal state here */
-+#if !defined(AMIGA) && !defined(MSDOS)
-+#ifdef SYSV
-+    ioctl(fileno(stdin), TCGETA, &MyTtyStateIn);
-+    ioctl(fileno(stdout), TCGETA, &MyTtyStateOut);
-+#else
-+    gtty(fileno(stdin), &MyTtyStateIn);
-+    gtty(fileno(stdout), &MyTtyStateOut);
-+#endif
-+    HasSavedTtyState = 1;
-+#endif
-+}
-+
-+RestoreTtyState() {
-+#if !defined(AMIGA) && !defined(MSDOS)
-+#ifdef SYSV
-+    if (HasSavedTtyState) {
-+        ioctl(fileno(stdout), TCSETA, &MyTtyStateOut);
-+        ioctl(fileno(stdin), TCSETA, &MyTtyStateIn);
-+    }
-+#else
-+    if (HasSavedTtyState) {
-+        stty(fileno(stdout), &MyTtyStateOut);
-+        stty(fileno(stdin), &MyTtyStateIn);
-+    }
-+#endif
-+#endif
-+}
-+
-+NeedToAskBeforeExecuting(type)
-+char *type;
-+{
-+    struct NoAskItem *nai;
-+    if (!MightAskBeforeExecuting || DoInBackground) return(0);
-+    for (nai = FirstNoAskItem; nai; nai = nai->next) {
-+        if (CtypeMatch(type, nai->type)) return(0);
-+    }
-+    return(1);
-+}
-+
-+NeedToBeQuiet(cmd)
-+char *cmd;
-+{
-+    struct NoAskItem *nai;
-+    for (nai = FirstQuietItem; nai; nai = nai->next) {
-+        if (!lc2strcmp(nai->type, cmd)) return(1);
-+    }
-+    return(0);
-+}
-+
-+CtypeMatch(ctype, pat)
-+char *ctype, *pat;
-+{
-+    int len;
-+    char pat2[200];
-+
-+    if (!lc2strcmp(ctype, pat)) {
-+        return(1); /* exact match, case-insensitive */
-+    }
-+    if (index(pat, '/') == NULL) {
-+        /* implicit wildcard */
-+        strcpy(pat2, pat);
-+        strcat(pat2, "/*");
-+        pat = pat2;
-+    }
-+    len = strlen(pat);
-+    if ((pat[--len] == '*')
-+         && (pat[--len] == '/')
-+         && (!lc2strncmp(ctype, pat, len))
-+         && ((ctype[len] == '/') || (ctype[len] == '\0'))){
-+        /* wildcard match */
-+        return(1);
-+    }
-+    return(0);
-+}
-+
-+ExecuteCommand(cmd, really)
-+char *cmd;
-+int really;
-+{
-+    int code;
-+    if (!Quiet || DoDebug) {
-+        if (!NeedToBeQuiet(ShortCommand(cmd))) {
-+            printf("---Executing: %s\n", DoDebug ? cmd : ShortCommand(cmd));
-+        } else if (EatLeadingNewlines) {
-+            printf("\n");
-+        } 
-+        fflush(stdout);
-+    }
-+    if (really) {
-+        fflush(stdout); fflush(stderr);
-+        code = system(cmd);
-+        if (DoDebug) printf("Command exit status: %d\n", code);
-+#ifdef MSDOS
-+	code = 0;	/* system doesn't return a valid exit code on MS-DOS */
-+#endif
-+        return(code);
-+    }
-+    return(0);
-+}
-+
-+MkTmpFileName(name)
-+char *name;
-+{
-+  int   length  = MAX_FILE_NAME_SIZE;
-+  char* tmpname = NULL;
-+
-+#ifdef AMIGA
-+    strcpy(name, "T:mmXXXXXX");
-+    close(mkstemp(name));
-+#else
-+  #ifndef MSDOS
-+    sprintf(name, "%s/mm.XXXXXX", tmproot);
-+    close(mkstemp(name));
-+  #else
-+     strcpy(name, "TXXXXXX");
-+     if (!close(mkstemp(name)))
-+         name[0] = 0;
-+     else
-+         if (DoDebug) printf("temp name = \"%s\"\n", name);
-+  #endif
-+#endif
-+     fprintf( stderr, "strlen\n");
-+     if (name) 
-+       length = strlen(name);
-+
-+     fprintf( stderr, "after strlen\n");
-+     tmpname = malloc( sizeof(char) * length );
-+     fprintf( stderr, "after malloc\n");
-+     strcpy( tmpname, name );
-+     fprintf( stderr, "after strcpy\n");
-+     dlist_insertnew( &TmpNameListTail, (void*) tmpname );
-+     fprintf( stderr, "after dlistinsert\n");
-+     tmpname = NULL;
-+}
-+
-+void
-+CleanupTmpFiles( void )
-+{
-+  DList* help = TmpNameListTail;
-+  DList* old = NULL;
-+  
-+  while (help) {
-+    if (unlink( (char*) help->data ) < 0) 
-+      if (DoDebug) 
-+	fprintf( stderr, "error unlinking %s\n", (char*) help->data );
-+    old = help;
-+    help = help->prev;
-+    free( old );
-+  }
-+  
-+  TmpNameListTail = NULL;
-+}
-+
-+#ifdef AMIGA
-+/* We need to execute a command and then remove a file "fileToRemove".
-+ * MkRmScript() creates a shell script that accomplishes this. The script
-+ * is written to a temporary file. The name of the script is returned.
-+ */
-+char *
-+MkRmScript(command, fileToRemove, nameBuf)
-+char *command;
-+char *fileToRemove;
-+char *nameBuf;
-+{
-+    FILE *script;
-+
-+    MkTmpFileName(nameBuf);
-+    if ((script = fopen(nameBuf, "w")) == NULL) {
-+        fprintf(stderr, "Unable to open %s for writing\n", nameBuf);
-+        exit(1);
-+    }
-+    fprintf(script, ".BRA {\n.KET }\n%s\nDelete %s QUIET\n", command, fileToRemove);
-+    fclose(script);
-+    return(nameBuf);
-+}
-+#endif
-+
-+void
-+ConsumeRestOfPart(outfp)
-+FILE *outfp;
-+{
-+    char *Buf;
-+    int c;
-+
-+    if (BoundaryCt <= 0) {
-+        while ((c=getc(InputFP)) != EOF) {
-+            if (outfp) putc(c, outfp);
-+        }
-+        return;
-+    }
-+    Buf = malloc(LINE_BUF_SIZE);
-+    if (!Buf) ExitWithError(nomem);
-+    while (fgets(Buf, LINE_BUF_SIZE, InputFP)) {
-+        if ((BoundaryCt > 0)
-+             && (Buf[0] == '-')
-+             && (Buf[1] == '-')
-+             && PendingBoundary(Buf, Boundaries, &BoundaryCt)) {
-+            break;
-+        }
-+        if (outfp) fputs(Buf, outfp);
-+    }
-+    free(Buf);
-+}
-+
-+char *paramend(s)
-+char *s;
-+{
-+    int inquotes=0;
-+    while (*s) {
-+        if (inquotes) {
-+            if (*s == '"') {
-+                inquotes = 0;
-+            } else if (*s == '\\') {
-+                ++s; /* skip a char */
-+            }
-+        } else if (*s == ';') {
-+            return(s);
-+        } else if (*s == '"') {
-+            inquotes = 1;
-+        }
-+        ++s;
-+    }
-+    return(NULL);
-+}        
-+
-+void
-+ParseContentParameters(ct)
-+char *ct;
-+{
-+    char *s, *t, *eq;
-+
-+    CParamsUsed = 0;
-+    s = index(ct, ';');
-+    if (!s) return;
-+    *s++ = 0;
-+    do {
-+        t = paramend(s);
-+        if (t) *t++ = 0;
-+        eq = index(s, '=');
-+        if (!eq) {
-+            fprintf(stderr, "Ignoring unparsable content-type parameter: '%s'\n", s);
-+            JunkParameter=Cleanse(s);
-+        } else {
-+            if (CParamsUsed >= CParamsAlloced) {
-+                CParamsAlloced += 10;
-+                if (CParams) {
-+                    CParams = (char **) realloc(CParams, (1+CParamsAlloced) * sizeof (char *));
-+                    CParamValues = (char **) realloc(CParamValues, (1+CParamsAlloced) * sizeof (char *));
-+                } else {
-+                    CParams = (char **) malloc((1+CParamsAlloced) * sizeof (char *));
-+                    CParamValues = (char **) malloc((1+CParamsAlloced) * sizeof (char *));
-+                }
-+                if (!CParams || !CParamValues) ExitWithError(nomem);
-+            }
-+            *eq++ = 0;
-+            s = Cleanse(s);
-+            CParams[CParamsUsed] = s;
-+            /* strip leading white space */
-+            while (*eq && isspace((unsigned char) *eq)) ++eq;
-+            /* strip trailing white space */
-+            StripTrailingSpace(eq);
-+            CParamValues[CParamsUsed++] = eq; 
-+            if (DoDebug) printf("NEW PARAMETER: %s VALUE: %s\n", s, eq);
-+        }
-+        s = t;
-+    } while (t);
-+}
-+
-+char *FindParam(s)
-+char *s;
-+{
-+    int i;
-+    for (i=0; i<CParamsUsed; ++i) {
-+        if (!strcmp(s, CParams[i])) {
-+            return(CParamValues[i]);
-+        }
-+    }
-+    return(NULL);
-+}
-+
-+#ifdef MSDOS
-+system2(s)
-+char *s;
-+{
-+    printf("system2: \"%s\"\n", s);
-+    return(0);
-+}
-+#endif
-+
-+strcatquoting(s1, s2)
-+char *s1;
-+char *s2;
-+{
-+    strcat(s1, s2);
-+#ifdef NOTDEF
-+    while (*s1) ++s1;
-+    while (*s2) {
-+        if (*s2 == '\"' || *s2 == '\\') *s1++ = '\\';
-+        *s1++ = *s2++;
-+    }
-+    *s1 = '\0';
-+#endif
-+}
-+
-+PauseForUser() {
-+#if defined(MSDOS) || defined(AMIGA)
-+    char Buf[100];
-+#endif
-+
-+    if (DefinitelyNotTty || MustNotBeTty) return;	
-+#if defined(MSDOS) || defined(AMIGA)
-+    printf("Press RETURN to go on\n");
-+    gets(Buf);
-+#else
-+    fflush(stdout);
-+    SaveTtyState();
-+    if (StartRawStdin() != -1) {
-+        printf("--Press any key to go on.--");
-+    } else {
-+        printf("Press RETURN to go on.\n");
-+    }
-+    fflush(stdout);
-+    getchar();
-+    RestoreTtyState();
-+    printf("\n");
-+#endif
-+}
-+
-+StartRawStdin() {
-+#if !defined(AMIGA) && !defined(MSDOS)
-+#ifdef SYSV
-+    struct termio   orterm, fterm;
-+    ioctl(0, TCGETA, &orterm);	/* get current (i.e. cooked) termio */
-+    fterm = orterm;		/* get termio to modify */
-+
-+    fterm.c_lflag &= ~ICANON;	/* clear ICANON giving raw mode */
-+    fterm.c_cc[VMIN] = 1;	/* set MIN char count to 1 */
-+    fterm.c_cc[VTIME] = 0;	/* set NO time limit */
-+    return ioctl(0, TCSETAW, &fterm);	/* modify termio for raw mode */
-+#else
-+    struct sgttyb ts;
-+    gtty(fileno(stdin), &ts);
-+    ts.sg_flags |= RAW;
-+    return stty(fileno(stdin), &ts);
-+#endif
-+#else
-+    return(-1);
-+#endif
-+}
-+
-+
-+int IsDirectory(fname)
-+char *fname;
-+{
-+    struct stat stbuf;
-+    if (stat(fname, &stbuf)) {
-+	return(-1);
-+    }
-+    return (((stbuf.st_mode & S_IFMT) == S_IFDIR) ? 1 : 0);
-+}
-+
---- metamail-2.7.orig/src/metamail/uue.c
-+++ metamail-2.7/src/metamail/uue.c
-@@ -0,0 +1,124 @@
-+#include <stdio.h>
-+
-+/*
-+ * hack to metamail to decode uuencoded bodyparts
-+ * Written by Keith Moore, February 1992
-+ */
-+
-+uueget (ptr, outfp, n)
-+char *ptr;
-+FILE *outfp;
-+{
-+    unsigned char c1, c2, c3;
-+    unsigned char p0, p1, p2, p3;
-+
-+    p0 = (ptr[0] - ' ') & 0x3F;
-+    p1 = (ptr[1] - ' ') & 0x3F;
-+    p2 = (ptr[2] - ' ') & 0x3F;
-+    p3 = (ptr[3] - ' ') & 0x3F;
-+    
-+    c1 = p0 << 2 | p1 >> 4;
-+    c2 = p1 << 4 | p2 >> 2;
-+    c3 = p2 << 6 | p3;
-+
-+    if (n >= 1)
-+	putc (c1, outfp);
-+    if (n >= 2)
-+	putc (c2, outfp);
-+    if (n >= 3)
-+	putc (c3, outfp);
-+}
-+
-+
-+getline (buf, size, fp)
-+char *buf;
-+int size;
-+FILE *fp;
-+{
-+    int c;
-+    char *ptr = buf;
-+
-+    for (c = 0; c < size; ++c)
-+	buf[c] = ' ';
-+    do {
-+	c = getc (fp);
-+	if (c == EOF) {
-+	    *ptr = '\0';
-+	    return (ptr == buf) ? -1 : 0;
-+	}
-+	else if (c == '\n' || c == '\r') {
-+	    *ptr = '\0';
-+	    return 0;
-+	}
-+	else if (ptr == buf && c == '>') /* ">From" line hack */
-+	    continue;
-+	else if (size > 0) {
-+	    *ptr++ = c;
-+	    size--;
-+	}
-+    } while (1);
-+    return
-+(0); /* shut lint up */
-+}
-+
-+
-+fromuue (infp, outfp, boundaries, ctptr)
-+FILE *infp, *outfp;
-+char **boundaries;
-+int *ctptr;
-+{
-+    char buf[63];
-+
-+    while (1) {
-+	if (getline (buf, sizeof buf, infp) < 0) {
-+	    fprintf (stderr, "Premature EOF!\n");
-+	    return;
-+	}
-+	if (strncmp (buf, "begin", 5) == 0)
-+	    break;
-+	else if (buf[0] == '-' && buf[1] == '-') {
-+	    if (boundaries && PendingBoundary (buf, boundaries, ctptr))
-+		return;
-+	}
-+    }	
-+    while (1) {
-+	if (getline (buf, sizeof buf, infp) < 0) {
-+	    fprintf (stderr, "Premature EOF!\n");
-+	    return;
-+	}
-+	else if (strncmp (buf, "end", 5) == 0)
-+	    break;
-+	else if (buf[0] == '-' && buf[1] == '-') {
-+	    if (boundaries && PendingBoundary (buf, boundaries, ctptr)) {
-+		fprintf (stderr, "premature end of x-uue body part\n");
-+		return;
-+	    }
-+	    else {
-+		fprintf (stderr, "ignoring invalid boundary marker\n");
-+		continue;
-+	    }
-+        }
-+        else if (*buf == '\0') continue;
-+	else {
-+	    int length = (*buf - ' ');
-+	    if (*buf == '`')
-+		length = 0;
-+	    if (length < 0 || length > 63) {
-+		fprintf (stderr, "fromuue: illegal length (%d)\n",
-+			 length);
-+	    }
-+/* Nathan Maman recommends commenting out the next two lines */
-+	    else if (length == 0)
-+		break;
-+	    else {
-+		char *ptr = buf + 1;
-+		while (length > 0) {
-+		    uueget (ptr, outfp, length);
-+		    length -= 3;
-+		    ptr += 4;
-+		}
-+	    }
-+	}
-+    }
-+}
-+
---- metamail-2.7.orig/src/metamail/metamail.h
-+++ metamail-2.7/src/metamail/metamail.h
-@@ -0,0 +1,62 @@
-+#ifndef METAMAIL_H
-+#define METAMAIL_H
-+
-+#include <metamail/common.h>
-+#include <metamail/patchlevel.h>
-+
-+BEGIN_C_DECLS
-+
-+#define CATCOMMAND  "cat"
-+#define CATTEMPLATE "cat %s"
-+#define METAMAIL    "metamail"
-+
-+#define WRITE_BINARY	"w"
-+
-+#define CMDSIZE 1200            /* Maximum size of command to execute */
-+
-+#define LINE_BUF_SIZE       2000
-+
-+//static char *nomem = "Out of memory!";
-+extern char *mmversion;
-+extern char *NoAskDefault;
-+extern char *QuietDefault;
-+extern char *tmproot;
-+
-+#define ENCODING_NONE 0
-+#define ENCODING_BASE64 1
-+#define ENCODING_QUOTEDPRINTABLE 2
-+#define ENCODING_8BIT 3
-+#define ENCODING_UUENCODE -1	/* non-standard */
-+
-+// for mailto.c (cutted and pasted ere)
-+#define MINCHUNKSIZE 20000      /* Better be enough to hold the headers, or we
-+				   die! */
-+#define MAX_LINELENGTH  2000
-+
-+struct NoAskItem {
-+    char *type;
-+    struct NoAskItem *next;
-+};
-+
-+extern char             *mailheaders;
-+extern char             *MailerName;
-+extern char             *ContentType;
-+extern int               Quiet;
-+extern struct NoAskItem *FirstNoAskItem;
-+extern struct NoAskItem *FirstQuietItem;
-+extern int               TransparentMode;
-+extern int               RunAsRootOK;
-+extern int               DoDebug;
-+extern int               YankMode;
-+extern int               MightAskBeforeExecuting;
-+extern int               DefinitelyNotTty;
-+extern int               MustNotBeTty;
-+extern int               MaybePageOutput;
-+
-+END_C_DECLS
-+
-+#endif /* METAMAIL_H */
-+
-+
-+
-+
---- metamail-2.7.orig/src/metamail/environment.c
-+++ metamail-2.7/src/metamail/environment.c
-@@ -0,0 +1,181 @@
-+/* Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+
-+/* environment.c - contains (nearly) everything for the environmenthandling
-+   
-+   Author: Michael Moerz <mikem@debian.org>
-+*/
-+
-+#include "metamail.h"
-+#include "environment.h"
-+
-+/** adds a string to the current environmet variable PATH
-+    @param auxpath path to add to $PATH (=auxiliary path)
-+*/
-+void
-+addToPath(auxpath)
-+char *auxpath;
-+{
-+  if (auxpath && *auxpath) {    /* when pointer and auxpath[0] are != NULL */
-+    static char *newpath = 0;    /* is needed! since it becomes part ov ENV */
-+    char *oldpath = newpath;
-+    char *path = getenv("PATH");
-+    
-+    if (!path) path = "";	 /* give a default if no current path */
-+    newpath = XMALLOC(char, (7 + strlen(path) + strlen(auxpath)));
-+    sprintf(newpath, "PATH=%s:%s", auxpath, path);
-+    putenv(newpath);
-+    if (oldpath) XFREE(oldpath); /* free up any old allocated PATH */
-+  }
-+}
-+
-+/** initialize global variable mailheaders from environment
-+    this code is needed at several places -> own function
-+*/
-+void
-+initMailHeadersFromEnvironment() {
-+  mailheaders = getenv("MM_HEADERS");
-+  if (mailheaders) {
-+    char *s;
-+    s = XMALLOC(char, 15+strlen(mailheaders));
-+    sprintf(s, "MM_HEADERS=%s", mailheaders);
-+    /* error? free mailheaders? */
-+    mailheaders = s;
-+  }
-+}  
-+
-+/** initializes variables from environment variables or sets them to default
-+    values if they are not found in the environment
-+*/
-+void
-+initVarsFromEnvironment() {
-+  char *QuietStr = NULL, *NoAskStr = NULL;
-+
-+  /* temporary directory - where all temporary files are created */
-+  tmproot = getenv("METAMAIL_TMPDIR");
-+  if (!tmproot) {
-+    tmproot = XMALLOC(char, 5);
-+    strcpy(tmproot, "/tmp");
-+  }
-+
-+  /* */
-+  initMailHeadersFromEnvironment();
-+
-+  /* the quietstring that can turn off output for various things */
-+  QuietStr = getenv("MM_QUIET");
-+  if (!QuietStr) /* when not set in the environment set default */
-+    QuietStr = QuietDefault;
-+  /* now either we are always quiet (="1") or we have to create a structure
-+     containing information about when we have to be quiet
-+  */
-+  if (!strcmp(QuietStr, "1")) { /* when Quietstr == "1" */
-+    Quiet = 1;
-+  } else {
-+    struct NoAskItem *qitem;
-+    char *s, *tmp;
-+    char *QuietCopy;
-+
-+    Quiet = 0;
-+    QuietCopy = XMALLOC(char, 1+strlen(QuietStr));
-+    strcpy(QuietCopy, QuietStr);
-+    for (tmp=QuietCopy; *tmp; ++tmp) {
-+      if (isupper((unsigned char) *tmp)) 
-+	*tmp = tolower((unsigned char) *tmp);
-+    }
-+    do {
-+      s = index(QuietCopy, ',');
-+      if (s) *s++ = 0;
-+      qitem = XMALLOC(struct NoAskItem, 1);
-+      qitem->next = FirstQuietItem;
-+      qitem->type = QuietCopy;
-+      FirstQuietItem = qitem;
-+      QuietCopy = s;
-+    } while (QuietCopy);
-+  }
-+
-+  /* */
-+  if (getenv("MM_TRANSPARENT")) {
-+    /* Will not propogate recursively */
-+    TransparentMode = atoi(getenv("MM_TRANSPARENT"));
-+  }
-+
-+  /* override for allowing to run as root -- DANGER WILL ROBINSON */
-+  if (getenv("MM_RUNASROOT")) {
-+    RunAsRootOK = atoi(getenv("MM_RUNASROOT"));
-+  }
-+
-+  /* */
-+  if (getenv("MM_YANKMODE")) {
-+    /* Will not propogate recursively */
-+    YankMode = atoi(getenv("MM_YANKMODE"));
-+  }
-+
-+  /* debug flag */
-+  if (getenv("MM_DEBUG")) {
-+    DoDebug = atoi(getenv("MM_DEBUG"));
-+  }
-+
-+  /* put that somewhere else */
-+  if (DoDebug) 
-+    printf("Metamail Version %s, debugging turned on.\n", mmversion);
-+
-+  /* similar to quiet */
-+  NoAskStr = getenv("MM_NOASK");
-+  if (!NoAskStr) /* when noask not set in the ENV then init to default */
-+    NoAskStr = NoAskDefault;
-+  if (!strcmp(NoAskStr, "1")) {
-+    MightAskBeforeExecuting = 0;
-+  } else {
-+    struct NoAskItem *nai;
-+    char *s, *tmp;
-+    char *NoAskCopy;
-+    
-+    NoAskCopy = XMALLOC(char, 1+strlen(NoAskStr));
-+    strcpy(NoAskCopy, NoAskStr);
-+    for (tmp=NoAskCopy; *tmp; ++tmp) {
-+      if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+    }
-+    do {
-+      s = index(NoAskCopy, ',');
-+      if (s) *s++ = 0;
-+      nai = XMALLOC(struct NoAskItem, 1);
-+      nai->next = FirstNoAskItem;
-+      nai->type = NoAskCopy;
-+      FirstNoAskItem = nai;
-+      NoAskCopy = s;
-+    } while (NoAskCopy);
-+  }
-+
-+  /* hmm, perhaps mailprogram name ? */
-+  MailerName = getenv("MM_MAILER");
-+  if (!MailerName)
-+    MailerName = "unknown";
-+
-+  /* */
-+  if (getenv("MM_USEPAGER")) {
-+    MaybePageOutput = atoi(getenv("MM_USEPAGER"));
-+  }
-+
-+  /* setting if we have a tty or not */
-+  if ((getenv("MM_NOTTTY") && ((atoi(getenv("MM_NOTTTY"))) != 0))) {
-+    MustNotBeTty = 1;
-+  }
-+  if (MustNotBeTty
-+      || !isatty(0)
-+      || !isatty(1)) {
-+    DefinitelyNotTty = 1;
-+  }
-+  
-+  
-+}
---- metamail-2.7.orig/src/metamail/environment.h
-+++ metamail-2.7/src/metamail/environment.h
-@@ -0,0 +1,11 @@
-+#ifndef METAMAIL_ENVIRONMENT_H
-+#define METAMAIL_ENVIRONMENT_H 1
-+
-+#define ENVIRONMENT_TMPROOT_DEFAULT_LEN 5
-+#define ENVIRONMENT_TMPROOT_DEFAULT "/tmp"
-+
-+void addToPath                      (char *);
-+void initMailHeadersFromEnvironment ();
-+void initVarsFromEnvironment        ();
-+
-+#endif /* METAMAIL_ENVIRONMENT_H */
---- metamail-2.7.orig/src/metamail/mailto.c
-+++ metamail-2.7/src/metamail/mailto.c
-@@ -0,0 +1,2433 @@
-+/*
-+Copyright (c) 1992 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+
-+/* 
-+Program: mailto
-+Author: Nathaniel S. Borenstein
-+
-+   This is a program that allows users to send MIME-format mail with much 
-+   the same user interface as the Berkeley mail program.  
-+
-+   However, it should be stressed that this program includes
-+   ABSOLUTELY NO CODE taken from Berkeley mail -- it is a 
-+   "clean" reimplementation.
-+
-+   The user interface is directly modelled on Berkeley mail,
-+   and the desiderata for its design are taken from the man
-+   page for that program.
-+
-+   For information on using this program, consult the man page.
-+
-+STILL NEED TO DO/SUPPORT:
-+
-+-- Replace the main fgets call with something that allows in-line escape codes to do the equivalent of the tilde escapes.  Handle margins, centering, excerpts, EightBitMode, and RightToLeft mode properly.
-+-- Replace EditString with something that does the right thing in-line.
-+*/
-+
-+#include <metamail/common.h>
-+
-+#include <curses.h>  /* This and next for tgetstr(3X) and kin */
-+#include <term.h>
-+
-+#include "metamail.h"
-+#include "metamail_default.h"
-+
-+struct mailpart *CreateNewPart();
-+char *getmyname(); /* Defined in shared.c */
-+
-+
-+/* The main data structure for the multiple parts of the mail */
-+
-+struct mailpart {
-+    int istext;
-+    int isrich;
-+    char *content_type;
-+    int encoding_type_needed;
-+    char *filename;
-+    struct MailcapEntry *mc;
-+    struct mailpart *next, *prev;
-+};
-+
-+/* Some globals */
-+struct mailpart *FirstPart = NULL;
-+static char *Subject = NULL, *ToList = NULL, *CCList= NULL, *InReplyTo = NULL;
-+FILE *fpout = NULL;
-+static char *CharacterSet = NULL;
-+static int PartEndsWithNewline=1;
-+static int SplitSize=DEFAULT_SPLIT_SIZE;
-+
-+char *deadLetter = "dead.letter";
-+char *signature = ".signature";
-+char *mimeSignature = ".SIGNATURE";
-+#define TMPFILE_NAME_SIZE   1000
-+#define FILE_NAME_SIZE      1000
-+
-+#define DEFAULT_EDITOR      "vi"
-+
-+#define SYSTEM(command)     system(command);
-+
-+
-+/* The following are the globals that can be set via .mailrc */
-+int  V_askcc=0, /* To ask about the Cc field */
-+     V_dot=0, /* To take a period as the end of input */
-+     V_ignore=0, /* To ignore interrupts */
-+     V_verbose=0, /* To run sendmail with -v */
-+     V_quiet=0, /* To suppress various informational output */
-+     V_keepblind=0, /* To receive a blind copy of outgoing mail. */
-+     V_commasonly=0; /* To suppress using spaces as address separators */
-+
-+/* Codes for encoding_type_needed */
-+#define ENC_NONE 0
-+#define ENC_QP 1 /* quoted-printable */
-+#define ENC_B64 2 /* base64 */
-+
-+/* Codes for JustificationState */
-+#define JUST_LEFT 0
-+#define JUST_RIGHT 1
-+#define JUST_CENTER 2
-+int JustificationState = JUST_LEFT;
-+
-+
-+EightBitCharHelp() {
-+    if (!CharacterSet || !strcmp(CharacterSet, "us-ascii")) {
-+        printf("There are no extended characters available for your US-ASCII terminal.\n\n");
-+        printf("If you are actually using a terminal or terminal emulator with a richer\ncharacter set, you must use the '-a' option or the 'MM_CHARSET' environment\nvariable to inform this program of that fact.\n");
-+    } else {
-+        static char *kbd1[] =
-+          {
-+            "1234567890-=",
-+            "qwertyuiop[]",
-+            "asdfghjkl;'`",
-+            "zxcvbnm,./\\",
-+            NULL
-+        };
-+        static char *kbd2[] = /* MUST have same # of entries as kbd1 */
-+          {
-+            "!@#$%^&*()_+",
-+            "QWERTYUIOP{}",
-+            "ASDFGHJKL:\"~",
-+            "ZXCVBNM<>?|",
-+            NULL
-+        };
-+        char *s;
-+        int i, ct;
-+
-+        printf("Here is the keyboard map for the character set %s\n.If your terminal does not really use this character set, this may look strange.\n\n", CharacterSet);
-+        for (i=0; kbd1[i]; ++i) {
-+            for (ct=0, s=kbd1[i]; *s; ++s) {
-+                printf("%c%c ", *s, (*s) + 128);
-+                ct+=3;
-+            }
-+            while (ct++<40) printf(" ");
-+            for (s=kbd2[i]; *s; ++s) {
-+                printf("%c%c ", *s, (*s) + 128);
-+            }
-+            printf("\n");
-+        }
-+    }
-+}            
-+
-+char *
-+tmpname() {
-+    char *s = malloc(30);
-+    if (!s) nomemabort();
-+    {
-+        char *tmproot = getenv("METAMAIL_TMPDIR");
-+        if (!tmproot) tmproot="/tmp";
-+        if (strlen(tmproot) > 19) {
-+            free(s);
-+            s=malloc(12+strlen(tmproot));
-+            if (!s) nomemabort();
-+        }
-+        sprintf(s, "%s/mm.XXXXXX", tmproot);
-+    }
-+    return(s);
-+}
-+
-+TildeHelp() {
-+    char *pager = getenv("PAGER");
-+    char TmpName[100], CmdBuf[150];
-+    FILE *fp;
-+
-+    strcpy(TmpName, tmpname());
-+    fp = fdopen(mkstemp(TmpName), "w");
-+    if (!fp) fp = stdout;
-+    fprintf(fp, "The following tilde escapes are BSD-mail-compatible:\n");
-+    fprintf(fp, "~? Show help on tilde escapes\n");
-+    fprintf(fp, "~| RESERVED FOR BSD MAIL COMPATIBILITY\n");
-+    fprintf(fp, "~f RESERVED FOR BSD MAIL COMPATIBILITY\n");
-+    fprintf(fp, "~m RESERVED FOR BSD MAIL COMPATIBILITY\n");
-+    fprintf(fp, "~! Shell escape\n");
-+    fprintf(fp, "~~ Enter text line starting with a tilde\n");
-+    fprintf(fp, "~. Send the mail and exit\n");
-+    fprintf(fp, "~c Add to Cc list\n");
-+    fprintf(fp, "~d Read from %s (or named file, ~d filename)\n", deadLetter);
-+    fprintf(fp, "~e Edit message being composed\n");
-+    fprintf(fp, "~h Edit the headers\n");
-+    fprintf(fp, "~p Print out the message so far\n");
-+    fprintf(fp, "~q Quit, copying to %s\n", deadLetter);
-+    fprintf(fp, "~r Read the named text file into the message\n");
-+    fprintf(fp, "~s Reset the subject\n");
-+    fprintf(fp, "~t Add to To list\n");
-+    fprintf(fp, "~v Edit using VISUAL editor\n");
-+    fprintf(fp, "~w Write message to named file\n");
-+    fprintf(fp, "\n");
-+    fprintf(fp, "The following tilde escapes are unique to this program:\n");
-+    fprintf(fp, "~/<number> Set maximum size before message is split into multiple parts\n");
-+    fprintf(fp, "~?+ Show help on extended (eight-bit) characters\n");
-+    fprintf(fp, "~> Indent Left Margin\n");
-+    fprintf(fp, "~< Unindent Left Margin\n");
-+    fprintf(fp, "~<R Indent Right Margin\n");
-+    fprintf(fp, "~>R Unindent Right Margin\n");
-+    fprintf(fp, "~+ Enter 8-bit mode for non-ASCII characters\n");
-+    fprintf(fp, "~- Leave 8-bit mode (return to ASCII)\n");
-+    fprintf(fp, "~^ Toggle \"Upside-down\" (right-to-left) mode.\n");
-+    fprintf(fp, "~* Add non-text data (pictures, sounds, etc.) as a new MIME part (try it!)\n");
-+    fprintf(fp, "~b Toggle bold mode\n");
-+    fprintf(fp, "~i Toggle italic mode\n");
-+    fprintf(fp, "~j Alter Justification (~jc = center, ~jl = flushleft, ~jr = flushright.)\n");
-+    fprintf(fp, "~k Toggles whether or not to keep a 'blind' copy of your mail\n");
-+    fprintf(fp, "~n Force newline (hard line break)\n");
-+    fprintf(fp, "~Q Toggle quotation (excerpt) mode\n");
-+    fprintf(fp, "~S Toggle Semitic text mode (combines 8-bit and left-to-right)\n");
-+    fprintf(fp, "~u Toggle underline mode\n");
-+    fprintf(fp, "~z Add the contents of %s as a TEXT signature.\n", signature);
-+    fprintf(fp, "~Z Add the contents of %s as a NON-TEXT (MIME-format) signature.\n", mimeSignature);
-+    fprintf(fp, "For further information, read the man page.\n");
-+    fprintf(fp, "\n");
-+    if (fp != stdout) {
-+        fclose(fp);
-+        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", pager ? pager : "sensible-pager", TmpName);
-+        SYSTEM(CmdBuf);
-+        unlink(TmpName);
-+    }
-+}
-+
-+char *gethome() {
-+    struct passwd *p = getpwuid(getuid());
-+    if (!p || !p->pw_dir) {
-+        perror("Cannot find your home directory, using /tmp");
-+        return("/tmp");
-+    }
-+    return (p->pw_dir);
-+}
-+
-+
-+static char standoutbuf[50], standendbuf[50], StartUnderline[50], StopUnderline[50], BoldOn[50], BoldOff[50], KS[50], KE[50];
-+static int termcolumns, termrows;
-+
-+InitTerminal() {
-+    char tbuf[1024], *term, *dum;
-+
-+    term = getenv("TERM");
-+    if (term && tgetent(tbuf, term) != 1) {
-+        term = NULL;
-+    }
-+    if (term) {
-+        dum = KS;
-+        if (tgetstr("ks", &dum)) *dum = '\0'; else KS[0] = '\0';
-+        dum = KE;
-+        if (tgetstr("ke", &dum)) *dum = '\0'; else KE[0] = '\0';
-+        dum = standoutbuf;
-+        if (tgetstr("so", &dum)) *dum = '\0'; else standoutbuf[0] = '\0';
-+        dum = standendbuf;
-+        if (tgetstr("se", &dum)) *dum = '\0'; else standendbuf[0] = '\0';
-+        dum = BoldOn;
-+        if (tgetstr("md", &dum)) *dum = '\0'; else strcpy(BoldOn, standoutbuf);
-+        dum = BoldOff;
-+        if (tgetstr("me", &dum)) *dum = '\0'; else strcpy(BoldOff, standendbuf);
-+        dum = StartUnderline;
-+        if (tgetstr("us", &dum)) *dum = '\0'; else StartUnderline[0] = '\0';
-+        dum = StopUnderline;
-+        if (tgetstr("ue", &dum)) *dum = '\0'; else StopUnderline[0] = '\0';
-+        termcolumns = tgetnum("co");
-+        if (termcolumns <= 0) termcolumns = 80;
-+        termrows = tgetnum("li");
-+        if (termrows <= 0) termrows = 23;
-+    } else {
-+        KS[0] = '\0';
-+        KE[0] = '\0';
-+        standoutbuf[0] = '\0';
-+        standendbuf[0] = '\0';
-+        BoldOn[0] = '\0';
-+        BoldOff[0] = '\0';
-+        StartUnderline[0] = '\0';
-+        StopUnderline[0] = '\0';
-+        termcolumns = 80;
-+        termrows = 23;
-+    }
-+    fputs(KS, stdout);
-+}
-+
-+FinalizeTerminal() {
-+    tfputs(standendbuf);
-+    tfputs(BoldOff);
-+    tfputs(StopUnderline);
-+}
-+
-+struct mailpart *
-+NewPart() {
-+    struct mailpart *p;
-+    p = (struct mailpart *) malloc(sizeof(struct mailpart));
-+    if (!p) nomemabort();
-+    p->istext = 1;
-+    p->isrich = 0;
-+    p->content_type = "text/plain";
-+    p->encoding_type_needed = ENC_NONE;
-+    p->filename = tmpname();
-+    p->mc = NULL;
-+    p->next = NULL;
-+    p->prev = NULL;
-+    return(p);
-+}
-+
-+nomemabort() {
-+    fprintf(stderr, "mailto: Out of memory\n");
-+    cleanexit(-1);
-+}
-+
-+char *
-+freshcopy(s)
-+char *s;
-+{
-+    char *t = malloc(1+strlen(s));
-+    if (!t) nomemabort();
-+    strcpy(t, s);
-+    return(t);
-+}
-+
-+char *
-+GetLineMalloced(prompt, def)
-+char *prompt, *def;
-+{
-+    char Sbuf[1000], *ans;
-+    printf("%s: ", prompt);
-+    fflush(stdout);
-+    ans = fgets(Sbuf, sizeof(Sbuf), stdin);
-+    if (ans) {
-+        /* Need a fresh copy */
-+        ans = malloc(1+strlen(Sbuf));
-+        if (!ans) nomemabort();
-+        strcpy(ans, Sbuf);
-+        ans[strlen(ans) - 1] = '\0'; /* trash newline */
-+    } else {
-+        /* Callers will free() this, so make a fresh copy as well */
-+        ans = malloc(1+strlen(def));
-+        if (!ans) nomemabort();
-+        strcpy(ans, def);
-+    }
-+    return(ans);
-+}
-+
-+char *
-+EditString(prompt, s)
-+char *prompt, *s;
-+{
-+    char *ans;
-+    char NewPrompt[500];
-+    if (!s) s = "";
-+    snprintf(NewPrompt, sizeof(NewPrompt), "%s [%s]", prompt, s);
-+    ans = GetLineMalloced(NewPrompt, s);
-+    while (*ans && isspace((unsigned char) *ans)) ++ans;
-+    if (!*ans) return(s);
-+    return(ans);
-+}
-+
-+char *
-+AddCommasToAddressList(s)
-+char *s;
-+{
-+    int spaces = 0;
-+    char *t, *ans, *ansptr;
-+
-+    if (V_commasonly) {
-+        ans = malloc(1+strlen(s));
-+        if (!ans) nomemabort;
-+        strcpy(ans, s);
-+        return(ans);
-+    }
-+    for (t=s; *t; ++t) {
-+        if (*t == ' ') ++spaces;
-+    }
-+    /* That provides a max size for the mallocs */
-+    ans = malloc(1+strlen(s) +spaces);
-+    if (!ans) nomemabort();
-+    ansptr = ans;
-+    for (t=s; *t; ++t) {
-+        if (*t == ' ' && *(t-1) != ',') {
-+            *ansptr++ = ',';
-+        }
-+        *ansptr++ = *t;
-+    }
-+    *ansptr = '\0';
-+    while (--ansptr > ans && (isspace((unsigned char) *ansptr) || *ansptr == ',')) {
-+        *ansptr = '\0';
-+    }
-+    return(ans);
-+}
-+
-+char *
-+AddToList(List, entry, definitelynew)
-+char *List, *entry;
-+int definitelynew;
-+{
-+    int len;
-+    char *end = entry+strlen(entry);
-+
-+    while (--end >= entry && isspace((unsigned char) *end)) *end = '\0';
-+    if (! *entry) return(List);
-+    if (List && *List) {
-+        List = realloc(List, strlen(List) + strlen(entry) + 5);
-+        if (!List) nomemabort();
-+        if (V_commasonly && !definitelynew) {
-+            strcat(List, " ");
-+        } else {
-+            strcat(List, ", ");
-+        }
-+        strcat(List, entry);
-+    } else {
-+        List = malloc(strlen(entry) + 2);
-+        if (!List) nomemabort();
-+        strcpy(List, entry);
-+    }
-+    len = strlen(List);
-+    while (List[--len] == ',') List[len] = '\0';
-+    return(List);
-+}
-+
-+main(argc, argv)
-+char **argv;
-+{
-+    char *sdum, *LineBuf, CmdBuf[100];
-+    int i, EightBitMode = 0, RightToLeftMode = 0, AllDone=0, EightBitSeen=0, prevaddrdone=1;
-+    FILE *fpin;
-+    struct mailpart *CurrentPart=NULL;
-+
-+    if ((LineBuf = malloc(MAX_LINELENGTH)) == NULL) {
-+        fprintf(stderr, "mailto: Unable to allocate memory\n");
-+        exit(10);
-+    }
-+    ProcessInitFiles();
-+    InitSignals();
-+    InitTerminal();
-+    sdum = getenv("SPLITSIZE");
-+    if (sdum) {
-+        i = atoi(sdum);
-+        if (i < MINCHUNKSIZE) {
-+            fprintf(stderr, "Ignoring SPLITSIZE environment variable of %d -- the minimum value is %d\n", i, MINCHUNKSIZE);
-+        } else {
-+            SplitSize = i;
-+        }
-+    }
-+
-+    CharacterSet = getenv("MM_CHARSET");
-+    for (i=1; i<argc; ++i) {
-+        if (argv[i][0] == '-') {
-+            switch (argv[i][1]) {
-+                case 'a':
-+                    if (argv[i][2]) {
-+                        CharacterSet = &argv[i][2];
-+                    } else if (++i < argc) {
-+                        CharacterSet = argv[i];
-+                    } else {
-+                        fprintf(stderr, "mailto: -a requires a character set specification to follow\n");
-+                        cleanexit(-1);
-+                    }
-+                    break;
-+                case 'c':
-+                    if (argv[i][2]) {
-+                        CCList = &argv[i][2];
-+                    } else if (++i < argc) {
-+                        CCList = argv[i];
-+                    } else {
-+                        CCList = "";
-+                    }
-+                    break;
-+                case 'r':
-+                    if (argv[i][2]) {
-+                        InReplyTo = &argv[i][2];
-+                    } else if (++i < argc) {
-+                        InReplyTo = argv[i];
-+                    } else {
-+                        fprintf(stderr, "mailto: -r requires a Message-ID to follow\n");
-+                        cleanexit(-1);
-+                    }
-+                    break;
-+                case 's':
-+                    if (argv[i][2]) {
-+                        Subject = &argv[i][2];
-+                    } else if (++i < argc) {
-+                        Subject = argv[i];
-+                    } else {
-+                        fprintf(stderr, "mailto: -s requires a subject specification to follow\n");
-+                        cleanexit(-1);
-+                    }
-+                    break;
-+                default:
-+                    fprintf(stderr, "mailto:  Unrecognized option %s\n", argv[i]);
-+                    cleanexit(-1);
-+            }
-+        } else {
-+            /* It's an address, I guess */
-+            ToList = AddToList(ToList, argv[i], prevaddrdone);
-+            prevaddrdone = (argv[i][strlen(argv[i]) -1] == ',') ? 1 : 0;
-+        }
-+    }
-+    if (!CharacterSet) CharacterSet = "us-ascii";
-+    for (sdum = CharacterSet; *sdum; ++sdum) {
-+        if (isupper(*sdum)) *sdum = tolower(*sdum);
-+    }
-+    if (strcmp(CharacterSet, "us-ascii")
-+	 && strcmp(CharacterSet, "kio8-r")
-+	 && strncmp(CharacterSet, "iso-8859-", 9)) {
-+        fprintf(stderr, "mailto:  Unsupported character set: %s\n", CharacterSet);
-+        exit(-1);
-+    }
-+    if (strcmp(CharacterSet, "us-ascii")) {
-+        printf("Composing mail in character set %s\n", CharacterSet);
-+    }
-+    ProcessMailcapFiles();
-+    if (!ToList) {
-+        sdum=GetLineMalloced("To", "");
-+        ToList=AddCommasToAddressList(sdum);
-+        free(sdum);
-+    }
-+    if (!Subject) Subject=GetLineMalloced("Subject", "<NO SUBJECT>");
-+    if (!CCList && V_askcc) {
-+        sdum = GetLineMalloced("Cc", "");
-+        CCList = AddCommasToAddressList(sdum);
-+        free(sdum);
-+    }
-+    FirstPart = NewPart();
-+    CurrentPart = FirstPart;
-+    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
-+    if (!fpout) {
-+        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
-+        cleanexit(-1);
-+    }
-+    while (!AllDone && fgets(LineBuf, MAX_LINELENGTH, stdin) != NULL) {
-+        if (V_dot && LineBuf[0] == '.' && LineBuf[1] == '\n') {
-+            AllDone = 1;
-+        } else if (LineBuf[0] == '~') {
-+            /* Clean up argument */
-+            char *start = LineBuf+2;
-+            char *end = start + strlen(start);
-+            while (--end > start && isspace((unsigned char) *end)) *end = '\0';
-+            while (isspace((unsigned char) *start)) ++start;
-+            switch (LineBuf[1]) {
-+                case '.':
-+                    AllDone = 1;
-+                    break;
-+                case '?':
-+                    if (*start == '+') {
-+                        EightBitCharHelp();
-+                    } else {
-+                        TildeHelp();
-+                    }
-+                    break;
-+                case '~':
-+                    FputsQuotingLT(LineBuf+1, fpout, CurrentPart, EightBitMode, RightToLeftMode);
-+                    break;
-+                case '!':
-+                    if (!V_quiet) printf("Executing: %s\n", start);
-+                    SYSTEM(start);
-+                    break;
-+                case '>':
-+                    CurrentPart->isrich = 1;
-+                    fputs("<nl>", fpout);
-+                    if (*start=='r' || *start == 'R') {
-+                        TryClosingStyle("indentright", fpout, CurrentPart);
-+                    } else {
-+                        TryOpeningStyle("indent", fpout, CurrentPart, NULL);
-+                    }
-+                    break;
-+                case '<':
-+                    CurrentPart->isrich = 1;
-+                    fputs("<nl>", fpout);
-+                    if (*start == 'R' || *start == 'r') {
-+                        TryOpeningStyle("indentright", fpout, CurrentPart, NULL);
-+                    } else {
-+                        TryClosingStyle("indent", fpout, CurrentPart);
-+                    }
-+                    break;
-+                case '/':
-+                    i = atoi(start);
-+                    if (i < MINCHUNKSIZE) {
-+                        fprintf(stderr, "Ignoring splitsize setting of %d -- the minimum value is %d\n", i, MINCHUNKSIZE);
-+                    } else {
-+                        SplitSize = i;
-+                        if (!V_quiet) printf("Set splitsize to %d\n", i);
-+                    }
-+                    break;
-+                case '+':
-+                    if (!strcmp(CharacterSet, "us-ascii")) {
-+                        fprintf(stderr, "mailto:  No 8-bit characters allowed in ASCII mail\n");
-+                    } else {
-+                        EightBitMode = 1;
-+                        if (!V_quiet) printf("Entering text in eight-bit mode\n");
-+                    }
-+                    break;
-+                case '-':
-+                    EightBitMode = 0;
-+                    if (!V_quiet) printf("Entering text in seven-bit (normal) mode\n");
-+                    break;
-+                case '^':
-+                    RightToLeftMode = ! RightToLeftMode;
-+                    if (!V_quiet) printf("%s right-to-left mode\n", RightToLeftMode ? "Entering" : "Exiting");
-+                    break;
-+                case '*':
-+                    {
-+                    struct mailpart *p = CreateNewPart();
-+                    if (!p) break;
-+                    TempCloseStyles(fpout);
-+                    fclose(fpout);
-+                    CurrentPart->next = p;
-+                    CurrentPart->next->prev = CurrentPart;
-+                    CurrentPart = CurrentPart->next;
-+                    CurrentPart->next = NewPart();
-+                    CurrentPart->next->prev = CurrentPart;
-+                    CurrentPart = CurrentPart->next;
-+                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
-+                        cleanexit(-1);
-+                    }
-+                    ReopenStyles(fpout, CurrentPart);
-+                    break;
-+                    }
-+                case 'b':
-+                    ToggleStyle("bold", fpout, CurrentPart, BoldOn, BoldOff);
-+                    break;
-+                case 'c':
-+                    CCList = AddToList(CCList, start, 1);
-+                    if (!V_quiet) printf("Cc field is now: %s\n", CCList);
-+                    break;
-+                case 'd':
-+                    {
-+                    char fnam[FILE_NAME_SIZE];
-+                    if (! *start) {
-+                        snprintf(fnam, sizeof(fnam), "%s/dead.letter", gethome());
-+                    } else {
-+                        strcpy(fnam, start);
-+                    }
-+                    fpin = fopen(fnam, "r");
-+                    if (!fpin) {
-+                        fprintf(stderr, "mailto: Cannot open file %s\n", fnam);
-+                        break;
-+                    }
-+                    TempCloseStyles(fpout);
-+                    fclose(fpout);
-+                    CurrentPart->next = NewPart();
-+                    CurrentPart->next->prev = CurrentPart;
-+                    CurrentPart = CurrentPart->next;
-+                    CurrentPart->istext = 0;
-+                    CurrentPart->content_type = "message/rfc822";
-+                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto: Cannot open temporary file %s\n", CurrentPart->filename);
-+                        break;
-+                    }
-+                    (void) TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
-+                    fclose(fpin);
-+                    fclose(fpout);
-+                    printf("Included contents of %s\n(continue)\n", fnam);
-+                    CurrentPart->next = NewPart();
-+                    CurrentPart->next->prev = CurrentPart;
-+                    CurrentPart = CurrentPart->next;
-+                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
-+                        cleanexit(-1);
-+                    }
-+                    ReopenStyles(fpout, CurrentPart);
-+                    break;
-+                    }
-+                case 'e':
-+                    EditCurrentMessage(0);
-+                    break;
-+                case 'h':
-+                    ToList = AddCommasToAddressList(EditString("To", ToList));
-+                    Subject = EditString("Subject", Subject);
-+                    CCList = AddCommasToAddressList(EditString("Cc", CCList));
-+                    break;
-+                case 'i':
-+                    ToggleStyle("italic", fpout, CurrentPart, standoutbuf, standendbuf);
-+                    break;
-+                case 'j':
-+                    {
-+                    int NewJustificationState;
-+                    switch (*start) {
-+                        case 'c':
-+                        case 'C':
-+                            NewJustificationState = JUST_CENTER;
-+                            break;
-+                        case 'r':
-+                        case 'R':
-+                            NewJustificationState = JUST_RIGHT;
-+                            break;
-+                        case 'l':
-+                        case 'L':
-+                            NewJustificationState = JUST_LEFT;
-+                            break;
-+                        default:
-+                            printf("mailto: Unrecognized justification state: %c\n", *start);
-+                            NewJustificationState = JustificationState;
-+                    }
-+                    if (JustificationState == NewJustificationState) {
-+                        if (!V_quiet) printf("mailto:  No change in justificiation\n");
-+                    } else {
-+                        if (CurrentPart->isrich) {
-+                            if (JustificationState == JUST_CENTER) {
-+                                EndStyle(fpout, "center");
-+                            } else if (JustificationState == JUST_RIGHT) {
-+                                EndStyle(fpout, "flushright");
-+                            } else {
-+                                EndStyle(fpout, "flushleft");
-+                            }
-+                        }
-+                        CurrentPart->isrich = 1;
-+                        fputs("<nl>", fpout);
-+                        JustificationState = NewJustificationState;
-+                        if (JustificationState == JUST_CENTER) {
-+                            StartStyle(fpout, "center", NULL);
-+                        } else if (JustificationState == JUST_RIGHT) {
-+                            StartStyle(fpout, "flushright", NULL);
-+                        } else {
-+                            StartStyle(fpout, "flushleft", NULL);
-+                        }
-+                    }
-+                    break;
-+                    }
-+                case 'k':
-+                    V_keepblind = ! V_keepblind;
-+                    if (!V_quiet) printf("%s keep a blind copy of this message\n", V_keepblind ? "Will" : "Won't");
-+                    break;
-+                case 'n':
-+                    CurrentPart->isrich = 1;
-+                    fputs("<nl>", fpout);
-+                    if (!V_quiet) printf("Inserted line break\n");
-+                    break;
-+                case 'p':
-+                    {
-+                    FILE *fptmp;
-+                    char Cmd[TMPFILE_NAME_SIZE + 15];
-+                    char *s=tmpname();
-+                    fclose(fpout);
-+                    fptmp = fdopen(mkstemp(s), "w");
-+                    WriteOutMessage(fptmp, ToList, Subject, CCList, FirstPart);
-+                    TempCloseStyles(fptmp);
-+                    fclose(fptmp);
-+                    fpout = fopen(CurrentPart->filename, "a");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
-+                        cleanexit(-1);
-+                    }
-+                    snprintf(Cmd, sizeof(Cmd), "metamail -z %s", s);
-+                    SYSTEM(Cmd);
-+                    free(s);
-+                    RestoreCurrentStyles();
-+                    break;
-+                    }
-+                case 'q':
-+                    TempCloseStyles(fpout);
-+                    fclose(fpout);
-+                    if (!WriteDeadLetter()) cleanexit(0);
-+                    break;
-+                case 'Q':
-+                    ToggleStyle("excerpt", fpout, CurrentPart, NULL, NULL);
-+                    break;
-+                case 'r':
-+                    if (! *start) {
-+                        printf("mailto: No file name given.\n");
-+                        break;
-+                    }
-+                    fpin = fopen(start, "r");
-+                    if (!fpin) {
-+                        fprintf(stderr, "mailto: Cannot open file %s\n", start);
-+                        break;
-+                    }
-+                    EightBitSeen = TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
-+                    if (EightBitSeen 
-+                         && (CurrentPart->istext || CurrentPart->isrich)) {
-+                        if (CurrentPart->encoding_type_needed == ENC_NONE) {
-+                            CurrentPart->encoding_type_needed = ENC_QP;
-+                        }
-+                        if (!strcmp(CharacterSet, "us-ascii")) {
-+                            SwitchToEuropean();
-+                        }
-+                    }
-+                    fclose(fpin);
-+		    if (!V_quiet) printf("Included contents of %s\n", start);
-+		    printf("(continue)\n");
-+                    break;
-+                case 'S':
-+                    /* Semitic language mode toggle */
-+                    if (EightBitMode) {
-+                        EightBitMode = 0;
-+                        RightToLeftMode = 0;
-+                    } else {
-+                        if (!strcmp(CharacterSet, "us-ascii")) {
-+                            fprintf(stderr, "mailto:  No 8-bit characters allowed in ASCII mail\n");
-+                            break;
-+                        }
-+                        EightBitMode = 1;
-+                        RightToLeftMode = 1;
-+                    }
-+                    if (!V_quiet) printf("%s Eight-bit and right-to-left modes\n", RightToLeftMode ? "Entering" : "Exiting");
-+                    break;
-+                case 's':
-+                    {
-+                    char *subj=start;
-+                    if (*subj) {
-+                        Subject = freshcopy(subj);
-+                    } else {
-+                        Subject=GetLineMalloced("Subject", "<NO SUBJECT>");
-+                    }
-+                    break;
-+                    }
-+                case 't':
-+                    ToList = AddToList(ToList, start, 1);
-+                    if (!V_quiet) printf("To field is now: %s\n", ToList);
-+                    break;
-+                case 'u':
-+                    ToggleStyle("underline", fpout, CurrentPart, StartUnderline, StopUnderline);
-+                    break;
-+                case 'v':
-+                    EditCurrentMessage(1);
-+                    break;
-+                case 'w':
-+                    {
-+                    FILE *fptmp;
-+                    char *fname;
-+                    fclose(fpout);
-+                    fname = start;
-+                    fptmp = fopen(fname, "w");
-+                    WriteOutMessage(fptmp, ToList, Subject, CCList, FirstPart);
-+                    TempCloseStyles(fptmp);
-+                    if(fclose(fptmp)) {
-+                        fprintf(stderr, "Could not write file %s\n", fname);
-+                    } else {
-+                        printf("Wrote draft to %s\n", fname);
-+                    }
-+                    fpout = fopen(CurrentPart->filename, "a");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
-+                        cleanexit(-1);
-+                    }
-+                    break;
-+                    }
-+                case 'z':
-+                    {
-+                    char FBuf[FILE_NAME_SIZE];
-+                    if (! *start) {
-+                        snprintf(FBuf, sizeof(FBuf), "%s/.signature", gethome());
-+                    } else {
-+                        strcpy(FBuf, start);
-+                    }
-+                    fpin = fopen(FBuf, "r");
-+                    if (!fpin) {
-+                        fprintf(stderr, "mailto: Cannot open file %s\n", FBuf);
-+                        break;
-+                    }
-+                    CurrentPart->isrich = 1;
-+                    StartStyle(fpout, "signature", NULL);
-+                    EightBitSeen = TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
-+                    if (EightBitSeen) {
-+                        if (CurrentPart->encoding_type_needed == ENC_NONE) {
-+                            CurrentPart->encoding_type_needed = ENC_QP;
-+                        }
-+                        if ((CurrentPart->istext || CurrentPart->isrich) && !strcmp(CharacterSet, "us-ascii")) {
-+                            SwitchToEuropean();
-+                        }
-+                    }
-+                    fclose(fpin);
-+                    EndStyle(fpout, "signature");
-+                    if (!V_quiet) printf("Included contents of %s\n", FBuf);
-+		    printf("(continue)\n");
-+                    break;
-+                    }
-+                case 'Z':
-+                    {
-+                    char fnam[FILE_NAME_SIZE];
-+                    if (! *start) {
-+                        snprintf(fnam, sizeof(fnam), "%s/.SIGNATURE", gethome());
-+                    } else {
-+                        strcpy(fnam, start);
-+                    }
-+                    fpin = fopen(fnam, "r");
-+                    if (!fpin) {
-+                        fprintf(stderr, "mailto: Cannot open file %s\n", fnam);
-+                        break;
-+                    }
-+                    TempCloseStyles(fpout);
-+                    fclose(fpout);
-+                    CurrentPart->next = NewPart();
-+                    CurrentPart->next->prev = CurrentPart;
-+                    CurrentPart = CurrentPart->next;
-+                    CurrentPart->istext = 0;
-+                    CurrentPart->content_type = "message/rfc822";
-+                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto: Cannot open temporary file %s\n", CurrentPart->filename);
-+                        break;
-+                    }
-+                    EightBitSeen = TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
-+                    if (EightBitSeen &&
-+                        (CurrentPart->istext || CurrentPart->isrich)) {
-+                        if (CurrentPart->encoding_type_needed == ENC_NONE) {
-+                            CurrentPart->encoding_type_needed = ENC_QP;
-+                        }
-+                        if (!strcmp(CharacterSet, "us-ascii")) {
-+                            SwitchToEuropean();
-+                        }
-+                    }
-+                    fclose(fpin);
-+                    fclose(fpout);
-+                    printf("Included contents of %s\n", fnam);
-+		    printf("(continue)\n");
-+                    CurrentPart->next = NewPart();
-+                    CurrentPart->next->prev = CurrentPart;
-+                    CurrentPart = CurrentPart->next;
-+                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
-+                    if (!fpout) {
-+                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
-+                        cleanexit(-1);
-+                    }
-+                    ReopenStyles(fpout, CurrentPart);
-+                    break;
-+                    }
-+                default:
-+                    printf("Unrecognized tilde escape: %c\n", LineBuf[1]);
-+                    break;
-+            }
-+        } else {
-+            FputsQuotingLT(LineBuf, fpout, CurrentPart, EightBitMode, RightToLeftMode);
-+        }
-+    }
-+    TempCloseStyles(fpout);
-+    fclose(fpout);
-+    printf("EOT\n");
-+    if (V_verbose) {
-+        snprintf(CmdBuf, sizeof(CmdBuf), "splitmail -d -v -s %d", SplitSize);
-+    } else {
-+        snprintf(CmdBuf, sizeof(CmdBuf), "splitmail -d -s %d", SplitSize);
-+    }
-+    fpout = popen(CmdBuf, "w");
-+    if (!fpout) {
-+        fprintf(stderr, "mailto: Can't write to splitmail\n");
-+        (void) WriteDeadLetter();
-+        cleanexit(-1);
-+    }
-+    WriteOutMessage(fpout, ToList, Subject, CCList, FirstPart);
-+    if (ferror(fpout) || pclose(fpout)) {
-+        perror("mailto: Error writing to splitmail");
-+        (void) WriteDeadLetter();
-+        cleanexit(-1);
-+    }
-+    cleanexit(0); /* Never returns */
-+}
-+
-+char *newid() {
-+    static char idbuf[100];
-+    static int ctr=0;
-+
-+    snprintf(idbuf, sizeof(idbuf), "<%d_%d_%d_%d@%s>", (int) getuid(), (int) getpid(), (int) time(0), ++ctr, getmyname());
-+
-+    return(idbuf);
-+}
-+
-+WriteOutMessage(fp, ToList, Subject, CCList, FirstPart)
-+FILE *fp;
-+char *ToList, *Subject, *CCList;
-+struct mailpart *FirstPart;
-+{
-+    FILE *fpin;
-+    static int ctr = 0;
-+    fprintf(fp, "MIME-Version: 1.0\n");
-+    if (InReplyTo != NULL) {
-+        EmitHeader(fp, "In-Reply-To", InReplyTo);
-+    }
-+    EmitHeaderWithAliases(fp, "To", ToList);
-+
-+    EmitHeader(fp, "Subject", Subject);
-+    if (CCList && *CCList) EmitHeaderWithAliases(fp, "Cc", CCList);
-+    if (V_keepblind) {
-+        struct passwd *p = getpwuid(getuid());
-+        if (!p) {
-+            fprintf(stderr, "Can't find your user id to keep a blind copy\n");
-+        } else {
-+            EmitHeader(fp, "Bcc", p->pw_name);
-+        }
-+    }
-+    fprintf(fp, "Message-ID: %s\n", newid());
-+    if (!FirstPart) return; /* empty body */
-+    if (FirstPart->next) {
-+        char boundary[120];
-+        snprintf(boundary, sizeof(boundary), "PART.BOUNDARY.%d.%d.%s.%d.%d",
-+                 (int) getuid(), (int) getpid(), getmyname(), (int) time(0), ++ctr);
-+        fprintf(fp, "Content-type: multipart/mixed;\n\tboundary=\"%s\"\n\n", boundary);
-+        fprintf(fp, "> THIS IS A MESSAGE IN 'MIME' FORMAT.  Your mail reader does not support MIME.\n> Some parts of this will be readable as plain text.\n> To see the rest, you will need to upgrade your mail reader.\n");
-+        while(FirstPart) {
-+            /* First check to see if it is empty & text, in which case skip it */
-+            if (FirstPart->istext) {
-+                struct stat stbuf;
-+                if (!stat(FirstPart->filename, &stbuf)) {
-+                    if (stbuf.st_size == 0) {
-+                        FirstPart = FirstPart->next;
-+                        continue;
-+                    }
-+                }
-+            }
-+            fprintf(fp, "\n--%s\n", boundary);
-+            WriteContentTypeAndEncoding(fp, FirstPart);
-+            fprintf(fp, "\n");
-+            fpin = fopen(FirstPart->filename, "r");
-+            if (!fpin) {
-+                fprintf(stderr, "Can't read temporary file %s\n", FirstPart->filename);
-+                cleanexit(-1);
-+            }
-+            (void) TranslateInputToEncodedOutput(fpin, fp, FirstPart->encoding_type_needed, FirstPart->content_type);
-+            fclose(fpin);
-+            FirstPart = FirstPart->next;
-+        }
-+        fprintf(fp, "\n--%s--\n\n", boundary);
-+    } else {
-+        WriteContentTypeAndEncoding(fp, FirstPart);
-+        fprintf(fp, "\n");
-+        fpin = fopen(FirstPart->filename, "r");
-+        if (!fpin) {
-+            fprintf(stderr, "Can't read temporary file %s\n", FirstPart->filename);
-+            cleanexit(-1);
-+        }
-+        (void) TranslateInputToEncodedOutput(fpin, fp, FirstPart->encoding_type_needed, FirstPart->content_type);
-+        fclose(fpin);
-+    }
-+}
-+
-+WriteContentTypeAndEncoding(fp, part)
-+FILE *fp;
-+struct mailpart *part;
-+{
-+    fprintf(fp, "Content-ID: %s\n", newid());
-+    if (part->istext) {
-+        if (part->isrich) {
-+            if (strcmp(CharacterSet, "us-ascii")
-+		 && strcmp(CharacterSet, "koi8-r")
-+		 && (strncmp(CharacterSet, "iso-8859-", 9) 
-+                      || part->encoding_type_needed != ENC_NONE)) {
-+                fprintf(fp, "Content-type: text/richtext; charset=\"%s\"\n", CharacterSet);
-+            } else {
-+                fprintf(fp, "Content-type: text/richtext\n");
-+            }
-+        } else {
-+            fprintf(fp, "Content-type: ");
-+            WriteCtypeNicely(fp, part->content_type);
-+            if (strcmp(CharacterSet, "us-ascii")
-+                 && (strncmp(CharacterSet, "iso-8859-", 9) 
-+                      || part->encoding_type_needed != ENC_NONE)) {
-+                fprintf(fp, "; charset=\"%s\"\n", CharacterSet);
-+            } else fputs("\n", fp);
-+        }
-+    } else {
-+        fprintf(fp, "Content-type: ");
-+        WriteCtypeNicely(fp, part->content_type); /* fixes some syntactic junk */
-+        fputs("\n", fp);
-+    }
-+    if (part->istext && part->isrich && part->encoding_type_needed == ENC_NONE) {
-+        /* Don't you believe it... */
-+        part->encoding_type_needed = ENC_QP;
-+    }
-+    if (part->encoding_type_needed == ENC_B64) {
-+        fprintf(fp, "Content-Transfer-Encoding: base64\n");
-+    } else if (part->encoding_type_needed == ENC_QP) {
-+        fprintf(fp, "Content-Transfer-Encoding: quoted-printable\n");
-+    }
-+}
-+
-+TranslateInputToEncodedOutput(InputFP, OutputFP, Ecode, ctype)
-+FILE *InputFP, *OutputFP;
-+int Ecode;
-+char *ctype;
-+{
-+    int c, EightBitSeen = 0;
-+
-+    switch(Ecode) {
-+        case ENC_B64:
-+            to64(InputFP, OutputFP, DoesNeedPortableNewlines(ctype));
-+            break;
-+        case ENC_QP:
-+            toqp(InputFP, OutputFP);
-+            break;
-+        default:
-+            while ((c = getc(InputFP)) != EOF){
-+                if (c > 127) EightBitSeen = 1;
-+                putc(c, OutputFP);
-+            }
-+    }
-+    return(EightBitSeen);
-+}
-+
-+#define	MAX_STACK_SIZE	500
-+static int StackSize=0;
-+static char *Stack[MAX_STACK_SIZE];
-+static char *EnvStartStack[MAX_STACK_SIZE];
-+
-+/* The following two routines are used when richtext styles need to be 
-+   kept open across an inserted object -- i.e. the richtext is split into 
-+   two parts of a multipart message */
-+
-+TempCloseStyles(fp)
-+FILE *fp;
-+{
-+    int i = StackSize;
-+    while(--i>=0) {
-+        fprintf(fp, "</%s>", Stack[i]);
-+    }
-+    tfputs(StopUnderline);
-+    tfputs(standendbuf);
-+    tfputs(BoldOff);
-+    fflush(stdout);
-+}
-+
-+RestoreCurrentStyles() {
-+    int i=0;
-+    while (i<StackSize) {
-+        if (EnvStartStack[i]) {
-+            tfputs(EnvStartStack[i]);
-+        }
-+        ++i;
-+    }
-+}
-+
-+ReopenStyles(fp, part)
-+FILE *fp;
-+struct mailpart *part;
-+{
-+    int i=0;
-+    RestoreCurrentStyles();
-+    if (StackSize > 0) part->isrich = 1;
-+    while (i < StackSize) {
-+        fprintf(fp, "<%s>", Stack[i++]);
-+    }
-+}
-+
-+richtextreset()
-+{
-+    StackSize = 0;
-+}
-+
-+AlreadyInStyle(s)
-+char *s;
-+{
-+    int i;
-+    for (i=0; i<StackSize; ++i) {
-+        if (!strcmp(Stack[i], s)) return(1);
-+    }
-+    return(0);
-+}
-+
-+StartStyle(fp, s, envstartstr)
-+FILE *fp;
-+char *s;
-+char *envstartstr;
-+{
-+    char *t;
-+    fprintf(fp, "<%s>", s);
-+    PartEndsWithNewline=0;
-+    t = malloc(1+strlen(s));
-+    if (!t) nomemabort();
-+    strcpy(t, s);
-+    EnvStartStack[StackSize] = envstartstr;
-+    Stack[StackSize++] = t;
-+    if (!V_quiet) printf("Beginning: %s\n", t);
-+}
-+
-+EndStyle(fp, s)
-+FILE *fp;
-+char *s;
-+{
-+    int i = StackSize, j;
-+    while(--i>=0) {
-+        fprintf(fp, "</%s>", Stack[i]);
-+        if (!strcmp(s, Stack[i])) break;
-+    }
-+    if (i>=0) {
-+        free(Stack[i]);
-+        --StackSize;
-+        for (j=i; j<StackSize; ++j) {
-+            Stack[j] = Stack[j+1];
-+            EnvStartStack[j] = EnvStartStack[j+1];
-+        }
-+    } else i=0;
-+    while (i<StackSize) {
-+        fprintf(fp, "<%s>", Stack[i++]);
-+    }
-+    PartEndsWithNewline=0;
-+    if (!V_quiet) printf("Ending: %s\n", s);
-+}
-+
-+ToggleStyle(name, fp, part, turnonstr, turnoffstr)
-+char *name;
-+FILE *fp;
-+struct mailpart *part;
-+char *turnonstr, *turnoffstr;
-+{
-+    part->isrich = 1;
-+    if (AlreadyInStyle(name)) {
-+        EndStyle(fp, name);
-+        if (turnoffstr) tfputs(turnoffstr);
-+        RestoreCurrentStyles(); /* because on some terminals,
-+                                  the same thing turns
-+                                  off underlining AND bold */
-+    } else {
-+        StartStyle(fp, name, turnonstr);
-+        if (turnonstr) tfputs(turnonstr);
-+    }
-+}
-+
-+TryOpeningStyle(name, fp, part, envstartstr)
-+char *name;
-+FILE *fp;
-+struct mailpart *part;
-+char *envstartstr;
-+{
-+    if (AlreadyInStyle(name)) {
-+        printf("mailto: Already in %s style\n", name);
-+    } else {
-+        part->isrich = 1;
-+        StartStyle(fp, name, envstartstr);
-+    }
-+}
-+
-+TryClosingStyle(name, fp, part)
-+char *name;
-+FILE *fp;
-+struct mailpart *part;
-+{
-+    if (AlreadyInStyle(name)) {
-+        part->isrich = 1;
-+        EndStyle(fp, name);
-+    } else {
-+        printf("mailto: You aren't in a %s style\n", name);
-+    }
-+}
-+
-+FputsQuotingLT(s, fp, part, EightBitMode, RightToLeftMode)
-+char *s;
-+FILE *fp;
-+struct mailpart *part;
-+int EightBitMode, RightToLeftMode;
-+{
-+    static int InNewLineSequence=1;
-+    int c=0;
-+    char LBuf[1000], *sdum;
-+    if (*s == '\n') {
-+        if (InNewLineSequence) {
-+            fputs("<nl>\n", fp);
-+        } else {
-+            fputs("<nl><nl>\n\n", fp);
-+            InNewLineSequence = 1;
-+        }
-+        part->isrich = 1;
-+        PartEndsWithNewline=1;
-+        return;
-+    }
-+    InNewLineSequence = 0;
-+    if (RightToLeftMode) {
-+        sdum = s+strlen(s)-1;
-+        if (*sdum == '\n') --sdum;
-+        while (sdum >= s) {
-+            LBuf[c++] = *sdum--;
-+        }
-+        LBuf[c++] = '\n';
-+        LBuf[c] = '\0';
-+        s = LBuf;
-+    }
-+    if (isspace((unsigned char) *s)) {
-+        /* Lines that start with spaces should not be folded! */
-+        fputs("<nl>", fp);
-+        part->isrich = 1;
-+    }
-+    if (s) {
-+        if (EightBitMode) part->encoding_type_needed = ENC_QP;
-+        while (*s) {
-+            c = (unsigned char) *s;
-+            if (EightBitMode) {
-+                if (isprint(c) && ! isspace(c)) {
-+                    c = c+128;
-+                }
-+                putc(c, fp);
-+                putc(c, stdout);
-+            } else if (c == '<') {
-+                part->isrich = 1;
-+                fputs("<lt>", fp);
-+            } else {
-+                if (c > 127 || c < 0) {
-+                    part->encoding_type_needed = ENC_QP;
-+                    if (!strcmp(CharacterSet, "us-ascii")) {
-+                        SwitchToEuropean();
-+                    }
-+                }
-+                putc(c, fp);
-+                if (RightToLeftMode) putc(c, stdout);
-+            }
-+            ++s;
-+        }
-+        PartEndsWithNewline = (c == '\n') ? 1 : 0;
-+    }
-+}
-+
-+cleanexit(code)
-+int code;
-+{
-+    finalize();
-+    exit(code);
-+}
-+
-+finalize() {
-+    while (FirstPart) {
-+        unlink(FirstPart->filename);
-+        FirstPart = FirstPart->next;
-+    }
-+    FinalizeTerminal();
-+}
-+
-+void
-+cleanup(signum)
-+int signum;
-+{
-+    if (fpout) {
-+        TempCloseStyles(fpout);
-+        fclose(fpout);
-+    }
-+    if (signum == SIGPIPE) {
-+        (void) WriteDeadLetter();
-+    }
-+    if (signum == SIGINT) {
-+        if (V_ignore) {
-+            printf("Interrupt ignored because 'ignore' is set.  Use ~q if you want to quit.\n");
-+            return;
-+        } else {
-+            (void) WriteDeadLetter();
-+        }
-+    }
-+    finalize();
-+    signal(signum, SIG_DFL);
-+    kill(getpid(), signum);
-+}
-+
-+InitSignals() {
-+    signal(SIGINT, cleanup);
-+    signal(SIGPIPE, cleanup);
-+    signal(SIGILL, cleanup);
-+    signal(SIGTRAP, cleanup);
-+    signal(SIGIOT, cleanup);
-+    signal(SIGFPE, cleanup);
-+    signal(SIGSEGV, cleanup);
-+    signal(SIGTERM, cleanup);
-+#ifdef SIGXCPU
-+    signal(SIGXCPU, cleanup);
-+#endif
-+}
-+
-+WriteDeadLetter()
-+{
-+    FILE *fp;
-+    char DeadFile[1000];
-+
-+    snprintf(DeadFile, sizeof(DeadFile), "%s/dead.letter", gethome());
-+    fp = fopen(DeadFile, "w");
-+    WriteOutMessage(fp, ToList, Subject, CCList, FirstPart);
-+    if(fclose(fp)) {
-+        perror("Could not write ~/dead.letter\n");
-+        return(-1);
-+    } else {
-+        printf("Wrote draft to ~/dead.letter\n");
-+        return(0);
-+    }
-+}
-+
-+struct MailcapEntry {
-+    char *contenttype;
-+    char *command;
-+    char *testcommand;
-+    char *editcommand;
-+    char *composecommand;
-+    char *composetypedcommand;
-+    char *label;
-+    int needsterminal;
-+    int copiousoutput;
-+    struct MailcapEntry *next;
-+} *FirstMailcapEntry = NULL;
-+
-+/* There are a fair number of core leaks in what follows.  That should matter little -- the mailcap files are only parsed once, and are usually pretty small anyway. */
-+
-+char *
-+GetCommand(s, t)
-+char *s, **t;
-+{
-+    char *s2;
-+    int quoted = 0;
-+    s2 = malloc(strlen(s)*2); /* absolute max, if all % signs */
-+    if (!s2) nomemabort();
-+    *t = s2;
-+    while (s && *s) {
-+	if (quoted) {
-+            if (*s == '%') *s2++ = '%'; /* Quote through next level, ugh! */
-+
-+            *s2++ = *s++;
-+	    quoted = 0;
-+	} else {
-+	    if (*s == ';') {
-+                *s2 = '\0';
-+		return(++s);
-+	    }
-+	    if (*s == '\\') {
-+		quoted = 1;
-+		++s;
-+	    } else {
-+		*s2++ = *s++;
-+	    }
-+	}
-+    }
-+    *s2 = '\0';
-+    return(NULL);
-+}	
-+
-+char *Cleanse(s, dolc) /* no leading or trailing space, all lower case */
-+char *s;
-+int dolc;
-+{
-+    char *tmp, *news;
-+    
-+    /* strip leading white space */
-+    while (*s && isspace((unsigned char) *s)) ++s;
-+    news = s;
-+    /* put in lower case, find end */
-+    for (tmp=s; *tmp; ++tmp) {
-+        if (dolc && isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
-+    }
-+    /* strip trailing white space */
-+    while (--tmp && *tmp && isspace((unsigned char) *tmp)) *tmp = '\0';
-+    return(news);
-+}
-+
-+char *DeQuote(s)
-+char *s;
-+{
-+    char *retval;
-+    s = Cleanse(s, 0);
-+    if (*s != '"') return(s);
-+    retval = ++s;
-+    while (s && *s) {
-+        s = index(s, '\"');
-+        if (!s) return(retval); /* but it's a bad parse */
-+        if (*(s-1) != '\\') {
-+            *s = '\0';
-+            return(retval);
-+        }
-+        ++s;
-+    }
-+    return(retval); /* also a bad parse */
-+}    
-+
-+struct MailcapEntry *
-+GetMailcapEntry(fp)
-+FILE *fp;
-+{
-+    int rawentryalloc = MAX_LINELENGTH, len;
-+    char *rawentry, *s, *t, *LineBuf;
-+    struct MailcapEntry *mc;
-+
-+    LineBuf = malloc(MAX_LINELENGTH);
-+    if (!LineBuf) nomemabort();
-+    rawentry = malloc(1 + rawentryalloc);
-+    mc = (struct MailcapEntry *) malloc(sizeof (struct MailcapEntry));
-+    if (!rawentry || !mc) nomemabort();
-+    *rawentry = '\0';
-+    while (fgets(LineBuf, MAX_LINELENGTH, fp)) {
-+	if (LineBuf[0] == '#') continue;
-+	len = strlen(LineBuf);
-+        if (LineBuf[len-1] == '\n') LineBuf[--len] = '\0';
-+	if ((len + strlen(rawentry)) > rawentryalloc) {
-+            rawentryalloc += MAX_LINELENGTH;
-+	    rawentry = realloc(rawentry, rawentryalloc+1);
-+	    if (!rawentry) nomemabort();
-+	}
-+	if (LineBuf[len-1] == '\\') {
-+            LineBuf[len-1] = '\0';
-+	    strcat(rawentry, LineBuf);
-+	} else {
-+	    strcat(rawentry, LineBuf);
-+	    break;
-+	}
-+    }
-+    free(LineBuf);
-+    for (s=rawentry; *s && isspace((unsigned char) *s); ++s) ;
-+    if (!*s) {
-+	/* totally blank entry -- quietly ignore */
-+	free(rawentry);
-+	return(NULL);
-+    }
-+    s = index(rawentry, ';');
-+    if (!s) {
-+	fprintf(stderr, "mailto: Ignoring invalid mailcap entry: %s\n", rawentry);
-+	free(rawentry);
-+	return(NULL);
-+    }
-+    *s++ = '\0';
-+    mc->needsterminal = 0;
-+    mc->copiousoutput = 0;
-+    mc->testcommand = NULL;
-+    mc->composecommand = NULL;
-+    mc->composetypedcommand = NULL;
-+    mc->editcommand = NULL;
-+    mc->label = NULL;
-+    mc->contenttype = malloc(1+strlen(rawentry));
-+    mc->next = NULL;
-+    if (!mc->contenttype) nomemabort();
-+    strcpy(mc->contenttype, rawentry);
-+    t = GetCommand(s, &mc->command);
-+    s = t;
-+    while (s) {
-+	char *arg, *eq;
-+
-+        t = GetCommand(s, &arg);
-+/*        if (t) *t++ = '\0'; */
-+        eq = index(arg, '=');
-+        if (eq) *eq++ = '\0';
-+        arg = Cleanse(arg, 1);
-+	if (!strcmp(arg, "needsterminal")) {
-+	    mc->needsterminal = 1;
-+	} else if (!strcmp(arg, "copiousoutput")) {
-+	    mc->copiousoutput = 1;
-+        } else if (eq && !strcmp(arg, "test")) {
-+            mc->testcommand = DeQuote(eq);
-+        } else if (eq && !strcmp(arg, "edit")) {
-+            mc->editcommand = DeQuote(eq);
-+        } else if (eq && !strcmp(arg, "compose")) {
-+            mc->composecommand = DeQuote(eq);
-+        } else if (eq && !strcmp(arg, "composetyped")) {
-+            mc->composetypedcommand = DeQuote(eq);
-+        } else if (eq && !strcmp(arg, "description")) {
-+            mc->label = DeQuote(eq);
-+        } else if (eq && !strcmp(arg, "label")) { 
-+            mc->label = DeQuote(eq); /* bogus old name for description */
-+        } else if (eq && !strcmp(arg, "textualnewlines")) {
-+            ExceptionalNewline(mc->contenttype, atoi(eq));
-+	} else if (strcmp(arg, "notes")) { /* IGNORE notes field */
-+/*	    if (*arg) fprintf(stderr, "mailto: Ignoring invalid mailcap flag: %s\n", arg);  */
-+	}
-+	s = t;
-+    }
-+    free(rawentry);
-+    return(mc);
-+}
-+
-+ProcessMailcapFiles() 
-+{
-+    char *s, *path = getenv("MAILCAPS"), *origpath;
-+    static char *stdpath = STDPATH;
-+    struct MailcapEntry *mc, *CurrentMailcapEntry = NULL;
-+    FILE *fp;
-+
-+    if (!path) {
-+        int uid = getuid();
-+        struct passwd *p;
-+        p = getpwuid(uid);
-+        if (p) path = malloc(5+strlen(p->pw_dir) + strlen(stdpath));
-+        if (!p || !path) nomemabort();
-+        strcpy(path, p->pw_dir);
-+        strcat(path, stdpath);
-+    } else {
-+        char *pathcopy;
-+        pathcopy = malloc(1+strlen(path));
-+        if (!pathcopy) nomemabort();
-+        strcpy(pathcopy, path);
-+        path = pathcopy;
-+    }
-+    origpath = path;
-+    while(path) {
-+        s = index(path, PATH_SEPARATOR);
-+        if (s) *s++ = '\0';
-+        fp = fopen(path, "r");
-+        while (fp && !feof(fp)) {
-+            mc = GetMailcapEntry(fp);
-+            if (!mc) continue;
-+            if (!FirstMailcapEntry) {
-+                FirstMailcapEntry = mc;
-+                CurrentMailcapEntry = mc;
-+            } else {
-+                CurrentMailcapEntry->next = mc;
-+                CurrentMailcapEntry = mc;
-+            }
-+	}
-+        if (fp) fclose(fp);
-+        path = s;
-+    }
-+    free(origpath);
-+    return(-1);
-+}
-+
-+struct mailpart *
-+CreateNewPart() {
-+    struct mailpart *mp;
-+    struct MailcapEntry *mc = FirstMailcapEntry;
-+    int i, ans, resultcode;
-+    char LineBuf[100], *CmdBuf;
-+
-+    mp = NewPart();
-+    if (!mp) return(NULL);
-+    printf("Please choose which kind of data you wish to insert:\n\n");
-+    printf("0: A raw file, possibly binary, of no particular data type.\n");
-+    printf("1: Raw data from a file, with you specifying the content-type by hand.\n");
-+    i = 1;
-+    while (mc) {
-+        if (mc->composecommand || mc->composetypedcommand) {
-+            ++i;
-+            if (mc->label) {
-+                printf("%d: %s\n", i, mc->label);
-+            } else {
-+                printf("%d: data in '%s' format\n", i, mc->contenttype);
-+            }
-+        }
-+        mc = mc->next;
-+    }
-+    printf("\n\nEnter your choice as a number from 0 to %d: ", i);
-+    fflush(stdout);
-+    fgets(LineBuf, sizeof(LineBuf), stdin);
-+    ans = atoi(LineBuf);
-+    if (ans == 0 || ans == 1) {
-+        char *sdum, CTLineBuf[100];
-+        FILE *fpi, *fpo;
-+	printf("\nIf you want to include non-textual data from a file, enter the file name.\nTo include the output of a command, enter \"|\" followed by the command.\nIf you do not want to include anything, just press ENTER (RETURN).\n> ");
-+        fflush(stdout);
-+        fgets(CTLineBuf, sizeof(CTLineBuf), stdin);
-+        sdum = CTLineBuf+strlen(CTLineBuf) -1;
-+        while (sdum >= CTLineBuf && isspace((unsigned char) *sdum)) {
-+            *sdum = '\0';
-+            --sdum;
-+        }
-+        sdum=CTLineBuf;
-+        while (*sdum && isspace((unsigned char) *sdum)) ++sdum;
-+        if (! *sdum) {
-+            printf("Data insertion cancelled\n");
-+            return(NULL);
-+        }
-+	if (*sdum == '|') {
-+	    fpi = popen(sdum+1, "r");
-+	} else {
-+	    fpi = fopen(sdum, "r");
-+	}
-+        if (!fpi) {
-+            printf("Cannot read %s, data insertion cancelled\n", sdum);
-+            return(NULL);
-+        }
-+        fpo = fdopen(mkstemp(mp->filename), "w");
-+        if (!fpo) {
-+            printf("Cannot open temporary file, data insertion cancelled\n");
-+            return(NULL);
-+        }
-+        (void) TranslateInputToEncodedOutput(fpi, fpo, ENC_NONE, "");
-+	if (*sdum == '|') {
-+	    fclose(fpi);
-+	} else {
-+	    pclose(fpi);
-+	}
-+        fclose(fpo);
-+        mp->istext = 0;
-+        if (ans == 1) {
-+            while (1) {
-+                int ct;
-+                printf("\nEnter the MIME Content-type value for the data from file %s\n    (type '?' for a list of locally-valid content-types): ", sdum);
-+                fflush(stdout);
-+                fgets(LineBuf, sizeof(LineBuf), stdin);
-+		LineBuf[strlen(LineBuf)-1]='\0';
-+                if (index(LineBuf, '/')) {
-+                    char lc[100], *s, AnsBuf[100];
-+                    strcpy(lc, LineBuf);
-+                    for (s=lc; *s; ++s) {
-+                        if (isupper(*s)) *s = tolower(*s);
-+                    }
-+                    if (!strcmp(lc, "text/plain")) break;
-+                    if (!strcmp(lc, "application/octet-stream")) break;
-+                    mc=FirstMailcapEntry;
-+                    while (mc) {
-+                        if (mc->contenttype && index(mc->contenttype, '/') && !index(mc->contenttype, '*') && !lc2strcmp(mc->contenttype, lc)) {
-+                            break;
-+                        }
-+                        mc = mc->next;
-+                    }
-+                    if (mc) break;
-+                    printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type.  Do you want to use it anyway [no] ? ", LineBuf);
-+                    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
-+                    while (s && *s && isspace((unsigned char) *s)) ++s;
-+                    if (s && (*s == 'y' || *s == 'Y')) break;
-+                    continue;
-+                }
-+                printf("\nMIME content-type values are type/format pairs, and always include a '/'.\nThe types supported at your site include, but are not limited to:\n\n");
-+                mc=FirstMailcapEntry;
-+                ct = 0;
-+                while (mc) {
-+                    if (mc->contenttype && index(mc->contenttype, '/') && !index(mc->contenttype, '*')) {
-+                        if (ct++) fputs(", ", stdout);
-+                        fputs(mc->contenttype, stdout);
-+                    }
-+                    mc = mc->next;
-+                }
-+                fputs("\n\nThe MIME content-type for file inclusion is 'application/octet-stream'.\n", stdout);
-+            }
-+            mp->content_type = freshcopy(LineBuf);
-+        } else mp->content_type=freshcopy("application/octet-stream");
-+        mp->encoding_type_needed = WhichEncodingForFile(mp->filename, mp->content_type);
-+        printf("Included data in '%s' format\n", mp->content_type);
-+	printf("(continue)\n");
-+        SetTextFlags(mp);
-+        return(mp);
-+    } else if (ans<0 || ans > i) {
-+        printf("Data insertion cancelled\n");
-+        return(NULL);
-+    }
-+    i=2;
-+    mc=FirstMailcapEntry;
-+    while (mc) {
-+        if (mc->composecommand || mc->composetypedcommand) {
-+            if (i == ans) break;
-+            ++i;
-+        }
-+        mc = mc->next;
-+    }
-+    CmdBuf = malloc(CMDSIZE);
-+    if (!CmdBuf) nomemabort();
-+    BuildCommand(CmdBuf, mc->composecommand ? mc->composecommand : mc->composetypedcommand, mp->filename);
-+    printf("Executing: %s\n", CmdBuf);
-+    resultcode = SYSTEM(CmdBuf);
-+    if (resultcode) {
-+        printf("Command execution failed, nothing included\n");
-+        free(CmdBuf);
-+        return(NULL);
-+    }
-+    if (access(mp->filename, R_OK)) {
-+        printf("No file was created, nothing included!\n");
-+        free(CmdBuf);
-+        return(NULL);
-+    }
-+    mp->istext = 0;
-+    if (mc->composecommand) {
-+        mp->content_type = mc->contenttype;
-+        mp->encoding_type_needed = WhichEncodingForFile(mp->filename, mp->content_type);
-+    } else {
-+        char c, LineBuf[1000], *colon, *ctypebuf = NULL, *cencbuf = NULL, *s, *newfilename;
-+        FILE *fp, *fpout;
-+        int inheaders=1, bct=0;
-+
-+        s = LineBuf;
-+        fp = fopen(mp->filename, "r");
-+        if (!fp) {
-+            fprintf(stderr, "Cannot read file %s, no data included.\n", mp->filename);
-+            free(CmdBuf);
-+            return(NULL);
-+        }
-+        while ((c = getc(fp)) != EOF && inheaders) {
-+            if (c == '\n') {
-+                c = getc(fp);
-+                if (c == ' ' || c == '\t') {
-+                    *s++ = ' ';
-+                } else {
-+                    /* actually process the header */
-+                    *s = 0;
-+                    colon = index(LineBuf, ':');
-+                    if (colon) {
-+                        *colon++ = 0;
-+                        for (s=LineBuf; *s; ++s) {
-+                            if (isupper(*s)) *s = tolower(*s);
-+                        }
-+                        if (!strcmp(LineBuf, "content-transfer-encoding")) {
-+                            cencbuf = malloc(1+strlen(colon));
-+                            if (!cencbuf) nomemabort();
-+                            strcpy(cencbuf, colon);
-+                        } else if (!strcmp(LineBuf, "content-type")) {
-+                            ctypebuf = malloc(1+strlen(colon));
-+                            if (!ctypebuf) nomemabort();
-+                            strcpy(ctypebuf, colon);
-+                        }
-+                    }
-+                    if (c == '\n') {
-+                        inheaders = 0;
-+                        break;
-+                    }
-+                    ungetc(c, fp);
-+                    s = LineBuf; /* start over */
-+                }
-+            } else {
-+                *s++ = c;
-+            }
-+        }
-+        if (!ctypebuf) {
-+            fprintf(stderr, "The command (%s) did not return a content-type value, so no data could be included.\n", CmdBuf);
-+            free(CmdBuf);
-+            return(NULL);
-+        }
-+        mp->content_type = ctypebuf;
-+        if (cencbuf) {
-+            while (*cencbuf && isspace(*cencbuf)) ++cencbuf;
-+            for (s=cencbuf; *s; ++s) {
-+                if (isupper(*s)) *s = tolower(*s);
-+            }
-+            if (!strncmp(cencbuf, "base64", 6)) {
-+                mp->encoding_type_needed = ENC_B64;
-+            } else if (!strncmp(cencbuf, "quoted-printable", 16)) {
-+                mp->encoding_type_needed = ENC_QP;
-+            } else {
-+                fprintf(stderr, "The command (%s) returned an unrecognized content-transfer-encoding value, so no data could be included.\n", CmdBuf);
-+                free(CmdBuf);
-+                return(NULL);
-+            }
-+        } else {
-+            mp->encoding_type_needed = ENC_NONE;
-+        }
-+        newfilename = tmpname();
-+        fpout = fdopen(mkstemp(newfilename), "w");
-+        if (!fpout) {
-+            fprintf(stderr, "Cannot open file %s for writing, no data included.\n", newfilename);
-+            free(CmdBuf);
-+            return(NULL);
-+        }
-+        switch(mp->encoding_type_needed) {
-+            case ENC_B64:
-+                from64(fp, fpout, NULL, &bct, 0);
-+                break;
-+            case ENC_QP:
-+                fromqp(fp, fpout, NULL, &bct);
-+                break;
-+            default:
-+                while ((c = getc(fp)) != EOF) {
-+                    putc(c, fpout);
-+                }
-+                break;
-+        }
-+        fclose(fp);
-+        fclose(fpout);
-+        unlink(mp->filename);
-+        mp->filename = newfilename;
-+    }
-+    SetTextFlags(mp);
-+    printf("Included data in '%s' format\n", mc->contenttype);
-+    printf("(continue)\n");
-+    free(CmdBuf);
-+    return(mp);
-+}
-+
-+SetTextFlags(mp)
-+struct mailpart *mp;
-+{
-+    if (!lc2strncmp(mp->content_type, "text/", 5)) {
-+        mp->istext = 1;
-+        if (!lc2strncmp(mp->content_type, "text/richtext", 13)) {
-+            mp->isrich = 1;
-+        }
-+    }
-+}
-+
-+WhichEncodingForFile(fname, ctype)
-+char *fname, *ctype;
-+{
-+    int c, linesize=0, total=0, unsafechars=0, longlines=0;
-+    char *s;
-+    FILE *fp = fopen(fname, "r");
-+    if (!fp) {
-+        /* If the stupid editing program forks, this actually will do a 
-+              reasonable thing as long as it saves the file before the mail is sent */
-+        return(ENC_B64); /* safest */
-+    }
-+    while ((c = getc(fp)) != EOF) {
-+        if (c>127) ++unsafechars;
-+        ++total;
-+        if (c == '\n') {
-+            if (linesize > 79) ++longlines;
-+            linesize = 0;
-+        } else ++linesize;
-+        if (total>1000 && (longlines || unsafechars)) break;
-+    }
-+    fclose(fp);
-+    if (longlines || unsafechars) {
-+        for (s=ctype; *s; ++s) if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
-+        if (!strncmp(ctype, "image/", 6)
-+             || !strncmp(ctype, "audio/", 6)
-+             || !strncmp(ctype, "application/octet-stream", 24)
-+             || !strncmp(ctype, "video/", 6)) {
-+            return(ENC_B64);
-+        }
-+        if (!unsafechars) return(ENC_QP);
-+
-+        return((total/unsafechars < 16) ? ENC_B64 : ENC_QP);
-+    }
-+    return(ENC_NONE);
-+}
-+
-+BuildCommand(Buf, controlstring, TmpFileName)
-+char *Buf, *controlstring, *TmpFileName;
-+{
-+    char *from, *to;
-+    int prefixed = 0;
-+    int NamedFile=0;
-+
-+    for (from=controlstring, to=Buf; *from; ++from) {
-+        if (prefixed) {
-+            prefixed = 0;
-+            switch(*from) {
-+                case '%':
-+                    *to++ = '%';
-+                    break;
-+                case 's':
-+                    if (TmpFileName) {
-+                        strcpy(to, TmpFileName);
-+                        to += strlen(TmpFileName);
-+                        ++NamedFile;
-+                    }
-+                    break;
-+                default:
-+                    fprintf(stderr, "Ignoring unrecognized format code in mailcap file: %%<%c\n", *from);
-+                    break;
-+            }
-+        } else if (*from == '%') {
-+            prefixed = 1;
-+        } else {
-+            *to++ = *from;
-+        }
-+    }
-+    *to = '\0';
-+    if (!NamedFile) {
-+        strcat(Buf, " > ");
-+        strcat(Buf, TmpFileName);
-+    }
-+}
-+
-+CtypeMatch(ctype, pat)
-+char *ctype, *pat;
-+{
-+    int len;
-+    char *s;
-+    for (s=ctype; *s; ++s) if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
-+    for (s=pat; *s; ++s) if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
-+    if (!strcmp(ctype, pat)) {
-+        return(1); /* exact match, case-insensitive */
-+    }
-+    len = strlen(pat);
-+    if ((pat[--len] == '*')
-+         && (pat[--len] == '/')
-+         && (!strncmp(ctype, pat, len))
-+         && (ctype[len] == '/')){
-+        /* wildcard match */
-+        return(1);
-+    }
-+    return(0);
-+}
-+
-+EditCurrentMessage(UseVisual)
-+int UseVisual;
-+{
-+    char *editor = NULL;
-+    char *CmdBuf, *CmdBuf2, LineBuf[100];
-+    struct mailpart *mp, *lastmp=NULL;
-+    struct MailcapEntry *mc;
-+    int partct=1, ans;
-+
-+    CmdBuf = malloc(CMDSIZE);
-+    CmdBuf2 = malloc(CMDSIZE);
-+    if (!CmdBuf || !CmdBuf2) nomemabort();
-+    if (!PartEndsWithNewline) {
-+        putc('\n', fpout);
-+        PartEndsWithNewline=1;
-+    }
-+    fclose(fpout);
-+    if (UseVisual) editor = getenv("VISUAL");
-+    if (!editor) editor = getenv("EDITOR");
-+    if (!editor) editor = DEFAULT_EDITOR;
-+    if (!FirstPart->next) {
-+        /* Only one part */
-+        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", editor, FirstPart->filename);
-+        printf("Executing: %s\n", CmdBuf);
-+        SYSTEM(CmdBuf);
-+        if ((FirstPart->istext || FirstPart->isrich) &&
-+             FirstPart->encoding_type_needed == ENC_NONE &&
-+             ContainsEightBitChar(FirstPart->filename)) {
-+            FirstPart->encoding_type_needed = ENC_QP;
-+        }
-+        fpout = fopen(FirstPart->filename, "a");
-+        free(CmdBuf);
-+        free(CmdBuf2);
-+        return;
-+    }
-+    lastmp = mp = FirstPart;
-+    while (mp) {
-+        printf("Part #%d is of type '%s'.\n", partct, mp->content_type);
-+        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", editor, mp->filename);
-+        if (mp->mc && mp->mc->editcommand) {
-+            BuildCommand(CmdBuf2, mp->mc->editcommand, mp->filename);
-+        } else {
-+            mc = FirstMailcapEntry;
-+            while (mc) {
-+                if (mc->editcommand && CtypeMatch(mp->content_type, mc->contenttype)) {
-+                    break;
-+                }
-+                mc = mc->next;
-+            }
-+            if (mc) {
-+                BuildCommand(CmdBuf2, mc->editcommand, mp->filename);
-+            } else {
-+                CmdBuf2[0] = '\0';
-+            }
-+        }
-+        if (CmdBuf2[0]) {
-+            printf("Which command do you want to use to edit it?\n\n");
-+            printf("1: %s\n", CmdBuf2);
-+            printf("2: %s\n", CmdBuf);
-+            printf("\n\nEnter 1 or 2, or 0 to not edit it: ");
-+            fflush(stdout);
-+            fgets(LineBuf, sizeof(LineBuf), stdin);
-+            ans = atoi(LineBuf);
-+        } else ans = 2;
-+        if (ans == 1) {
-+            printf("Executing: %s\n", CmdBuf2);
-+            SYSTEM(CmdBuf2);
-+        } else if (ans == 2) {
-+            printf("Executing: %s\n", CmdBuf);
-+            SYSTEM(CmdBuf);
-+        }
-+        if ((mp->istext || mp->isrich) &&
-+             mp->encoding_type_needed == ENC_NONE &&
-+             ContainsEightBitChar(mp->filename)) {
-+            mp->encoding_type_needed = ENC_QP;
-+        }
-+        ++partct;
-+        lastmp = mp;
-+        mp = mp->next;
-+    }
-+    fpout = fopen(lastmp->filename, "a");
-+    free(CmdBuf);
-+    free(CmdBuf2);
-+}
-+
-+
-+ProcessInitFiles() {
-+    char fname[FILE_NAME_SIZE];
-+
-+    ProcessOneMailRC("/usr/lib/Mail.rc", 0);
-+    snprintf(fname, sizeof(fname), "%s/.mailrc", gethome());
-+    ProcessOneMailRC(fname, 0);
-+    snprintf(fname, sizeof(fname), "%s/.AMS_aliases", gethome());
-+    ProcessOneMailRC(fname, 1);
-+}
-+
-+char *
-+NextAliasLine(LineBuf, LineAlloced, LineCount, fp, IsAndrew)
-+char *LineBuf;
-+int *LineAlloced, *LineCount;
-+FILE *fp;
-+int IsAndrew;
-+{
-+    char *sbuf;
-+    sbuf = malloc(MAX_LINELENGTH);
-+    if (!sbuf) nomemabort();
-+    if (!LineBuf) {
-+        *LineAlloced = MAX_LINELENGTH + MAX_LINELENGTH;
-+        LineBuf = malloc(*LineAlloced);
-+        if (!LineBuf) nomemabort();
-+    }
-+    *LineBuf = 0;
-+    *LineCount = 0;
-+    while (1) {
-+        if (fgets(sbuf, MAX_LINELENGTH, fp) == NULL) {
-+            return(LineBuf);
-+        }
-+        *LineCount += strlen(sbuf);
-+        if (*LineCount >= *LineAlloced) {
-+            *LineAlloced += MAX_LINELENGTH;
-+            LineBuf = realloc(LineBuf, *LineAlloced);
-+            if (!LineBuf) nomemabort();
-+        }
-+        strcat(LineBuf, sbuf);
-+        if (IsAndrew || LineBuf[*LineCount - 2] != '\\') return(LineBuf);
-+        /* The -2 got us past the newline. */
-+        LineBuf[*LineCount - 2] = ' ';
-+        *LineCount -= 1;
-+        LineBuf[*LineCount] = '\0';
-+    }
-+}
-+
-+ProcessOneMailRC(fname, IsAndrew)
-+char *fname;
-+int IsAndrew;
-+{
-+    FILE *fp;
-+    char *LineBuf = NULL, *sdum;
-+    int LineAlloced = 0, LineCount = 0;
-+
-+    fp = fopen(fname, "r");
-+    if (!fp) return;
-+    do {
-+        LineBuf=NextAliasLine(LineBuf, &LineAlloced, &LineCount, fp, IsAndrew);
-+        if (LineCount == 0) continue;
-+        if (IsAndrew && LineBuf[0] == '#') continue;
-+        for (sdum = LineBuf; *sdum; ++sdum) {
-+            if (*sdum == ' ') break; /* only map first word to lower case */
-+            if (isupper((unsigned char) *sdum)) *sdum = tolower((unsigned char) *sdum);
-+        }
-+        if (IsAndrew) {
-+            HandleAliasCommand(LineBuf);
-+        } else if (!strncmp(LineBuf, "set ", 4)) {
-+            HandleSetCommand(LineBuf+4, 1);
-+        } else if (!strncmp(LineBuf, "unset ", 6)) {
-+            HandleSetCommand(LineBuf+6, 0);
-+        } else if (!strncmp(LineBuf, "alias ", 6)) {
-+            HandleAliasCommand(LineBuf+6);
-+        } else {
-+            /* ignore */
-+        }
-+    } while (LineCount != 0);
-+    free(LineBuf);
-+    fclose(fp);
-+}
-+
-+HandleSetCommand(cmd, DoSet)
-+char *cmd;
-+int DoSet;
-+{
-+    char *s;
-+    int i;
-+
-+    while (*cmd) {
-+        while (*cmd && isspace((unsigned char) *cmd)) ++cmd;
-+        for (s=cmd; *s && !isspace((unsigned char) *s); ++s) {;}
-+        *s++ = '\0';
-+        if (!strcmp(cmd, "askcc")) {
-+            V_askcc = DoSet;
-+        } else if (!strcmp(cmd, "dot")) {
-+            V_dot = DoSet;
-+        } else if (!strcmp(cmd, "ignore")) {
-+            V_ignore = DoSet;
-+        } else if (!strcmp(cmd, "verbose")) {
-+            V_verbose = DoSet;
-+        } else if (!strcmp(cmd, "quiet")) {
-+            V_quiet = DoSet;
-+        } else if (!strcmp(cmd, "keepblind")) {
-+            V_keepblind = DoSet;
-+        } else if (!strcmp(cmd, "commasonly")) {
-+            V_commasonly = DoSet;
-+        } else if (!strncmp(cmd, "splitsize ", 9)) {
-+            i = atoi(cmd+10);
-+            if (i < MINCHUNKSIZE) {
-+                fprintf(stderr, "Ignoring splitsize mailrc setting of %d -- the minimum value is %d\n", i, MINCHUNKSIZE);
-+            } else {
-+                SplitSize = i;
-+            }
-+        } else {
-+            /* ignore */
-+        }
-+        cmd = s;;
-+    }
-+}
-+
-+struct alias {
-+    char *shortname, *longname;
-+    struct alias *next;
-+} *FirstAlias = NULL;
-+
-+HandleAliasCommand(aliasline)
-+char *aliasline;
-+{
-+    struct alias *tmpalias;
-+    char *s, *s2;
-+    int len = strlen(aliasline);
-+
-+    if (aliasline[len - 1] == '\n') {
-+        aliasline[len - 1] = '\0';
-+    }
-+    tmpalias = (struct alias *) malloc(sizeof (struct alias));
-+    s = malloc(len + 1);
-+    if (!s || !tmpalias) nomemabort();
-+    strcpy(s, aliasline);
-+    while (*s && isspace((unsigned char) *s)) { ++s;}
-+    for (s2=s; *s2 && !isspace((unsigned char) *s2); ++s2) {;}
-+    if (!*s2) {
-+        if (s != s2) printf("mailto: ignoring bad alias line in init file: %s\n", aliasline);
-+        free(s);
-+        free(tmpalias);
-+        return;
-+    }
-+    *s2++ = '\0';
-+    tmpalias->shortname = s;
-+    tmpalias->longname = s2;
-+    tmpalias->next = FirstAlias;
-+    FirstAlias = tmpalias;
-+}
-+
-+EmitHeader(fp, hdr, body)
-+FILE *fp;
-+char *hdr;
-+char *body;
-+{
-+    fputs(hdr, fp);
-+    fputs(": ", fp);
-+    HeaderFputs(body, fp, hdr);
-+    fputs("\n", fp);
-+/*    fprintf(fp, "%s: %s\n", hdr, body ? body : ""); */
-+}
-+
-+char *
-+firstbad(s)
-+char *s;
-+{
-+    char *dum;
-+    for (dum=s; *dum; ++dum) {
-+        if (!isascii(*dum) || iscntrl(*dum)) {
-+            return(dum);
-+        }
-+    }
-+    return(NULL);
-+}
-+
-+char *
-+firstgood(s)
-+char *s;
-+{
-+    char *dum;
-+    for (dum=s; *dum; ++dum) {
-+        if (isascii(*dum) && !iscntrl(*dum)) {
-+            return(dum);
-+        }
-+    }
-+    return(NULL);
-+}
-+
-+HeaderFputs(s, fp, hdr)
-+char *s;
-+FILE *fp;
-+char *hdr;
-+{
-+    char *firstnonascii, *firstascii;
-+
-+    if (!s) return;
-+    firstnonascii=firstbad(s);
-+    if (firstnonascii) {
-+        if (!strcmp(CharacterSet, "us-ascii")) {
-+            fprintf(stderr, "Warning:  The prevailing character set is ASCII.  Your %s header has\nnon-ASCII or non-printing ASCII characters which may be unreadable.\n", hdr);
-+        }
-+        while (firstnonascii) {
-+            while (s < firstnonascii) {
-+                putc(*s, fp);
-+                ++s;
-+            }
-+            firstascii=firstgood(s);
-+            if (!firstascii) firstascii = s+strlen(s);
-+            if ((firstascii - s) > 25) firstascii = s+25; /* Short encoded words */
-+            /* general format is =?charset?B or Q?encoded data?= */
-+            fprintf(fp, "=?%s?Q?", CharacterSet);
-+            while (s < firstascii) {
-+                PutQP(*s, fp);
-+                ++s;
-+            }
-+            fputs("?= ", fp); /* close encoded word */
-+            firstnonascii=firstbad(s);
-+        }
-+        while (*s) {
-+            putc(*s, fp);
-+            ++s;
-+        }
-+    } else {
-+        fputs(s, fp);
-+    }
-+}
-+
-+static char basis_hex[] = "0123456789ABCDEF";
-+
-+PutQP(c, fp)
-+unsigned char c;
-+FILE *fp;
-+{
-+    putc('=', fp);
-+    putc(basis_hex[c>>4], fp);
-+    putc(basis_hex[c&0xF], fp);
-+}
-+
-+EmitHeaderWithAliases(fp, hdr, names)
-+FILE *fp;
-+char *hdr;
-+char *names;
-+{
-+    fputs(hdr, fp);
-+    fputs(": ", fp);
-+    EmitAddresses(fp, names, hdr);
-+    fputs("\n", fp);
-+}
-+
-+EmitAddresses(fp, names, hdr)
-+FILE *fp;
-+char *names;
-+char *hdr;
-+{
-+    char *s;
-+    while (names) {
-+        s= index(names, ',');
-+        if (s) *s = '\0';
-+        DeAlias(names, fp, hdr);
-+        if (s) {
-+            *s++ = ',';
-+            fputs(",\n\t", fp);
-+        }
-+        names = s;
-+    }
-+}
-+
-+DeAlias(name, fp, hdr)
-+char *name;
-+FILE *fp;
-+char *hdr;
-+{
-+    struct alias *tmpalias;
-+    char *end, savechar;
-+
-+    while (isspace((unsigned char) *name)) ++name;
-+    end = name+strlen(name)-1;
-+    while (isspace((unsigned char) *end)) --end;
-+    ++end;
-+    savechar = *end;
-+    for (tmpalias=FirstAlias; tmpalias; tmpalias = tmpalias->next) {
-+        if (!strcmp(tmpalias->shortname, name)) { 
-+/*        if (!lc2strcmp(name, tmpalias->shortname)) { */
-+            *end = savechar;
-+            EmitAddresses(fp, tmpalias->longname, hdr);
-+            return;
-+        }
-+    }
-+    *end = savechar;
-+    HeaderFputs(name, fp, hdr);
-+}
-+
-+
-+WriteCtypeNicely(fp, ct)
-+FILE *fp;
-+char *ct;
-+{
-+    char *semi, *slash, *eq, *s;
-+
-+    for (s = ct; *s; ++s) {
-+        if (*s == '\n') *s = ' ';
-+    }
-+    semi = (char *) index(ct, ';');
-+    if (semi) *semi = '\0';
-+    slash = (char *) index(ct, '/');
-+    fputs(ct, fp);
-+    if (!slash) fputs("/unknown", fp);
-+    while (semi) {
-+        ct = semi + 1;
-+        *semi = ';';
-+        semi = (char *) index(ct, ';');
-+        if (semi) *semi = '\0';
-+        eq = (char *) index(ct, '=');
-+        if (eq) *eq = '\0';
-+        fputs(";\n\t", fp);
-+        while (isspace((unsigned char) *ct)) ++ct;
-+        fputs(ct, fp);
-+        if (eq) {
-+            s = eq;
-+            fputs("=", fp);
-+            ++s;
-+            while (isspace((unsigned char) *s)) ++s;
-+            fputsquoting(s, fp);
-+            *eq = '=';
-+        }
-+    }
-+}
-+
-+fputsquoting(s, fp)
-+char *s;
-+FILE *fp;
-+{
-+    char *end = s + strlen(s) - 1;
-+    while (isspace((unsigned char) *end) && end > s) --end;
-+    if (*s == '\"') {
-+        putc(*s, fp);
-+        while (*++s) {
-+            if (*s == '\"') break; /* MAY TERMINATE EARLY! */
-+            if (*s == '\\') {
-+                putc(*s, fp);
-+                ++s; /* Don't check this next char */
-+                if (!*s) break;
-+            }
-+            putc(*s, fp);
-+        }
-+        putc('\"', fp);
-+    } else {
-+        putc('\"', fp);
-+        putc(*s, fp);
-+        while (*++s) {
-+            if (*s == '\"' || *s == '\\') {
-+                putc('\\', fp);
-+            }
-+            putc(*s, fp);
-+        }
-+        putc('\"', fp);
-+    }
-+}
-+        
-+        
-+controlputc(c)
-+char c;
-+{
-+    fputc(c, stdout);
-+}
-+
-+/* Do the equivalent of an fputs for the terminal escape stuff */
-+
-+tfputs(s)
-+char *s;
-+{
-+    tputs(s, 1, controlputc);
-+}
-+
-+ContainsEightBitChar(fname)
-+char *fname;
-+{
-+    int c, eightBitSeen = 0;
-+    FILE *fp = fopen(fname, "r");
-+    if (!fp) {
-+        /* If the stupid editing program forks, this actually will do a
-+              reasonable thing as long as it saves the file before the mail is sent */
-+        return(1); /* safest */
-+    }
-+    while ((c = getc(fp)) != EOF) {
-+        if (c>127) {
-+            eightBitSeen = 1;
-+            break;
-+        }
-+    }
-+    fclose(fp);
-+    return(eightBitSeen);
-+}
-+
-+SwitchToEuropean() {
-+    printf("WARNING:  You have entered 8-bit characters in what is supposed to be\n");
-+    printf("plain ASCII text.  If you are using a non-ASCII character set, you should\n");
-+    printf("declare this to be the case with the MM_CHARSET environment variable.\n");
-+    printf("For now, I am assuming you are using the iso-8859-1 character set,\n");
-+    printf("but this may be false.\n");
-+    CharacterSet = malloc(12);
-+    if (!CharacterSet) nomemabort();
-+    strcpy(CharacterSet, "iso-8859-1");
-+}
-+
-+    
---- metamail-2.7.orig/src/metamail/Makefile.am
-+++ metamail-2.7/src/metamail/Makefile.am
-@@ -0,0 +1,21 @@
-+MAINTAINERCLEANFILES    = Makefile.in
-+
-+CFLAGS			= -lncurses
-+
-+INCLUDES                = -I$(top_builddir) -I$(top_builddir)/metamail \
-+                        -I$(top_srcdir) -I$(top_srcdir)/metamail
-+
-+bin_PROGRAMS            = metamail mimencode mailto splitmail
-+
-+metamail_SOURCES	= metamail.c codes.c uue.c shared.c environment.c \
-+mailcap.c tmpfile.c
-+metamail_LDADD		= $(top_builddir)/metamail/libmetamail.la
-+
-+mimencode_SOURCES	= mimencode.c codes.c
-+mimencode_LDADD		= $(top_builddir)/metamail/libmetamail.la
-+
-+mailto_SOURCES		= mailto.c codes.c shared.c
-+mailto_LDADD		= $(top_builddir)/metamail/libmetamail.la
-+
-+splitmail_SOURCES	= splitmail.c shared.c
-+splitmail_LDADD		= $(top_builddir)/metamail/libmetamail.la
---- metamail-2.7.orig/src/metamail/Makefile.in
-+++ metamail-2.7/src/metamail/Makefile.in
-@@ -0,0 +1,399 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+MAINTAINERCLEANFILES = Makefile.in
-+
-+CFLAGS = -lncurses
-+
-+INCLUDES = -I$(top_builddir) -I$(top_builddir)/metamail                         -I$(top_srcdir) -I$(top_srcdir)/metamail
-+
-+
-+bin_PROGRAMS = metamail mimencode mailto splitmail
-+
-+metamail_SOURCES = metamail.c codes.c uue.c shared.c environment.c mailcap.c tmpfile.c
-+
-+metamail_LDADD = $(top_builddir)/metamail/libmetamail.la
-+
-+mimencode_SOURCES = mimencode.c codes.c
-+mimencode_LDADD = $(top_builddir)/metamail/libmetamail.la
-+
-+mailto_SOURCES = mailto.c codes.c shared.c
-+mailto_LDADD = $(top_builddir)/metamail/libmetamail.la
-+
-+splitmail_SOURCES = splitmail.c shared.c
-+splitmail_LDADD = $(top_builddir)/metamail/libmetamail.la
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = ../../metamail/config.h
-+CONFIG_CLEAN_FILES = 
-+bin_PROGRAMS =  metamail$(EXEEXT) mimencode$(EXEEXT) mailto$(EXEEXT) \
-+splitmail$(EXEEXT)
-+PROGRAMS =  $(bin_PROGRAMS)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir) -I../../metamail
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
-+metamail_OBJECTS =  metamail.$(OBJEXT) codes.$(OBJEXT) uue.$(OBJEXT) \
-+shared.$(OBJEXT) environment.$(OBJEXT) mailcap.$(OBJEXT) \
-+tmpfile.$(OBJEXT)
-+metamail_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
-+metamail_LDFLAGS = 
-+mimencode_OBJECTS =  mimencode.$(OBJEXT) codes.$(OBJEXT)
-+mimencode_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
-+mimencode_LDFLAGS = 
-+mailto_OBJECTS =  mailto.$(OBJEXT) codes.$(OBJEXT) shared.$(OBJEXT)
-+mailto_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
-+mailto_LDFLAGS = 
-+splitmail_OBJECTS =  splitmail.$(OBJEXT) shared.$(OBJEXT)
-+splitmail_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
-+splitmail_LDFLAGS = 
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON =  Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+DEP_FILES =  .deps/codes.P .deps/environment.P .deps/mailcap.P \
-+.deps/mailto.P .deps/metamail.P .deps/mimencode.P .deps/shared.P \
-+.deps/splitmail.P .deps/tmpfile.P .deps/uue.P
-+SOURCES = $(metamail_SOURCES) $(mimencode_SOURCES) $(mailto_SOURCES) $(splitmail_SOURCES)
-+OBJECTS = $(metamail_OBJECTS) $(mimencode_OBJECTS) $(mailto_OBJECTS) $(splitmail_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .lo .o .obj .s
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/metamail/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+mostlyclean-binPROGRAMS:
-+
-+clean-binPROGRAMS:
-+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-+
-+distclean-binPROGRAMS:
-+
-+maintainer-clean-binPROGRAMS:
-+
-+install-binPROGRAMS: $(bin_PROGRAMS)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-binPROGRAMS:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	done
-+
-+# FIXME: We should only use cygpath when building on Windows,
-+# and only if it is available.
-+.c.obj:
-+	$(COMPILE) -c `cygpath -w $<`
-+
-+.s.o:
-+	$(COMPILE) -c $<
-+
-+.S.o:
-+	$(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+	-rm -f *.o core *.core
-+	-rm -f *.$(OBJEXT)
-+
-+clean-compile:
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+.s.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+.S.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+
-+maintainer-clean-libtool:
-+
-+metamail$(EXEEXT): $(metamail_OBJECTS) $(metamail_DEPENDENCIES)
-+	@rm -f metamail$(EXEEXT)
-+	$(LINK) $(metamail_LDFLAGS) $(metamail_OBJECTS) $(metamail_LDADD) $(LIBS)
-+
-+mimencode$(EXEEXT): $(mimencode_OBJECTS) $(mimencode_DEPENDENCIES)
-+	@rm -f mimencode$(EXEEXT)
-+	$(LINK) $(mimencode_LDFLAGS) $(mimencode_OBJECTS) $(mimencode_LDADD) $(LIBS)
-+
-+mailto$(EXEEXT): $(mailto_OBJECTS) $(mailto_DEPENDENCIES)
-+	@rm -f mailto$(EXEEXT)
-+	$(LINK) $(mailto_LDFLAGS) $(mailto_OBJECTS) $(mailto_LDADD) $(LIBS)
-+
-+splitmail$(EXEEXT): $(splitmail_OBJECTS) $(splitmail_DEPENDENCIES)
-+	@rm -f splitmail$(EXEEXT)
-+	$(LINK) $(splitmail_LDFLAGS) $(splitmail_OBJECTS) $(splitmail_LDADD) $(LIBS)
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = src/metamail
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/metamail/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am: install-binPROGRAMS
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-binPROGRAMS
-+uninstall: uninstall-am
-+all-am: Makefile $(PROGRAMS)
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-+		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-+		mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
-+		clean-depend clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
-+		distclean-tags distclean-depend distclean-generic \
-+		clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-+		maintainer-clean-compile maintainer-clean-libtool \
-+		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-+maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-+mostlyclean-compile distclean-compile clean-compile \
-+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-+distclean-tags clean-tags maintainer-clean-tags distdir \
-+mostlyclean-depend distclean-depend clean-depend \
-+maintainer-clean-depend info-am info dvi-am dvi check check-am \
-+installcheck-am installcheck install-exec-am install-exec \
-+install-data-am install-data install-am install uninstall-am uninstall \
-+all-redirect all-am all installdirs mostlyclean-generic \
-+distclean-generic clean-generic maintainer-clean-generic clean \
-+mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/src/metamail/output
-+++ metamail-2.7/src/metamail/output
-@@ -0,0 +1,428 @@
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=7  (from Stephan Wright <stephan.wright@chello.at> )
-+MM_HEADERS=
-+From stephan.wright@chello.at Wed Jan 17 00:54:06 2001
-+Return-path: <stephan.wright@chello.at>
-+Envelope-to: mike@localhost
-+Delivery-date: Wed, 17 Jan 2001 00:54:06 +0100
-+Received: from localhost ([127.0.0.1] ident=mail)
-+	by skair.in.natoka.at with esmtp (Exim 3.20 #1 (Debian))
-+	id 14IfvR-0000eJ-00
-+	for <mike@localhost>; Wed, 17 Jan 2001 00:54:05 +0100
-+Received: from stud3.tuwien.ac.at [193.170.75.13]
-+	by localhost with POP3 (fetchmail-5.5.3)
-+	for mike@localhost (single-drop); Wed, 17 Jan 2001 00:54:05 +0100 (CET)
-+Received: from mr.tuwien.ac.at (mr.tuwien.ac.at [128.130.2.10])
-+	by stud3.tuwien.ac.at (8.9.3 (PHNE_18979)/8.9.3) with ESMTP id AAA08182;
-+	Wed, 17 Jan 2001 00:39:08 +0100 (MET)
-+Received: from viemta06.chello.at (viemta06.chello.at [195.34.133.56])
-+	by mr.tuwien.ac.at (8.11.1/8.11.1) with ESMTP id f0GNd4C26837;
-+	Wed, 17 Jan 2001 00:39:04 +0100 (MET)
-+Received: from michelangelo.telekabel.at ([62.178.9.127])
-+          by viemta06.chello.at
-+          (InterMail vK.4.03.01.00 201-232-122 license 9caa03a7df1d31c048ffcc0d31ac5855)
-+          with ESMTP
-+          id <20010116233900.BMRG7188.viemta06@michelangelo.telekabel.at>;
-+          Wed, 17 Jan 2001 00:39:00 +0100
-+Message-ID: <3A64DBB9.74527B61@chello.at>
-+Date: Wed, 17 Jan 2001 00:39:37 +0100
-+From: Stephan Wright <stephan.wright@chello.at>
-+Reply-To: stephan.wright@chello.at
-+X-Mailer: Mozilla 4.01 [de] (Win95; I)
-+MIME-Version: 1.0
-+To: Wolfgang Hiermann <wolfgang.hiermann@teleweb.at>,
-+        Susanne Schuster <e9107982@student.tuwien.ac.at>,
-+        Roland Summerauer <h9751337@obelix.wu-wien.ac.at>,
-+        Raimund Kirner <e9625030@student.tuwien.ac.at>,
-+        "Michael Mörz" <e9625136@student.tuwien.ac.at>,
-+        Doris Ulrich <e8101579@student.tuwien.ac.at>,
-+        Daniel Wronski <e9625027@student.tuwien.ac.at>,
-+        Balazs Lichtl <e9625772@stud3.tuwien.ac.at>
-+Subject: [Fwd: Fw: Das ist aber lieb geschrieben!]
-+X-Priority: 3 (Normal)
-+Content-Type: multipart/mixed; boundary="------------A0D4511CCFC2DF8B814B1B9E"
-+X-UIDL: *2+!!Ec8e9F>?!!70^!!
-+Status: RO
-+Content-Length: 32777
-+Lines: 485
-+
-+MM_NOTTTY=1
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=multipart/mixed ; boundary = "------------A0D4511CCFC2DF8B814B1B9E"
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=oding: 8bit  (from Stephan Wright <stephan.wright@chello.at> )
-+MM_HEADERS=
-+Content-Type: text/plain; charset=iso-8859-1
-+Content-Type: text/plain; charset=iso-8859-1
-+Content-Transfer-Encoding: 8bit
-+Content-Transfer-Encoding: 8bit
-+
-+MM_NOTTTY=1
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=text/plain ; charset = iso-8859-1
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=oding: 8bit  (from Stephan Wright <stephan.wright@chello.at> )
-+MM_HEADERS=
-+Content-Type: text/plain; charset=iso-8859-1
-+Content-Type: text/plain; charset=iso-8859-1
-+Content-Transfer-Encoding: 8bit
-+Content-Transfer-Encoding: 8bit
-+
-+MM_NOTTTY=0
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=text/plain ; charset = iso-8859-1
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+Metamail Version 2.7, debugging turned on.
-+Trying to open input file: ../../../../metamailtest
-+Date: Wed, 17 Jan 2001 00:39:37 +0100
-+From: Stephan Wright <stephan.wright@chello.at>
-+To: Wolfgang Hiermann <wolfgang.hiermann@teleweb.at>,         Susanne Schuster <e9107982@student.tuwien.ac.at>,         Roland Summerauer <h9751337@obelix.wu-wien.ac.at>,         Raimund Kirner <e9625030@student.tuwien.ac.at>,         "Michael Mörz" <e9625136@student.tuwien.ac.at>,         Doris Ulrich <e8101579@student.tuwien.ac.at>,         Daniel Wronski <e9625027@student.tuwien.ac.at>,         Balazs Lichtl <e9625772@stud3.tuwien.ac.at>
-+Subject: [Fwd: Fw: Das ist aber lieb geschrieben!]
-+NEW PARAMETER: boundary VALUE: "------------A0D4511CCFC2DF8B814B1B9E"
-+
-+Here is the environment:
-+
-+Handling multipart as built-in here.  Boundary: --------------A0D4511CCFC2DF8B814B1B9E
-+NEW PARAMETER: charset VALUE: iso-8859-1
-+
-+Here is the environment:
-+
-+Here is the environment:
-+
-+---Executing: xterm -title 'oding: 8bit  (from Stephan Wright <stephan.wright@chello.at> )' -e  metamail -P -b -c 'text/plain ; charset = iso-8859-1' /tmp/MQxhZtQ
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=inline  (from Stephan Wright <stephan.wright@chello.at> )
-+MM_HEADERS=
-+Content-Type: message/rfc822
-+Content-Transfer-Encoding: 8bit
-+Content-Disposition: inline
-+
-+MM_NOTTTY=1
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=message/rfc822
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
-+MM_HEADERS=
-+Return-Path: <Marion.spahlholz@chello.at>
-+Received: from marionharald ([213.47.119.62]) by viemta06.chello.at
-+          (InterMail vK.4.03.01.00 201-232-122 license 9caa03a7df1d31c048ffcc0d31ac5855)
-+          with SMTP id <20010112191934.DEQK23142.viemta06@marionharald>;
-+          Fri, 12 Jan 2001 20:19:34 +0100
-+Message-ID: <00b301c07ccd$7e71c8e0$3e772fd5@telekabel.at>
-+From: "Marion Spahlholz" <Marion.spahlholz@chello.at>
-+To: "Peter Ipser" <peter.ipser@chello.at>
-+Cc: "Rudolf Meyer" <rudolf.meyer@chello.at>,
-+	"Martina Fitzka" <tini@yline.com>,
-+	=?iso-8859-1?Q?Evelyn_L=F6wenrosen?= <evelyn.loewenrosen@chello.at>,
-+	"Stephan Wright" <stephan.wright@chello.at>
-+Subject: Fw: Das ist aber lieb geschrieben!
-+Date: Fri, 12 Jan 2001 20:25:59 +0100
-+MIME-Version: 1.0
-+Content-Type: multipart/mixed;
-+	boundary="----=_NextPart_000_00B0_01C07CD5.E0149F20"
-+X-Priority: 3
-+X-MSMail-Priority: Normal
-+X-Mailer: Microsoft Outlook Express 5.50.4133.2400
-+X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
-+
-+MM_NOTTTY=1
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=multipart/mixed ; boundary = "----=_NextPart_000_00B0_01C07CD5.E0149F20"
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
-+MM_HEADERS=
-+Content-Type: text/plain;
-+	charset="iso-8859-1"
-+Content-Transfer-Encoding: 8bit
-+
-+MM_NOTTTY=1
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=text/plain ; charset = "iso-8859-1"
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
-+MM_HEADERS=
-+Content-Type: text/plain;
-+	charset="iso-8859-1"
-+Content-Transfer-Encoding: 8bit
-+
-+MM_NOTTTY=0
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=text/plain ; charset = "iso-8859-1"
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
-+Command exit status: 0
-+‡(­û‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@ˆƒ@
-+Here is the environment:
-+
-+From: "Marion Spahlholz" <Marion.spahlholz@chello.at>
-+To: "Peter Ipser" <peter.ipser@chello.at>
-+Cc: "Rudolf Meyer" <rudolf.meyer@chello.at>,  "Martina Fitzka" <tini@yline.com>,  [** iso-8859-1 charset **] Evelyn Löwenrosen‡(­û‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@ˆƒ@<evelyn.loewenrosen@chello.at>,  "Stephan Wright" <stephan.wright@chello.at>
-+Subject: Fw: Das ist aber lieb geschrieben!
-+Date: Fri, 12 Jan 2001 20:25:59 +0100
-+MIME-Version: 1.0
-+NEW PARAMETER: boundary VALUE: "----=_NextPart_000_00B0_01C07CD5.E0149F20"
-+X-Priority: 3
-+X-MSMail-Priority: Normal
-+X-Mailer: Microsoft Outlook Express 5.50.4133.2400
-+X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
-+
-+
-+Here is the environment:
-+
-+Handling multipart as built-in here.  Boundary: ------=_NextPart_000_00B0_01C07CD5.E0149F20
-+NEW PARAMETER: charset VALUE: "iso-8859-1"
-+
-+Here is the environment:
-+
-+Here is the environment:
-+
-+---Executing: xterm -title 'Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )' -e  metamail -P -b -c 'text/plain ; charset = "iso-8859-1"' /tmp/MGsYu2s
-+PWD=/home/mike/debian/metamail-2.7/src/metamail
-+XAUTHORITY=/home/mike/.Xauthority
-+WINDOWID=20971534
-+MM_SUMMARY=attachment;  filename="Fortflanzung.gif"  (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
-+MM_HEADERS=
-+Content-Type: image/gif;
-+	name="Fortflanzung.gif"
-+Content-Transfer-Encoding: base64
-+Content-Disposition: attachment;
-+	filename="Fortflanzung.gif"
-+
-+MM_NOTTTY=1
-+MM_QUIET=cat
-+HOSTNAME=skair
-+DEBFULLNAME=Michael Moerz
-+MM_MAILER=unknown
-+GDMSESSION=Gnome
-+USER=mike
-+MACHTYPE=i386-pc-linux-gnu
-+DEBEMAIL=e9625136@stud3.tuwien.ac.at
-+MAIL=/var/spool/mail/mike
-+LANG=C
-+DISPLAY=:0.0
-+MM_USEPAGER=0
-+LOGNAME=mike
-+SHLVL=3
-+SSH_AGENT_PID=1306
-+SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
-+MM_CONTENTTYPE=image/gif ; name = "Fortflanzung.gif"
-+USERNAME=mike
-+SHELL=/bin/bash
-+HOSTTYPE=i386
-+CVSROOT=:pserver:mike@localhost:/home/repositories
-+MM_DEBUG=1
-+MM_NOASK=text,text/plain,text/richtext
-+MM_RUNASROOT=0
-+OSTYPE=linux-gnu
-+HOME=/home/mike
-+TERM=xterm
-+SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
-+PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
-+_=/usr/bin/printenv
---- metamail-2.7.orig/src/metamail/metamail_default.h
-+++ metamail-2.7/src/metamail/metamail_default.h
-@@ -0,0 +1,9 @@
-+#ifndef METAMAIL_DEFAULT_H
-+#define METAMAIL_DEFAULT_H 1
-+
-+char *mmversion = MM_VERSTRING;
-+char *NoAskDefault = "text,text/plain,text/richtext";
-+char *QuietDefault = CATCOMMAND;
-+char *tmproot="";
-+
-+#endif /* METAMAIL_DEFAULT_H */
---- metamail-2.7.orig/src/metamail/includeaway
-+++ metamail-2.7/src/metamail/includeaway
-@@ -0,0 +1,97 @@
-+#ifdef BORLAND
-+#define F_OK 0
-+extern unsigned _stklen = 16384;
-+extern char *mktemp(char *);
-+#define WRITE_BINARY	"w"
-+#else /* BORLAND */
-+#ifdef MICROSOFT
-+#include <malloc.h>
-+#include <stdlib.h>
-+#include <time.h>
-+#include <signal.h>
-+#define F_OK 0
-+#else
-+
-+#ifndef AMIGA
-+#ifdef SYSV
-+//#include <termio.h>
-+//#include <unistd.h>
-+#else /* SYSV */
-+#include <sgtty.h>
-+#endif /* SYSV */
-+#endif /* AMIGA */
-+#endif /* MICROSOFT */
-+#endif /* BORLAND */
-+
-+//#if defined(SYSV) && !defined(linux)
-+//#define LPRTEMPLATE "lp %s"
-+//#define LPRCOMMAND "lp"
-+//#else
-+//#define LPRTEMPLATE "lpr %s"
-+//#define LPRCOMMAND "lpr"
-+
-+#endif
-+#ifdef MSDOS
-+#define CATCOMMAND  "cat"
-+#define CATTEMPLATE "cat %s"
-+#define METAMAIL    "metamail"
-+#define TMPFILE_NAME_SIZE   128
-+#define MAX_FILE_NAME_SIZE 128
-+#define WRITE_BINARY	"wb"
-+#else /* MSDOS */
-+#ifdef AMIGA
-+extern char *MkRmScript();
-+#ifndef F_OK
-+#define F_OK (0)
-+#endif
-+#define CATCOMMAND  "Type"
-+#define CATTEMPLATE "Type %s"
-+#define METAMAIL    "metamail <*"
-+#define TMPFILE_NAME_SIZE     50
-+#define MAX_FILE_NAME_SIZE 256
-+#define WRITE_BINARY	"w"
-+#else /* AMIGA */
-+//extern char **environ, *gets();
-+//#define CATCOMMAND  "cat"
-+//#define CATTEMPLATE "cat %s"
-+//#define METAMAIL    "metamail"
-+//#define TMPFILE_NAME_SIZE   1000
-+//#define MAX_FILE_NAME_SIZE 1000
-+//#define WRITE_BINARY	"w"
-+#endif /* AMIGA */
-+#endif /* MSDOS */
-+
-+//#ifndef NO_RLIMITS
-+//#include <sys/resource.h>
-+//#endif
-+
-+//#define CMDSIZE 1200 /* Maximum size of command to execute */
-+
-+//#define LINE_BUF_SIZE       2000
-+
-+#ifndef MICROSOFT
-+extern char *malloc();
-+extern char *realloc();
-+#endif
-+
-+//extern FILE *popen();
-+//static char *nomem = "Out of memory!";
-+//static char *mmversion = MM_VERSTRING;
-+//static char *NoAskDefault = "text,text/plain,text/richtext";
-+//static char *QuietDefault = CATCOMMAND;
-+//static char *tmproot="";
-+
-+//#define ENCODING_NONE 0
-+//#define ENCODING_BASE64 1
-+//#define ENCODING_QUOTEDPRINTABLE 2
-+//#define ENCODING_8BIT 3
-+//#define ENCODING_UUENCODE -1	/* non-standard */
-+
-+#ifdef MICROSOFT
-+/* Need a function prototype for TryMailcapEntry because without it MSC
-+ * passes a pointer to the structure rather than the structure itself.
-+ */
-+TryMailcapEntry(struct MailcapEntry mc, char *SquirrelFile);
-+#endif
-+
-+
---- metamail-2.7.orig/src/metamail/mailcap.c
-+++ metamail-2.7/src/metamail/mailcap.c
-@@ -0,0 +1,118 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+/* mailcap.c - contains functions to access and parse mailcap files
-+    Authors:  Nathaniel S. Borenstein, Bellcore
-+              Michael Moerz <mikem@debian.org>
-+*/
-+
-+#include <metamail/common.h>
-+
-+#include "mailcap.h"
-+#include "metamail.h"
-+
-+/* Only one or the other set up builtins gets used,
-+  depending on whether or not we're in the middle of 
-+          a multipart/alternative body part */
-+struct MailcapEntry BuiltIns[] = {
-+    {"text/*", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
-+    {NULL, NULL, NULL, 0, 0, 0}};
-+
-+struct MailcapEntry BuiltInsAlternative[] = {
-+    {"text/plain", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
-+    {NULL, NULL, NULL, 0, 0, 0}};
-+
-+/** hmm, ... 
-+*/
-+int
-+ProcessMailcapFiles(SquirrelFile) 
-+char *SquirrelFile;
-+{
-+    char *s, *pathcopy = NULL;
-+    char *path = getenv("MAILCAPS");
-+    if (!path) {
-+        uid_t uid = getuid();
-+        struct passwd *p;
-+        p = getpwuid(uid);
-+	if (p) {
-+	  path = XMALLOC(char, 5 + strlen(p->pw_dir) + strlen(STDPATH));
-+	}
-+        strcpy(path, p->pw_dir);
-+        strcat(path, STDPATH);
-+        pathcopy = path;
-+    } else 
-+    {
-+        pathcopy = XMALLOC(char, 1+strlen(path));
-+        strcpy(pathcopy, path);
-+        path = pathcopy;
-+    }
-+    while(path) {
-+        s = index(path, PATH_SEPARATOR);
-+        if (s) *s++ = 0;
-+        if (!ProcessMailcapFile(path, SquirrelFile)) return(0);
-+        path = s;
-+    }
-+    if (pathcopy) XFREE(pathcopy);
-+    return(-1);
-+}
-+
-+int
-+TryBuiltIns(SquirrelFile) 
-+char *SquirrelFile;
-+{
-+  int i;
-+  /* Last resort -- for sites that didn't bother putting a "text" line in 
-+     their mailcap files... */
-+  if (DoDebug) 
-+    fprintf(stderr, "Looking for '%s' in built-in content-type handling "
-+	    "settings.\n", ContentType);
-+  for (i=0; BuiltIns[i].contenttype; ++i) {
-+    if (!TryMailcapEntry(SquirrelFile ? BuiltInsAlternative[i] : BuiltIns[i], SquirrelFile))
-+      return(0);
-+  }
-+  return(-1);
-+}
-+
-+int
-+ProcessMailcapFile(file, SquirrelFile)
-+char *file, *SquirrelFile;
-+{
-+    struct MailcapEntry mc;
-+    FILE *fp;
-+    int res;
-+
-+    res = IsDirectory(file);
-+    if (res) {
-+	if (res == 1) {
-+	    fprintf(stderr, "Mailcap path entry '%s' is a directory, should be a readable file.\n", file);
-+	} else if (DoDebug) {
-+	/* Quietly ignore non-existent mailcap files unless debugging */
-+	    fprintf(stderr, "Mailcap path entry '%s' does not exist.\n", file);
-+	}
-+	return(-1);
-+    }
-+    fp = fopen(file, "r");
-+    if (DoDebug) fprintf(stderr, "Looking for '%s' in mailcap file '%s'.\n", ContentType, file);
-+    while (fp && !feof(fp)) {
-+        mc.needtofree = 0;
-+	if (GetMailcapEntry(fp, &mc)) {
-+            if (!TryMailcapEntry(mc, SquirrelFile)) {
-+                fclose(fp);
-+                return(0);
-+            }
-+	}
-+    }
-+    if (fp) fclose(fp);
-+    return(-1);
-+}
---- metamail-2.7.orig/src/metamail/mailcap.h
-+++ metamail-2.7/src/metamail/mailcap.h
-@@ -0,0 +1,34 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+
-+#ifndef METAMAIL_MAILCAP_H
-+#define METAMAIL_MAILCAP_H 1
-+
-+struct MailcapEntry {
-+  char *contenttype;
-+  char *command;
-+  char *testcommand;
-+  int needsterminal;
-+  int copiousoutput;
-+  int needtofree;
-+  char *label;
-+  char *printcommand;
-+};
-+
-+int  ProcessMailcapFiles (char *);
-+int  TryBuiltIns         (char *);
-+int  ProcessMailcapFile  (char *, char*);
-+
-+#endif /* METAMAIL_MAILCAP_H */
---- metamail-2.7.orig/src/metamail/shared.c
-+++ metamail-2.7/src/metamail/shared.c
-@@ -0,0 +1,120 @@
-+#include <stdio.h>
-+#include <ctype.h>
-+#include <config.h>
-+#include <stdlib.h>  /* malloc(3) and realloc(3) */
-+#ifdef SYSV
-+#include <unistd.h>
-+#include <sys/utsname.h>
-+#endif
-+
-+char **Exceptions;
-+int *NeedsPortableNewlines;
-+int ExceptionsAlloced = 0, ExceptionsUsed = 0;
-+
-+ExceptionalNewline(contenttype, needsportable)
-+char *contenttype;
-+int needsportable;
-+{
-+    char *s;
-+    if (ExceptionsAlloced == 0) {
-+        ExceptionsAlloced = 25;
-+        Exceptions = (char **) malloc(ExceptionsAlloced * sizeof(char *));
-+        NeedsPortableNewlines = (int *) malloc(ExceptionsAlloced * sizeof(int));
-+        if (!Exceptions || !NeedsPortableNewlines) return(-1);
-+    }
-+    if (ExceptionsUsed >= ExceptionsAlloced) {
-+        ExceptionsAlloced += 25;
-+        Exceptions = (char **) realloc(Exceptions, ExceptionsAlloced * sizeof(char *));
-+        NeedsPortableNewlines = (int *) realloc(NeedsPortableNewlines, ExceptionsAlloced * sizeof(int));
-+        if (!Exceptions || !NeedsPortableNewlines) return(-1);
-+    }
-+    s = malloc(1+strlen(contenttype));
-+    if (!s) return(-1);
-+    strcpy(s, contenttype);
-+    Exceptions[ExceptionsUsed] = s;
-+    for (; *s; ++s) {
-+        if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
-+    }
-+    NeedsPortableNewlines[ExceptionsUsed] = needsportable;
-+    ++ExceptionsUsed;
-+    return(0);
-+}
-+
-+DoesNeedPortableNewlines(ctype)
-+char *ctype;
-+{
-+    int i;
-+
-+    /* First, handle the customization/override case */
-+    for (i=0; i<ExceptionsUsed; ++i) {
-+        if (!lc2strcmp(ctype, Exceptions[i])) {
-+             return(NeedsPortableNewlines[i]);
-+        }
-+    }
-+    /* But for most folks, the simple defaults will always suffice */
-+    if (!lc2strncmp(ctype, "text", 4)) {
-+        return(1);
-+    }
-+    /* The following two are weird; message & multipart should never be encoded, but they really are line-oriented, so if they ARE encoded (and for PEM, it is even legitimate) they should use portable newlines */
-+    if (!lc2strncmp(ctype, "message", 7)) {
-+        return(1);
-+    }
-+    if (!lc2strncmp(ctype, "multipart", 9)) {
-+        return(1);
-+    }
-+    return(0);
-+}
-+
-+lc2strncmp(s1, s2, len)
-+char *s1, *s2;
-+int len;
-+{
-+    if (!s1 || !s2) return (-1);
-+    while (*s1 && *s2 && len > 0) {
-+	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
-+	++s1; ++s2; --len;
-+    }
-+    if (len <= 0) return(0);
-+    return((*s1 == *s2) ? 0 : -1);
-+}
-+
-+lc2strcmp(s1, s2)
-+char *s1, *s2;
-+{
-+    if (!s1 || !s2) return (-1);
-+    while (*s1 && *s2) {
-+	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
-+	++s1; ++s2;
-+    }
-+    return((*s1 == *s2) ? 0 : -1);
-+}
-+
-+char *getmyname() {
-+    static int initialized = 0;
-+#ifdef SYSV
-+    static struct utsname u;
-+    static char *hostname = u.nodename;
-+#else
-+    static char hostname[60];
-+#endif
-+    if (!initialized) {
-+#ifdef AMIGA
-+        strcpy(hostname, myAddress);
-+#else
-+#ifdef SYSV
-+    if (uname(&u) == -1) {
-+        hostname = "UNKNOWN.SITE.NAME";
-+    }
-+#else
-+#ifdef MSDOS
-+    strcpy(hostname, "UNKNOWN.SITE.NAME");
-+#else
-+        gethostname(hostname, sizeof(hostname));
-+#endif /* MSDOS */
-+#endif /* SYSV */
-+#endif /* AMIGA */
-+        initialized = 1;
-+    }
-+    return(hostname);
-+}
-+
---- metamail-2.7.orig/src/metamail/splitmail.c
-+++ metamail-2.7/src/metamail/splitmail.c
-@@ -0,0 +1,433 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+/****************************************************** 
-+    Metamail -- A tool to help diverse mail readers 
-+                cope with diverse multimedia mail formats.
-+
-+    Author:  Nathaniel S. Borenstein, Bellcore
-+
-+ ******************************************************* */
-+
-+#include <metamail/common.h>
-+
-+#define MINCHUNKSIZE 20000 /* Better be enough to hold the headers, or we die! */
-+
-+extern char *getenv();
-+#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
-+#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
-+
-+usageexit() {
-+    fprintf(stderr, "Usage:  splitmail [-d] [-v] [-s splitsize] [-i id-suffix] [-p prefix] [file-name]\n");
-+    exit(-1);
-+}
-+
-+char *MonthNames[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-+char *DayNames[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-+
-+char *
-+endofheader(s)
-+char *s;
-+{
-+    char *orgs = s, c;
-+    while (1) {
-+	s = index(s, '\n');
-+	if (!s) return(orgs+strlen(orgs));
-+	c = *(s+1);
-+        if (c != ' ' && c != '\t') return(s);
-+        ++s;
-+    }
-+}
-+
-+main(argc, argv)
-+char **argv;
-+{
-+    int i, DoDeliver=0, SplitSize=DEFAULT_SPLIT_SIZE, dum, InNewline=1, bytesread, whichpart=1, Verbose=0, numparts = -1, c;
-+    char *fname = NULL, *bigbuf, *s, *SharedHeaders, *headend, *from, id[100], *deliverycmd, *prefix, SubjectBuf[250];
-+    char *MessageID = 0, *OrigID=NULL;
-+    FILE *fp;
-+
-+    s = getenv("METAMAIL_TMPDIR");
-+    if (s) {
-+        prefix = malloc(10+strlen(s));
-+        if (!prefix) {
-+            fprintf(stderr, "splitmail: Not enough memory\n");
-+            exit(-1);
-+        }
-+        sprintf(prefix, "%s/split.", s);
-+    } else {
-+        prefix = "/tmp/split.";
-+    }
-+    s = getenv("SPLITSIZE");
-+    if (s) {
-+        dum = atoi(s);
-+        if (dum < MINCHUNKSIZE) {
-+            fprintf(stderr, "Ignoring SPLITSIZE environment variable of %d -- the minimum value is %d\n", dum, MINCHUNKSIZE);
-+        } else {
-+            SplitSize = dum;
-+        }
-+    }
-+    for (i=1; i<argc; ++i) {
-+	if (argv[i][0] == '-') {
-+	    switch (argv[i][1]) {
-+		case 's':
-+		    if (++i >= argc) usageexit();
-+		    dum = atoi(argv[i]);
-+		    if (dum < MINCHUNKSIZE && dum >= 0) {
-+			fprintf(stderr, "splitmail: Using minimum splitsize of %d\n", MINCHUNKSIZE);
-+			dum = MINCHUNKSIZE;
-+			
-+		    }
-+		    SplitSize = dum;
-+		    break;
-+		case 'd':
-+		    DoDeliver = 1;
-+                    break;
-+                case 'p':
-+		    if (++i >= argc) usageexit();
-+                    prefix = argv[i];
-+                    break;
-+ 		case 'i':
-+ 		    if( ++i >= argc) usageexit();
-+ 		    MessageID = argv[i];
-+ 		    break;
-+		case 'v':
-+		    Verbose = 1;
-+		    break;
-+		default:
-+		    usageexit();
-+	    }
-+	} else {
-+	    if (fname) usageexit();
-+	    fname = argv[i];
-+	}
-+    }
-+    bigbuf = malloc(100+SplitSize);
-+    if (!bigbuf) {
-+	fprintf(stderr, "splitmail:  Not enough memory for %d-byte chunks\n", SplitSize);
-+	exit(-1);
-+    }
-+    SplitSize -= 1000; /* gives fudge factor for headers, line endings */
-+    if (fname) {
-+        struct stat stbuf;
-+        if (!stat(fname, &stbuf)) {
-+            /* Note:  this will sometimes be 1 too high when it is a very close call,
-+              because of the desire to have complete lines.  In such cases, we send
-+              a null final part */
-+            numparts = 1 + (stbuf.st_size / SplitSize);
-+        }
-+	fp = fopen(fname, "r");
-+	if (!fp) {
-+	    fprintf(stderr, "splitmail: Cannot read file %s\n", fname);
-+	    exit(-1);
-+	}
-+    } else fp = stdin;
-+    headend = bigbuf;
-+    while((c=getc(fp)) != EOF) {
-+        if (headend >= bigbuf + SplitSize) {
-+            fprintf(stderr, "splitmail: Could not find the end of the headers!\n");
-+            exit(-1);
-+        }
-+	*headend++ = c;
-+	if (c == '\n') {
-+	    if (InNewline) break; /* end of headers */
-+	    InNewline = 1;
-+	} else {
-+	    InNewline = 0;
-+	}
-+    }
-+    if (c == EOF) {
-+	fprintf(stderr, "splitmail: Could not find the end of the headers!\n");
-+	exit(-1);
-+    }
-+    *headend = '\0';
-+    SharedHeaders = malloc(1+strlen(bigbuf)); /* maximum size needed */
-+    if (!SharedHeaders) {
-+	fprintf(stderr, "splitmail: Not enough memory\n");
-+	exit(-1);
-+    }
-+    from = bigbuf;
-+    *SharedHeaders = '\0';
-+    strcpy(SubjectBuf, "Partial Message");
-+    while (from < headend) {
-+	s = endofheader(from);  /* would be index(from, '\n'),
-+				 but need to check for continuation lines */
-+        *s = '\0';
-+	if (ShareThisHeader(from, SubjectBuf, sizeof (SubjectBuf), &OrigID)) {
-+	    strcat(SharedHeaders, from);
-+	    strcat(SharedHeaders, "\n");
-+	}
-+	*s = '\n';
-+	from = ++s;
-+    }
-+    //#ifdef AMIGA
-+    //snprintf(id, sizeof(id), "%d.%s@%s%s", time(0), SeqToName(GetSequence(4)), FindConfig("NodeName"),
-+    //       FindConfig("DomainName"));
-+    //#else
-+    //#ifdef MSDOS
-+    //snprintf(id, sizeof(id), "%ld.UNKNOWN.SITE.NAME", time(NULL)); // BCR
-+    //#else
-+    snprintf(id, sizeof(id), "%d.%d.%d.%s", (int) getuid(), (int) getpid(), (int) time(0), getmyname());
-+    //#endif /* MSDOS */
-+    //#endif /* AMIGA */
-+    bytesread = headend - bigbuf;
-+    deliverycmd = Verbose ? VERBOSEDELIVERYCMD : NORMALDELIVERYCMD;
-+    while (!feof(fp)) {
-+	while (SplitSize > bytesread && !feof(fp)) {
-+	    /* Need to loop because fread is weird */
-+	    bytesread += fread(bigbuf + bytesread, sizeof(char), SplitSize - bytesread, fp);
-+	}
-+	/* Now complete the line */
-+	while((c=getc(fp)) != EOF) {
-+	    bigbuf[bytesread++] = c;
-+	    if (c=='\n') break;
-+	}
-+        bigbuf[bytesread] = '\0';
-+        if (feof(fp) && numparts <= 0) numparts = whichpart;
-+        HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID);
-+	bytesread = 0;
-+	++whichpart;
-+    }
-+    while (whichpart <= numparts) {
-+        /* Our guess as to how many parts was OFF, hopefully only by one */
-+        *bigbuf = '\0'; /* have to deliver an empty part, ugh! */
-+        HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID);
-+        ++whichpart;
-+    }
-+    return(0);
-+}
-+
-+HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID)
-+int DoDeliver, numparts, whichpart;
-+char *deliverycmd, *prefix, *SharedHeaders, *SubjectBuf, *id, *MessageID, *bigbuf, *OrigID;
-+{
-+    FILE *fpout;
-+    char OutputFile[1000];
-+    int code;
-+    //    struct  timeval	tp;
-+    // struct  timezone	tzp;
-+    char    *tm_zone;
-+
-+    if (DoDeliver) {
-+        fpout = popen(deliverycmd, "w");
-+    } else {
-+    	int fd;
-+        snprintf(OutputFile, sizeof(OutputFile), "%s%d", prefix, whichpart);
-+        remove(OutputFile);
-+        fpout = NULL;
-+        fd = open(OutputFile, O_WRONLY|O_CREAT|O_EXCL, 0600);
-+        if (fd != -1) fpout = fdopen(fd, "w");
-+    }
-+    if (!fpout) {
-+	fprintf(stderr, "splitmail: Can't open %s for writing\n", DoDeliver ? deliverycmd : OutputFile);
-+        exit(-1);
-+    }
-+    if (numparts != 1) { /* one-parters end up not changed at all! */
-+        struct tm *gt;
-+        time_t clock;
-+        int secsoff, hrsoff, minsoff;
-+        char signoff='+';
-+
-+	fputs(SharedHeaders, fpout);
-+	if (OrigID) fprintf(fpout, "References: %s\n", OrigID);
-+
-+        clock=time(0);
-+        gt = (struct tm*) gmtime(&clock);
-+        hrsoff=minsoff=0;
-+        fprintf(fpout, "Date: %s, %02d %s %d %02d:%02d:%02d %c%02d%02d (GMT)\n", DayNames[gt->tm_wday],
-+                 gt->tm_mday, MonthNames[gt->tm_mon], 1900+gt->tm_year, gt->tm_hour,
-+                 gt->tm_min, gt->tm_sec, signoff, hrsoff, minsoff);
-+	//#else
-+        //clock=time(0);
-+        //gt = localtime(&clock);
-+	//gettimeofday(&tp, &tzp);
-+	//tm_zone = (char *)timezone(tzp.tz_minuteswest, gt->tm_isdst);
-+	//secsoff = tzp.tz_minuteswest * 60;
-+	//#else
-+        secsoff= gt->tm_gmtoff;
-+	//#endif
-+        if (secsoff < 0) {
-+            signoff = '-';
-+            secsoff *= -1;
-+        }
-+        hrsoff = secsoff / 3600;
-+        minsoff = (secsoff - (3600*hrsoff)) / 60;
-+        fprintf(fpout, "Date: %s, %02d %s %d %02d:%02d:%02d %c%02d%02d (%s)\n",
-+		DayNames[gt->tm_wday], gt->tm_mday, MonthNames[gt->tm_mon],
-+		1900+gt->tm_year, gt->tm_hour, 
-+		gt->tm_min, gt->tm_sec, signoff, hrsoff, minsoff, gt->tm_zone);
-+
-+        if( MessageID) {
-+            fprintf(fpout, "Message-Id: <%d.%s.%s>\n",whichpart,id,MessageID);
-+        }
-+        fprintf(fpout, "Subject: %s (part %d of ", SubjectBuf, whichpart);
-+        if (numparts > 0) {
-+            fprintf(fpout, "%d)\n", numparts);
-+        } else {
-+            fprintf(fpout, "several)\n");
-+        }
-+        fprintf(fpout, "Content-type: message/partial; id=\"%s\"; number=%d", id, whichpart);
-+        if (numparts > 0) fprintf(fpout, "; total=%d", numparts);
-+        fprintf(fpout, "\nMIME-Version: 1.0\n\n");
-+    }
-+    fputs(bigbuf, fpout);
-+    code = DoDeliver ? pclose(fpout) : fclose(fpout);
-+    if (code) {
-+        fprintf(stderr, "splitmail: %s of part %d failed\n", DoDeliver ? "Delivery" : "Writing", whichpart);
-+        if (whichpart > 1) fprintf(stderr, "  (previous %d parts may have succeeded)\n", whichpart -1);
-+        exit(-1);
-+    }
-+}
-+
-+static char *SharedHeads[] = {
-+    "from",
-+    "to",
-+    "cc",
-+    "bcc",
-+    "newsgroup",
-+    "newsgroups",
-+    NULL
-+};
-+
-+ShareThisHeader(s, SubjectBuf, size, OrigID)
-+char *s;
-+char *SubjectBuf;
-+size_t size;
-+char **OrigID;
-+{
-+    int i;
-+    char *colon = index(s, ':');
-+    if (!colon) return(0); /* don't share it in all parts */
-+    *colon = '\0';
-+    if (!ULstrcmp(s, "message-id")) {
-+        *colon = ':';
-+	*OrigID = malloc(1+strlen(++colon));
-+	if (! *OrigID) {
-+	    fprintf(stderr, "splitmail: Not enough memory\n");
-+	    exit(-1);
-+	}
-+	while (*colon && isspace(*colon)) {++colon;}
-+        strcpy(*OrigID, colon);
-+        return(0);
-+    }
-+    if (!ULstrcmp(s, "subject")) {
-+        *colon = ':';
-+        strncpy(SubjectBuf, ++colon, size);
-+        SubjectBuf[size - 1] = '\0';
-+        return(0);
-+    }
-+    if (!ULstrcmp(s, "content-type")) {
-+        if (IllegalContentType(colon+1)) {
-+            fprintf(stderr, "splitmail: message has illegal content-type header, delivery cancelled.\n");
-+            exit(-1);
-+        }
-+    }
-+    for (i=0; SharedHeads[i]; ++i) {
-+	if (!ULstrcmp(s, SharedHeads[i])) break;
-+    }
-+    *colon = ':';
-+    return(SharedHeads[i] ? 1 : 0);
-+}
-+
-+static char *tspecials = "()<>@,;:\\\"/[]?.=";
-+
-+IllegalContentType(ctype)
-+char *ctype;
-+{
-+    char *ct, *semicolon, *st, *s, *param, *eq, *matcheq;
-+    ct = malloc(1+strlen(ctype));
-+    if (!ct) {
-+        fprintf(stderr, "splitmail: out of memory!\n");
-+        exit(-1);
-+    }
-+    strcpy(ct, ctype);
-+    semicolon = index(ct, ';');
-+    if (semicolon) *semicolon = 0;
-+    st = index(ct, '/');
-+    if (!st) {
-+        fprintf(stderr, "Illegal content-type specification: %s\nAll MIME content-type headers must contain a type/subtype specification.\n", ctype);
-+        return(-1);
-+    }
-+    if (st) *st++ = 0;
-+    for (s = ct; *s; ++s) {
-+        if (!isprint(*s) || index(tspecials, *s)) {
-+            fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in a MIME content-type.\n", ctype, *s, *s);
-+            return(-1);
-+        }
-+    }
-+    for (s = st; s && *s; ++s) {
-+        if (!isprint(*s) || index(tspecials, *s)) {
-+            fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in a MIME content-subtype.\n", ctype, *s, *s);
-+            return(-1);
-+        }
-+    }
-+    while (semicolon) {
-+        param = ++semicolon;
-+        while (*param && isspace(*param)) ++param;
-+        semicolon = index(param, ';');
-+        if (semicolon) *semicolon = 0;
-+        eq = index(param, '=');
-+        if (eq) *eq++ = 0;
-+        for (s = param; *s; ++s) {
-+            if (!isprint(*s) || index(tspecials, *s)) {
-+                fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in a MIME content-type parameter name.\n", ctype, *s, *s);
-+                return(-1);
-+            }
-+        }
-+        while (*eq && isspace(*eq)) ++eq;
-+        if (*eq == '\"') {
-+            matcheq = eq;
-+            do {
-+                matcheq = index(matcheq+1, '\"');
-+                if (!matcheq) {
-+                    fprintf(stderr, "Illegal content-type specification: %s\nA quoted MIME parameter value must have matching quotation marks.\n", ctype);
-+                    return(-1);
-+                }
-+            } while (*(matcheq-1) == '\\');
-+            while (*++matcheq) {
-+                if (!isspace(*matcheq)) {
-+                    fprintf(stderr, "Illegal content-type specification: %s\nA quoted MIME parameter value must stop after the closing quotation mark.\n", ctype);
-+                    return(-1);
-+                }
-+            }
-+        } else {
-+            for (s = eq; s && *s; ++s) {
-+                if (!isprint(*s) || index(tspecials, *s)) {
-+                    fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in an unquoted MIME parameter value.\n", ctype, *s, *s);
-+                    return(-1);
-+                }
-+            }
-+        }
-+    }
-+    free(ct);
-+    return(0);
-+}
-+
-+int ULstrcmp(s1, s2)
-+register char *s1, *s2;
-+{
-+    char c1,c2;
-+
-+    for(;;) {
-+	c1 = *s1++; if (c1 <= 'Z') if (c1 >= 'A') c1 += 040;
-+	c2 = *s2++; if (c2 <= 'Z') if (c2 >= 'A') c2 += 040;
-+	if (c1 != c2) break;
-+	if (c1 == '\0') return(0);
-+    }
-+    return(c1 - c2);
-+}
-+
-+/* STILL TO DO:  
-+  Get number of parts right when possible 
-+*/
---- metamail-2.7.orig/src/Makefile.am
-+++ metamail-2.7/src/Makefile.am
-@@ -0,0 +1,3 @@
-+MAINTAINERCLEANFILES	= Makefile.in
-+
-+SUBDIRS			= metamail richmail
---- metamail-2.7.orig/src/Makefile.in
-+++ metamail-2.7/src/Makefile.in
-@@ -0,0 +1,298 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+MAINTAINERCLEANFILES = Makefile.in
-+
-+SUBDIRS = metamail richmail
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = ../metamail/config.h
-+CONFIG_CLEAN_FILES = 
-+DIST_COMMON =  Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+all: all-redirect
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+
-+@SET_MAKE@
-+
-+all-recursive install-data-recursive install-exec-recursive \
-+installdirs-recursive install-recursive uninstall-recursive  \
-+check-recursive installcheck-recursive info-recursive dvi-recursive:
-+	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	dot_seen=no; \
-+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  rev="$$subdir $$rev"; \
-+	  test "$$subdir" != "." || dot_seen=yes; \
-+	done; \
-+	test "$$dot_seen" = "no" && rev=". $$rev"; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+   if test "$$subdir" = .; then :; else \
-+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+   fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = src
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+	for subdir in $(SUBDIRS); do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d $(distdir)/$$subdir \
-+	    || mkdir $(distdir)/$$subdir \
-+	    || exit 1; \
-+	    chmod 777 $(distdir)/$$subdir; \
-+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+info-am:
-+info: info-recursive
-+dvi-am:
-+dvi: dvi-recursive
-+check-am: all-am
-+check: check-recursive
-+installcheck-am:
-+installcheck: installcheck-recursive
-+install-exec-am:
-+install-exec: install-exec-recursive
-+
-+install-data-am:
-+install-data: install-data-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-recursive
-+uninstall-am:
-+uninstall: uninstall-recursive
-+all-am: Makefile
-+all-redirect: all-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs: installdirs-recursive
-+installdirs-am:
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+clean-am:  clean-tags clean-generic mostlyclean-am
-+
-+clean: clean-recursive
-+
-+distclean-am:  distclean-tags distclean-generic clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-recursive
-+
-+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-+		distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-recursive
-+
-+.PHONY: install-data-recursive uninstall-data-recursive \
-+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-+uninstalldirs-recursive all-recursive check-recursive \
-+installcheck-recursive info-recursive dvi-recursive \
-+mostlyclean-recursive distclean-recursive clean-recursive \
-+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs-am \
-+installdirs mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/src/richmail/COMMANDS
-+++ metamail-2.7/src/richmail/COMMANDS
-@@ -0,0 +1,29 @@
-+Commands for changing character sets in richtext:
-+
-+Japanese:
-+
-+<iso-2022-jp>		ISO-2022 encoding for mixed US-ASCII and JIS.
-+<x-jis-x0201-1976>	Variant of US-ASCII for Japan.
-+<x-jis-x0201>		Variant of US-ASCII for Japan.
-+<x-jis-x0208-1978>	JIS X 0208-1978
-+<x-jis-x0208-1983>	JIS X 0208-1983
-+<x-jis-x0208>		JIS X 0208-1983
-+
-+Korean:
-+
-+<iso-2022-kr>		ISO-2022 encoding for mixed US-ASCII and Korean.
-+<x-ksc-5601>		2-byte encoding of Hangul without shift/escape seqs.
-+
-+Internal commands:
-+
-+<x-iso-2022-gen-HH>	Used for ISO-2022 escape seqences.
-+<x-iso-shift-in>	SI character
-+<x-iso-shift-out>	SO character
-+<x-iso-charset-HH>	Used for ISO-2022 ESC$)? character set designators.
-+
-+Notes:
-+
-+<iso-2022-*> text sequences may contain ISO-2022 escape sequences for changing
-+character sets.  <x-jis-*-*> and <x-ksc-*> text sequences can also contain
-+such escape sequences, but they start out in 2-byte mode, and are intended
-+mainly for 2-byte character sequences, rather than a mixture.
---- metamail-2.7.orig/src/richmail/NOTES
-+++ metamail-2.7/src/richmail/NOTES
-@@ -0,0 +1,7 @@
-+
-+"richtext.c" may be used as a library in another program, by defining the
-+macro RICHTEXT_LIBRARY when it is compiled and calling the function
-+"richtext_main(argc, argv)" with the arguments set to the normal richtext
-+command-line arguments.  It is also necessary to link with "richlex.c",
-+"richset.c", "usascii.c" and "iso2022.c" which provide services to
-+"richtext.c".
---- metamail-2.7.orig/src/richmail/usascii.c
-+++ metamail-2.7/src/richmail/usascii.c
-@@ -0,0 +1,129 @@
-+/*-------------------------------------------------------------------------
-+
-+  usascii.c - Code for the US-ASCII specific parts of the richtext processor.
-+ 
-+  Copyright (c) 1992 Rhys Weatherley
-+
-+  Permission to use, copy, modify, and distribute this material
-+  for any purpose and without fee is hereby granted, provided
-+  that the above copyright notice and this permission notice
-+  appear in all copies, and that the name of Rhys Weatherley not be
-+  used in advertising or publicity pertaining to this
-+  material without specific, prior written permission.
-+  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
-+  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
-+  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+  Revision History:
-+  ================
-+
-+   Version  DD/MM/YY  By  Description
-+   -------  --------  --  --------------------------------------
-+     1.0    21/06/92  RW  Original Version of usascii.c
-+
-+  You may contact the author by:
-+  =============================
-+
-+   e-mail: rhys@cs.uq.oz.au
-+     mail: Rhys Weatherley
-+	   5 Horizon Drive
-+	   Jamboree Heights
-+	   Queensland 4074
-+	   Australia
-+
-+-------------------------------------------------------------------------*/
-+
-+#include <stdio.h>
-+#include <metamail/common.h>
-+
-+#include "richlex.h"
-+#include "richset.h"
-+
-+/*
-+ * Initialise the US-ASCII character set processor.
-+ */
-+usascii_init (name)
-+char	*name;
-+{
-+    if (name)
-+	richtextencoding (RICH_ENC_US_ASCII);
-+}
-+
-+/*
-+ * Process a command for the US-ASCII processor.
-+ */
-+int	usascii_command (token,negated)
-+char	*token;
-+int	negated;
-+{
-+    if (!strcmp(token,"us-ascii")) {
-+    	if (negated) {
-+	    charsetpop (&usascii_charset);
-+	} else {
-+	    charsetpush (&usascii_charset);
-+	    richtextencoding (RICH_ENC_US_ASCII);
-+	}
-+	return (1);
-+    } else {
-+    	return (0);
-+    }
-+}
-+
-+/*
-+ * Check for singleton US-ASCII tokens.
-+ */
-+int	usascii_single (token)
-+char	*token;
-+{
-+    return (0);
-+}
-+
-+/*
-+ * Determine the width of a US-ASCII character.
-+ */
-+int	usascii_width (ch)
-+RCHAR	ch;
-+{
-+    return (1);
-+}
-+
-+/*
-+ * Determine if the current character can be used as a folding point.
-+ */
-+int	usascii_fold (ch)
-+RCHAR	ch;
-+{
-+    return (ch < 0x7F && isspace (ch));
-+}
-+
-+/*
-+ * Render the given US-ASCII character.
-+ */
-+usascii_render (ch,param)
-+RCHAR	ch;
-+void	*param;
-+{
-+    (*RichtextPutc) ((int)ch,param);
-+}
-+
-+/*
-+ * Enter or leave the US-ASCII encoding.
-+ */
-+usascii_encoding (newenc)
-+int	newenc;
-+{
-+    /* Nothing to be done in this version */
-+}
-+
-+/*
-+ * Define the US-ASCII character set processor.
-+ */
-+struct 	charsetproc	usascii_charset =
-+	  {"us-ascii",
-+	   usascii_init,
-+	   usascii_command,
-+	   usascii_single,
-+	   usascii_width,
-+	   usascii_fold,
-+	   usascii_render,
-+	   usascii_encoding};
---- metamail-2.7.orig/src/richmail/iso2022.c
-+++ metamail-2.7/src/richmail/iso2022.c
-@@ -0,0 +1,375 @@
-+/*-------------------------------------------------------------------------
-+
-+  iso2022.c - Code for the ISO-2022 specific parts of the richtext processor.
-+ 
-+  Copyright (c) 1992 Rhys Weatherley
-+
-+  Permission to use, copy, modify, and distribute this material
-+  for any purpose and without fee is hereby granted, provided
-+  that the above copyright notice and this permission notice
-+  appear in all copies, and that the name of Rhys Weatherley not be
-+  used in advertising or publicity pertaining to this
-+  material without specific, prior written permission.
-+  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
-+  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
-+  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+  Revision History:
-+  ================
-+
-+   Version  DD/MM/YY  By  Description
-+   -------  --------  --  --------------------------------------
-+     1.0    21/06/92  RW  Original Version of iso2022.c
-+
-+  You may contact the author by:
-+  =============================
-+
-+   e-mail: rhys@cs.uq.oz.au
-+     mail: Rhys Weatherley
-+	   5 Horizon Drive
-+	   Jamboree Heights
-+	   Queensland 4074
-+	   Australia
-+
-+  Acknowledgements:
-+  ================
-+
-+  Many thanks to Yutaka Sato (ysato@etl.go.jp) for protyping ISO-2022
-+  support in a previous version of richtext, on whose code this is based.
-+
-+-------------------------------------------------------------------------*/
-+
-+#include <metamail/common.h>
-+
-+#include "richlex.h"
-+#include "richset.h"
-+
-+/*
-+ * Global data for this module.
-+ */
-+static	int	SwToAscii;
-+static	int	SwToOther;
-+static	int	OutPrevChar;
-+static	int	OutPrevPrevChar;
-+static	int	OutCharLen;
-+static	int	OutCharSet;
-+static	int	OutAsciiMode;
-+
-+#define	OUT_ASCII	0
-+#define	OUT_JIS		1
-+#define	OUT_KSC		2
-+
-+#define	ESC		033
-+#define	SO		016
-+#define	SI		017
-+
-+#define	ISO_GENERIC_PREFIX	"x-iso-2022-gen-"
-+#define	ISO_GENERIC_LEN		15
-+#define	ISO_SHIFT_PREFIX	"x-iso-shift-"
-+#define	ISO_SHIFT_LEN		12
-+#define	ISO_CHARSET_PREFIX	"x-iso-charset-"
-+#define	ISO_CHARSET_LEN		14
-+
-+/*
-+ * Initialise the ISO-2022 character set processor.
-+ */
-+iso2022_init (name)
-+char	*name;
-+{
-+    SwToAscii = 'B';
-+    SwToOther = 'B';
-+    OutPrevChar = 0;
-+    OutPrevPrevChar = 0;
-+    OutCharLen = 1;
-+    OutCharSet = OUT_ASCII;
-+    OutAsciiMode = RICH_ENC_US_ASCII;
-+    if (!name)
-+	return;
-+    if (!strncmp (name,"iso-2022-jp",11))
-+	richtextencoding (RICH_ENC_JP_ASCII);
-+    else if (!strncmp (name,"iso-2022-kr",11)) {
-+	richtextencoding (RICH_ENC_KR_ASCII);
-+	controloutput("\033$)C",0);
-+    } else
-+	richtextencoding (RICH_ENC_US_ASCII);
-+}
-+
-+/*
-+ * Process a command for the ISO-2022 processor.
-+ */
-+int	iso2022_command (token,negated)
-+char	*token;
-+int	negated;
-+{
-+    int swchar;
-+    if (!strcmp(token,"iso-2022-jp")) {
-+    	if (negated) {
-+	    /* Return to previous output mode */
-+	    controloutput("\033(B",0);
-+	    SwToAscii = 'B';
-+	    charsetpop(&iso2022_charset);
-+	} else {
-+	    /* Enter JIS-X0208-1983 output mode */
-+	    charsetpush(&iso2022_charset);
-+	    richtextencoding(RICH_ENC_US_ASCII);
-+	    controloutput("\033(B",0);
-+	    SwToOther = 'B';
-+	}
-+	return (1);
-+    } else if (!strcmp(token,"iso-2022-kr")) {
-+	if (negated) {
-+	    /* Return to previous output mode */
-+	    controloutput("\017",0);
-+	    charsetpop(&iso2022_charset);
-+	} else {
-+	    /* Enter KSC-5601 output mode */
-+	    charsetpush(&iso2022_charset);
-+	    richtextencoding(RICH_ENC_KR_ASCII);
-+	    controloutput("\033$)C\017",0);
-+	}
-+	return (1);
-+    } else if (!strncmp(token,"x-jis-x0201",11)) {
-+    	if (negated) {
-+	    /* Return to previous output mode */
-+	    controloutput("\033(B",0);
-+	    SwToAscii = 'B';
-+	    charsetpop(&iso2022_charset);
-+	} else {
-+	    /* Enter JIS-X-0201-1976 output mode */
-+	    charsetpush(&iso2022_charset);
-+	    richtextencoding(RICH_ENC_JP_ASCII);
-+	    controloutput("\033(J",0);
-+	    SwToAscii = 'J';
-+	}
-+	return (1);
-+    } else if (!strncmp(token,"x-jis-x0208",11)) {
-+    	if (negated) {
-+	    /* Return to previous output mode */
-+	    controloutput("\033(B",0);
-+	    SwToAscii = 'B';
-+	    charsetpop(&iso2022_charset);
-+	} else {
-+	    /* Enter JIS-X0208-* output mode */
-+	    charsetpush(&iso2022_charset);
-+	    if (!strcmp (token + 11,"-1978"))
-+		SwToOther = '@';
-+	    else
-+		SwToOther = 'B';
-+	    richtextencoding((SwToOther == '@' ? RICH_ENC_JIS_1978 :
-+					      RICH_ENC_JIS_1983));
-+	    controloutput("\033$",0);
-+	    controlputc(SwToOther);
-+	}
-+	return (1);
-+    } else if (!strcmp(token,"x-ksc-5601")) {
-+    	if (negated) {
-+	    /* Return to previous output mode */
-+	    controloutput("\017",0);
-+	    charsetpop(&iso2022_charset);
-+	} else {
-+	    /* Enter KSC-5601 output mode */
-+	    charsetpush(&iso2022_charset);
-+	    richtextencoding(RICH_ENC_KSC_5601);
-+	    controloutput("\033$)C\016",0);
-+	}
-+	return (1);
-+    } else if (!strncmp (token,ISO_GENERIC_PREFIX,ISO_GENERIC_LEN)) {
-+    	/* Process an escape sequence for changing character sets */
-+	sscanf(token + ISO_GENERIC_LEN,"%x",&swchar);
-+	if (swchar <= ' ' || swchar >= 0x7F)
-+	    return (1);
-+	if (negated) {
-+	    /* Return to previous output mode from multi-byte mode */
-+	    if (!charsettop(&iso2022_charset))
-+	      charsetpush(&iso2022_charset);
-+	    richtextencoding((swchar == 'J' ? RICH_ENC_JP_ASCII :
-+					      RICH_ENC_US_ASCII));
-+	    controloutput("\033(",0);
-+	    controlputc(swchar);
-+	    SwToAscii = swchar;
-+	} else {
-+	    /* Enter multi-byte (Japanese) mode */
-+	    if (!charsettop(&iso2022_charset))
-+	      charsetpush(&iso2022_charset);
-+	    richtextencoding((swchar == '@' ? RICH_ENC_JIS_1978 :
-+					      RICH_ENC_JIS_1983));
-+	    controloutput("\033$",0);
-+	    controlputc(swchar);
-+	    SwToOther = swchar;
-+	}
-+	return (1);
-+    } else if (!strncmp (token,ISO_SHIFT_PREFIX,ISO_SHIFT_LEN)) {
-+    	/* Process a character set shift sequence */
-+	if (!strcmp(token + ISO_SHIFT_LEN,"out") &&
-+	    	RichtextCharEncoding == RICH_ENC_KR_ASCII) {
-+	    /* Enter KSC-5601 2-byte mode */
-+	    if (!charsettop(&iso2022_charset))
-+	      charsetpush(&iso2022_charset);
-+	    richtextencoding(RICH_ENC_KSC_5601);
-+	    controloutput("\016",0);
-+	} else if (!strcmp (token + ISO_SHIFT_LEN,"in") &&
-+		RichtextCharEncoding == RICH_ENC_KSC_5601) {
-+	    /* Return to US-ASCII from KSC-5601 */
-+	    if (!charsettop(&iso2022_charset))
-+	      charsetpush(&iso2022_charset);
-+	    richtextencoding(RICH_ENC_KR_ASCII);
-+	    controloutput("\017",0);
-+	}
-+	return (1);
-+    } else {
-+    	return (0);
-+    }
-+}
-+
-+/*
-+ * Check for singleton ISO-2022 tokens.
-+ */
-+int	iso2022_single (token)
-+char	*token;
-+{
-+    return (!strncmp (token,ISO_GENERIC_PREFIX,ISO_GENERIC_LEN) ||
-+	    !strncmp (token,ISO_SHIFT_PREFIX,ISO_SHIFT_LEN) ||
-+	    !strncmp (token,ISO_CHARSET_PREFIX,ISO_CHARSET_LEN));
-+}
-+
-+/*
-+ * Determine the width of a ISO-2022 character.
-+ */
-+int	iso2022_width (ch)
-+RCHAR	ch;
-+{
-+    return (ch & 0xFF00 ? 2 : 1);
-+}
-+
-+/*
-+ * Determine if the current character can be used as a folding point.
-+ */
-+int	iso2022_fold (ch)
-+RCHAR	ch;
-+{
-+    if (ch < 0x7F && isspace (ch)) {
-+    	return (1);
-+    } else {
-+        return ((ch & 0xFF00) != 0);
-+    }
-+}
-+
-+/*
-+ * Render the given ISO-2022 character.
-+ */
-+iso2022_render (ch,param)
-+RCHAR	ch;
-+void	*param;
-+{
-+    if (ch & 0xFF00) {
-+	if (OutCharLen < 2) {
-+	    /* Add extra escape sequences after stray ASCII characters */
-+	    /* This normally happens in excerpts and signatures, etc.  */
-+	    if (OutAsciiMode == RICH_ENC_JP_ASCII) {
-+		(*RichtextPutc) (033,param);
-+		(*RichtextPutc) ('$',param);
-+		(*RichtextPutc) (SwToOther,param);
-+	    } else if (OutAsciiMode == RICH_ENC_KR_ASCII) {
-+		(*RichtextPutc) (SO,param);
-+	    }
-+	}
-+        (*RichtextPutc) ((int)((ch & 0xFF00) >> 8),param);
-+        (*RichtextPutc) ((int)(ch & 0xFF),param);
-+    } else {
-+	if (OutCharLen > 1 && ch >= 0x20) {
-+	    /* Add extra escape sequences before stray ASCII characters */
-+	    /* This normally happens in excerpts and signatures, etc.   */
-+	    if (OutAsciiMode == RICH_ENC_JP_ASCII) {
-+		(*RichtextPutc) (033,param);
-+		(*RichtextPutc) ('(',param);
-+		(*RichtextPutc) (SwToAscii,param);
-+	    } else if (OutAsciiMode == RICH_ENC_KR_ASCII) {
-+		(*RichtextPutc) (SI,param);
-+	    }
-+	}
-+	(*RichtextPutc) ((int)(ch & 0xFF),param);
-+    }
-+}
-+
-+/*
-+ * Enter or leave the ISO-2022 encoding.
-+ */
-+iso2022_encoding (newenc)
-+int	newenc;
-+{
-+    switch (newenc) {
-+	case RICH_ENC_US_ASCII: controloutput("\033(B",0); break;
-+	case RICH_ENC_JP_ASCII: controloutput("\033(J",0); break;
-+	case RICH_ENC_KR_ASCII: controloutput("\017",0);   break;
-+	case RICH_ENC_JIS_1978: controloutput("\033$@",0); break;
-+	case RICH_ENC_JIS_1983: controloutput("\033$B",0); break;
-+	case RICH_ENC_KSC_5601: controloutput("\016",0);   break;
-+	default:		controloutput("\033(B",0); break;
-+    }
-+}
-+
-+/*
-+ * Define the ISO-2022-JP and ISO-2022-KR character set processor.
-+ */
-+struct 	charsetproc	iso2022_charset =
-+	  {"iso-2022-jp:iso-2022-kr",
-+	   iso2022_init,
-+	   iso2022_command,
-+	   iso2022_single,
-+	   iso2022_width,
-+	   iso2022_fold,
-+	   iso2022_render,
-+	   iso2022_encoding};
-+
-+/*
-+ * Define an output routine for slotting into RichtextPutc so
-+ * that ISO-2022 escape sequences are treated correctly.
-+ */
-+int	iso2022_fputc (ch,file)
-+int	ch;
-+FILE	*file;
-+{
-+    if (OutPrevChar == ESC && ch == '(') {
-+	/* Process escape sequences that end JIS 2-byte modes */
-+	OutCharLen = 1;
-+	OutCharSet = OUT_ASCII;
-+	OutAsciiMode = RICH_ENC_JP_ASCII;
-+    }
-+    if (OutPrevPrevChar == ESC && OutPrevChar == '$') {
-+	/* Process escape sequences that start JIS 2-byte modes */
-+        if (ch != ')') {	/* ')' is for Korean, so ignore it */
-+	    OutCharLen = 2;
-+	    OutCharSet = OUT_JIS;
-+	    OutAsciiMode = RICH_ENC_JP_ASCII;
-+	}
-+    }
-+    if (ch == SO) {
-+	OutCharLen = 2;
-+	OutCharSet = OUT_KSC;
-+	OutAsciiMode = RICH_ENC_KR_ASCII;
-+    } else if (ch == SI) {
-+	OutCharLen = 1;
-+	OutCharSet = OUT_ASCII;
-+	OutAsciiMode = RICH_ENC_KR_ASCII;
-+    }
-+    if (ch == '\n' && OutCharLen == 2) {
-+        /* Two-byte characters cannot cross line boundaries */
-+	if (OutCharSet == OUT_JIS) {
-+            fputc (ESC,file);
-+            fputc ('(',file);
-+            fputc (SwToAscii,file);
-+            fputc ('\n',file);
-+            fputc (ESC,file);
-+            fputc ('$',file);
-+            fputc (SwToOther,file);
-+	} else if (OutCharSet == OUT_KSC) {
-+	    fputc (SI,file);
-+	    fputc ('\n',file);
-+	    fputc (SO,file);
-+	}
-+    } else {
-+        fputc (ch,file);
-+    }
-+    OutPrevPrevChar = OutPrevChar;
-+    OutPrevChar = ch;
-+}
---- metamail-2.7.orig/src/richmail/Makefile.am
-+++ metamail-2.7/src/richmail/Makefile.am
-@@ -0,0 +1,15 @@
-+MAINTAINERCLEANFILES    = Makefile.in
-+
-+CFLAGS			= -lncurses
-+
-+INCLUDES                = -I$(top_builddir) -I$(top_builddir)/metamail \
-+                        -I$(top_srcdir) -I$(top_srcdir)/metamail
-+
-+bin_PROGRAMS            = richtext richtoatk
-+
-+richtext_SOURCES	= richtext.c richlex.c richset.c usascii.c iso2022.c
-+richtext_LDADD		= $(top_builddir)/metamail/libmetamail.la
-+
-+richtoatk_SOURCES	= richtoatk.c richlex.c richset.c usascii.c iso2022.c
-+richtoatk_LDADD		= $(top_builddir)/metamail/libmetamail.la
-+
---- metamail-2.7.orig/src/richmail/Makefile.in
-+++ metamail-2.7/src/richmail/Makefile.in
-@@ -0,0 +1,376 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+MAINTAINERCLEANFILES = Makefile.in
-+
-+CFLAGS = -lncurses
-+
-+INCLUDES = -I$(top_builddir) -I$(top_builddir)/metamail                         -I$(top_srcdir) -I$(top_srcdir)/metamail
-+
-+
-+bin_PROGRAMS = richtext richtoatk
-+
-+richtext_SOURCES = richtext.c richlex.c richset.c usascii.c iso2022.c
-+richtext_LDADD = $(top_builddir)/metamail/libmetamail.la
-+
-+richtoatk_SOURCES = richtoatk.c richlex.c richset.c usascii.c iso2022.c
-+richtoatk_LDADD = $(top_builddir)/metamail/libmetamail.la
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = ../../metamail/config.h
-+CONFIG_CLEAN_FILES = 
-+bin_PROGRAMS =  richtext$(EXEEXT) richtoatk$(EXEEXT)
-+PROGRAMS =  $(bin_PROGRAMS)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir) -I../../metamail
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
-+richtext_OBJECTS =  richtext.$(OBJEXT) richlex.$(OBJEXT) \
-+richset.$(OBJEXT) usascii.$(OBJEXT) iso2022.$(OBJEXT)
-+richtext_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
-+richtext_LDFLAGS = 
-+richtoatk_OBJECTS =  richtoatk.$(OBJEXT) richlex.$(OBJEXT) \
-+richset.$(OBJEXT) usascii.$(OBJEXT) iso2022.$(OBJEXT)
-+richtoatk_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
-+richtoatk_LDFLAGS = 
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON =  Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+DEP_FILES =  .deps/iso2022.P .deps/richlex.P .deps/richset.P \
-+.deps/richtext.P .deps/richtoatk.P .deps/usascii.P
-+SOURCES = $(richtext_SOURCES) $(richtoatk_SOURCES)
-+OBJECTS = $(richtext_OBJECTS) $(richtoatk_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .lo .o .obj .s
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/richmail/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+mostlyclean-binPROGRAMS:
-+
-+clean-binPROGRAMS:
-+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-+
-+distclean-binPROGRAMS:
-+
-+maintainer-clean-binPROGRAMS:
-+
-+install-binPROGRAMS: $(bin_PROGRAMS)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-binPROGRAMS:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	done
-+
-+# FIXME: We should only use cygpath when building on Windows,
-+# and only if it is available.
-+.c.obj:
-+	$(COMPILE) -c `cygpath -w $<`
-+
-+.s.o:
-+	$(COMPILE) -c $<
-+
-+.S.o:
-+	$(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+	-rm -f *.o core *.core
-+	-rm -f *.$(OBJEXT)
-+
-+clean-compile:
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+.s.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+.S.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+
-+maintainer-clean-libtool:
-+
-+richtext$(EXEEXT): $(richtext_OBJECTS) $(richtext_DEPENDENCIES)
-+	@rm -f richtext$(EXEEXT)
-+	$(LINK) $(richtext_LDFLAGS) $(richtext_OBJECTS) $(richtext_LDADD) $(LIBS)
-+
-+richtoatk$(EXEEXT): $(richtoatk_OBJECTS) $(richtoatk_DEPENDENCIES)
-+	@rm -f richtoatk$(EXEEXT)
-+	$(LINK) $(richtoatk_LDFLAGS) $(richtoatk_OBJECTS) $(richtoatk_LDADD) $(LIBS)
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = src/richmail
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/richmail/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am: install-binPROGRAMS
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-binPROGRAMS
-+uninstall: uninstall-am
-+all-am: Makefile $(PROGRAMS)
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-+		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-+		mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
-+		clean-depend clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
-+		distclean-tags distclean-depend distclean-generic \
-+		clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-+		maintainer-clean-compile maintainer-clean-libtool \
-+		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-+maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-+mostlyclean-compile distclean-compile clean-compile \
-+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-+distclean-tags clean-tags maintainer-clean-tags distdir \
-+mostlyclean-depend distclean-depend clean-depend \
-+maintainer-clean-depend info-am info dvi-am dvi check check-am \
-+installcheck-am installcheck install-exec-am install-exec \
-+install-data-am install-data install-am install uninstall-am uninstall \
-+all-redirect all-am all installdirs mostlyclean-generic \
-+distclean-generic clean-generic maintainer-clean-generic clean \
-+mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/src/richmail/richlex.c
-+++ metamail-2.7/src/richmail/richlex.c
-@@ -0,0 +1,480 @@
-+/*-------------------------------------------------------------------------
-+
-+  richlex.c - Lexical analysis routines for parsing richtext messages.
-+ 
-+  Copyright (c) 1992 Rhys Weatherley
-+
-+  Permission to use, copy, modify, and distribute this material
-+  for any purpose and without fee is hereby granted, provided
-+  that the above copyright notice and this permission notice
-+  appear in all copies, and that the name of Rhys Weatherley not be
-+  used in advertising or publicity pertaining to this
-+  material without specific, prior written permission.
-+  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
-+  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
-+  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+  Revision History:
-+  ================
-+
-+   Version  DD/MM/YY  By  Description
-+   -------  --------  --  --------------------------------------
-+     1.0    31/01/92  RW  Original Version of richlex.c
-+     1.1    19/06/92  RW  Add support for multi-byte ISO-2022 codes.
-+
-+  You may contact the author by:
-+  =============================
-+
-+   e-mail: rhys@cs.uq.oz.au
-+     mail: Rhys Weatherley
-+	   5 Horizon Drive
-+	   Jamboree Heights
-+	   Queensland 4074
-+	   Australia
-+
-+  Caveats:
-+  =======
-+
-+  If a multi-byte character contains "<lt>", and a richtext command or
-+  escape sequence is started before all bytes of the multi-byte character
-+  have been read in, then some characters may be discarded.
-+
-+-------------------------------------------------------------------------*/
-+
-+#include <metamail/common.h>
-+
-+#include "richlex.h"
-+#include "richset.h"
-+
-+int CorrectionEnabled = 1;	/* Zero if correction has been disabled */
-+int RichtextLessThanFlag = 0;	/* Non-zero to turn on multi-byte '<' hack */
-+
-+//extern	int fgetc ();
-+//extern	int fputc ();
-+
-+int (*RichtextGetc) () = fgetc;	/* Function to call to get characters */
-+int (*RichtextPutc) () = fputc; /* Function to call to put characters */
-+int RichtextCharEncoding = RICH_ENC_US_ASCII; /* Current encoding mode */
-+
-+#define	MAX_STACK_SIZE	500
-+#define	MAX_FLUSH_SIZE	3
-+#define	MAX_PUSH_BACK	20
-+static	int	StackSize=0;
-+static	char	Stack[MAX_STACK_SIZE][MAX_TOKEN_SIZE];
-+static	char	NextToken[MAX_TOKEN_SIZE];
-+static	int	FlushStack=0;
-+static	int	FlushSize=0;
-+static	int	EndInpFile=0;
-+static	int	CharSize=1;
-+static	int	PushbackBuffer[MAX_PUSH_BACK];
-+static	int	PushbackSize=0;
-+static	int	PushbackExtract=0;
-+
-+#define	ESC	033
-+#define	SI	017
-+#define	SO	016
-+
-+#define	RGETRAW(f)	((*RichtextGetc)(f))
-+#define	RGET(f)		(PushbackSize ? richtextgetback() : RGETRAW(f))
-+#define	RPUT(c,f)	((*RichtextPutc)(((int)(c)),(f)))
-+#define	RUNGET(c)	(richtextunget(c))
-+#define	RPUSHBACK(c)	(richtextpushback(c))
-+
-+/*
-+ * Define a "printf" format for a generic ISO-2022 character
-+ * set name that includes the hexadecimal representation of
-+ * the escape sequence character that turns ISO-2022 on or off
-+ * on the terminal.
-+ */
-+#define	ISO2022_GENERIC	"x-iso-2022-gen-%2x"
-+#define	ISO2022_CHARSET "x-iso-charset-"
-+
-+/*
-+ * Define the character set shift characters for ISO-2022-KR.
-+ */
-+#define	ISO2022_SHIFTIN  "x-iso-shift-in"
-+#define	ISO2022_SHIFTOUT "x-iso-shift-out"
-+
-+/*
-+ * Construct multi-byte character codes.
-+ */
-+#define	RICHCH_2(first,second)	((RCHAR)(((first) << 8) | (second)))
-+
-+/*
-+ * Reset the richtext parsing mechanism.
-+ */
-+richtextreset()
-+{
-+    StackSize = 0;
-+    FlushStack = 0;
-+    FlushSize = 0;
-+    EndInpFile = 0;
-+    CharSize = 1;
-+    PushbackSize = 0;
-+    PushbackExtract = 0;
-+    RichtextCharEncoding = RICH_ENC_US_ASCII;
-+    CorrectionEnabled = 1;
-+    RichtextLessThanFlag = 0;
-+}
-+
-+/*
-+ * Push a character into the push-back buffer for later
-+ * retrieval by RGET.
-+ */
-+static	void	richtextpushback(c)
-+int	c;
-+{
-+    PushbackBuffer[PushbackSize++] = c;
-+}
-+
-+/*
-+ * Unget a character that has been read from the input stream.
-+ */
-+static	void	richtextunget(c)
-+int	c;
-+{
-+    if (PushbackSize)
-+	--PushbackExtract;	/* Character was retrieved from push-back */
-+    else
-+	richtextpushback(c);	/* Put character into empty push-back */
-+}
-+
-+/*
-+ * Unget two characters that have been read from the input stream.
-+ */
-+static	void	richtextunget2(c1,c2)
-+int	c1,c2;
-+{
-+    if (PushbackExtract > 1) {
-+	PushbackExtract -= 2;	/* Go back two characters in the push-back */
-+	PushbackBuffer[PushbackExtract++] = c1;
-+	PushbackBuffer[PushbackExtract++] = c2;
-+    } else {
-+	richtextpushback(c1);	/* Put the characters into the push-back */
-+	richtextpushback(c2);
-+    }
-+}
-+
-+/*
-+ * Retrieve a character from the push-back buffer.
-+ */
-+static	int	richtextgetback()
-+{
-+    int c;
-+    c = PushbackBuffer[PushbackExtract++];
-+    if (PushbackExtract >= PushbackSize) {
-+	PushbackSize = 0;
-+	PushbackExtract = 0;
-+    }
-+    return(c);
-+}
-+
-+/*
-+ * Find a match between NextToken and an element on the stack.
-+ * Returns the number of elements down from the top it is.
-+ * i.e. 0 if not on the stack, 1 if at the top, etc.
-+ */
-+static int richtextmatchup()
-+{
-+    int i = StackSize;
-+    while (i > 0 && i > (StackSize - MAX_FLUSH_SIZE)) {
-+	--i;
-+	if (!strcmp(NextToken,Stack[i]))
-+	    return(StackSize - i);
-+    }
-+    return(0);
-+}
-+
-+/*
-+ * Determine if the current token is one of the singleton
-+ * richtext commands: <nl>, <lt>, <np>.
-+ */
-+static richtextsingle(TextEnriched)
-+int TextEnriched;
-+{
-+    return (charsetsingle (NextToken) ||
-+	    (!TextEnriched &&
-+	        (!strcmp(NextToken,"nl") ||
-+		!strcmp(NextToken,"lt") ||
-+		!strcmp(NextToken,"np"))));
-+}
-+
-+/*
-+ * Recognise a character that can start a richtext command.
-+ */
-+#define	iscmdch(c)	(isalpha(c) || isdigit(c) || (c) == '/' || (c) == '-')
-+#define iscmdch2(c)	(isalpha(c) || isdigit(c) || (c) == '-')
-+#define TOLOWER(c)	(isupper(c)?tolower(c):c)
-+#define valid_command(c1,c2) \
-+	(( c1 == '/' && iscmdch2(c2) ) || \
-+	 (!TextEnriched && TOLOWER(c1) == 'l' && TOLOWER(c2) == 't' ))
-+
-+/*
-+ * Get the next token from the input stream.  RICHTEXT_COMMAND
-+ * or RICHTEXT_NEG_COMMAND are returned if it is a richtext command.
-+ * e.g. "<cmd>" or "</cmd>".  The "token" buffer will receive the
-+ * name of the command (without <,> or /) if it is a command.  This
-+ * function will also truncate commands longer than MAX_TOKEN_SIZE - 1
-+ * characters and abort command parsing if white space is encountered,
-+ * so, for example, errors like "<bold hi kids</bold>" don't cause
-+ * problems: it will be corrected to "<bold>hi kids</bold>".
-+ */
-+RCHAR richtextlex(file,token,TextEnriched, nofill)
-+void *file;
-+char *token;
-+int TextEnriched;
-+int nofill; /* Inside a nofill env we parse newlines differently */
-+{
-+    int c,i,lastch;
-+    RCHAR cmd;
-+
-+    lastch = 0;		/* No previous character for multi-byte chars as yet */
-+
-+    /* Perform any flushing of balancing commands that is necessary */
-+    if (FlushStack) {
-+	/* Flush out some extra closing commands */
-+	strcpy(token,Stack[StackSize - FlushSize + (--FlushStack)]);
-+	return(RICHTEXT_NEG_COMMAND);
-+    } else if (FlushSize) {
-+	/* Finished flushing: output the pending close command */
-+	StackSize -= FlushSize;
-+	if (StackSize > 0)
-+	    --StackSize; /* Remove the command that was being matched up */
-+	FlushSize = 0;
-+	strcpy(token,NextToken);
-+	if (EndInpFile)
-+	    return((RCHAR)EOF); /* The last flush was the end-of-file cleanup */
-+	else
-+	    return(RICHTEXT_NEG_COMMAND);
-+    }
-+
-+    /* Fetch a new character or richtext command */
-+    for (;;) {		/* Loop so we can come back on ignored commands */
-+        c = RGET(file);
-+        if (c == '<') { 
-+	    /* Check for multi-byte mode, where "<" is special */
-+	    int c2;
-+	    if (CharSize > 1) {
-+		if (RichtextLessThanFlag) {
-+		    /* The multi-byte '<' hack is in effect: not a command */
-+		    if (lastch)
-+		        return(RICHCH_2(lastch,'<'));
-+		    lastch = '<';
-+		    continue;	/* Back around for another character */
-+		}
-+		if ((c = RGET(file)) == EOF) {
-+		    RUNGET(c);
-+		    return((RCHAR)'<');
-+		}
-+		c2 = RGET(file);
-+		richtextunget2(c,c2);
-+		if( !valid_command(c,c2) ){
-+		    /* We have a stray less-than symbol */
-+	            if (lastch)
-+		        return(RICHCH_2(lastch,'<'));
-+	            lastch = '<';
-+	            continue;	/* Back around for another character */
-+		}
-+	    } else if (TextEnriched) {
-+	    	c2 = RGET(file);
-+		if (c2 == '<') {
-+		    return((RCHAR)c);
-+		} else {
-+		    RUNGET(c2);
-+		}
-+	    }
-+
-+	    /* Read a command token from the input file */
-+	    cmd = RICHTEXT_COMMAND;
-+	    if ((c = RGET(file)) == '/') {
-+	        cmd = RICHTEXT_NEG_COMMAND;
-+	        c = RGET(file);
-+	    }
-+            for (i = 0; i < (MAX_TOKEN_SIZE - 1) && c != '>'
-+	    		&& c != EOF && !isspace(c); ++i) {
-+                NextToken[i] = isupper(c) ? tolower(c) : c;
-+	        c = RGET(file);
-+            }
-+	    if (c != '>' && c != EOF && !isspace(c)) {
-+		/* We have a long command: skip the rest of it */
-+		while (c != '>' && c != EOF && !isspace(c))
-+		    c = RGET(file);
-+	    }
-+            if (c == EOF) {
-+		if (!StackSize)
-+	    	    return((RCHAR)EOF);
-+	        /* Flush the remaining commands at the end of the input file */
-+	        FlushSize = StackSize;
-+	        FlushStack = FlushSize;
-+	        EndInpFile = 1;
-+	        return(richtextlex(file,token,TextEnriched, nofill)); /* Flush something out */
-+	    }
-+            NextToken[i] = '\0';
-+
-+	    /* Process <lt> specially for multi-byte characters */
-+	    if (CharSize > 1 && !TextEnriched && !strcmp(NextToken,"lt")) {
-+	        if (lastch)
-+		    return(RICHCH_2(lastch,'<'));
-+	        lastch = '<';
-+	        continue;	/* Back around for another character */
-+	    }
-+
-+	    /* Check to see if we need to correct anything */
-+	    if (!CorrectionEnabled) {
-+		/* No correction to do: just skip the correction phase */
-+		strcpy(token,NextToken);
-+		return(cmd);
-+	    }
-+	    if (cmd == RICHTEXT_COMMAND) {
-+		/* Save the command on the stack if not a singleton command */
-+		if (!richtextsingle(TextEnriched)) {
-+		    strcpy (Stack[StackSize++],NextToken);
-+		}
-+	    }
-+	    else if (!(i = richtextmatchup()))
-+		continue;	/* No matchup - just drop it */
-+	    else if (i == 1)
-+		--StackSize;	/* Correct match at the stack top */
-+	    else {
-+		/* Flush some correction elements from the stack */
-+		FlushSize = i - 1;
-+		FlushStack = FlushSize;
-+		return(richtextlex(file,token,TextEnriched, nofill));
-+	    }
-+	    strcpy(token,NextToken);
-+	    return(cmd);
-+        } else if (c == SI) {
-+	    /* Shift-in character: translate to a singleton */
-+	    strcpy(token,ISO2022_SHIFTIN);
-+	    return(RICHTEXT_COMMAND);
-+	} else if (c == SO) {
-+	    /* Shift-out character: translate to a singleton */
-+	    strcpy(token,ISO2022_SHIFTOUT);
-+	    return(RICHTEXT_COMMAND);
-+	} else if (c == ESC) {
-+	    /* Check for escape sequences that change character sizes */
-+	    int newc;
-+	    c = RGET(file);
-+	    if (c == '$') {
-+		newc = RGET(file);
-+		if (newc == ')') {
-+		    newc = RGET(file);	/* 4-byte ESC-$-)-? sequence */
-+		    sprintf(token,ISO2022_CHARSET,newc);
-+		} else {
-+		    sprintf(token,ISO2022_GENERIC,newc);
-+		}
-+		return(RICHTEXT_COMMAND);
-+	    } else if (c == '(') {
-+		newc = RGET(file);
-+		sprintf(token,ISO2022_GENERIC,newc);
-+		return(RICHTEXT_NEG_COMMAND);
-+	    } else {
-+		RUNGET(c);
-+		return((RCHAR)ESC);
-+	    }
-+        } else if (c == EOF && StackSize) {
-+	    /* Flush the remaining commands at the end of the input file */
-+	    FlushSize = StackSize;
-+	    FlushStack = FlushSize;
-+	    EndInpFile = 1;
-+	    return(richtextlex(file,token,TextEnriched, nofill)); /* Flush something out */
-+	} else if (CharSize > 1) {
-+	    /* Recognise a multi-byte character */
-+	    int newc;
-+	    if (!lastch && isspace (c))
-+	      return ((RCHAR)c); /* Hack for spaces in 2-byte modes */
-+	    if (lastch)
-+		return (RICHCH_2(lastch,c)); /* This is second of 2 chars */
-+	    if ((newc = RGET(file)) == EOF) {
-+		RUNGET(newc);	/* Push the EOF back into the input stream */
-+		return((RCHAR)c); /* Just return the partial single-byte char */
-+	    } else if (newc == '<') {
-+		/* The second character could be "<lt>", so loop around */
-+		lastch = c;
-+		RUNGET(newc);
-+		continue;
-+	    } else {
-+	    	return(RICHCH_2(c,newc));
-+	    }
-+	} else if (TextEnriched && !nofill && (c == '\n')) {
-+	    int c2 = RGET(file);
-+	    RUNGET(c2);
-+	    if (c2 == '\n') {
-+		strcpy(token, "iNtErNaL-nL");
-+		return(RICHTEXT_COMMAND);
-+	    } else {
-+		return((RCHAR)c);
-+	    }
-+	} else {
-+	    return((RCHAR)c);
-+	}
-+    }
-+}
-+
-+/*
-+ * Output a string via "RichtextPutc".
-+ */
-+static richtextoutstr(str,outparam)
-+char *str;
-+void *outparam;
-+{
-+    while (*str) {
-+	RPUT(*str,outparam);
-+	++str;
-+    }
-+}
-+
-+/*
-+ * Read the input stream, correct the richtext, and write the
-+ * results to the output stream.
-+ */
-+richtextcorrect(inparam,outparam,TextEnriched)
-+void *inparam,*outparam;
-+int TextEnriched;
-+{
-+    RCHAR c;
-+    char token[MAX_TOKEN_SIZE];
-+    while ((c = richtextlex(inparam,token,TextEnriched, 0)) != (RCHAR)EOF) {
-+	if (c == RICHTEXT_COMMAND) {
-+	    RPUT('<',outparam);
-+	    richtextoutstr(token,outparam);
-+	    RPUT('>',outparam);
-+	} else if (c == RICHTEXT_NEG_COMMAND) {
-+	    RPUT('<',outparam);
-+	    RPUT('/',outparam);
-+	    richtextoutstr(token,outparam);
-+	    RPUT('>',outparam);
-+	} else if (c >= 256) {
-+	    RPUT(RICHCH2_FIRST(c),outparam);
-+	    RPUT(RICHCH2_SECOND(c),outparam);
-+	} else {
-+	    RPUT(c,outparam);
-+	}
-+    }
-+}
-+
-+/*
-+ * Change the encoding used for characters not present in
-+ * richtext command sequences.
-+ */
-+richtextencoding(encoding)
-+int	encoding;
-+{
-+    RichtextCharEncoding = encoding;
-+    switch (RichtextCharEncoding) {
-+	case RICH_ENC_US_ASCII:
-+	case RICH_ENC_JP_ASCII:
-+	case RICH_ENC_KR_ASCII:
-+		CharSize = 1;
-+		break;
-+
-+	case RICH_ENC_JIS_1978:
-+	case RICH_ENC_JIS_1983:
-+	case RICH_ENC_KSC_5601:
-+		CharSize = 2;
-+		break;
-+
-+	default:CharSize = 1;
-+		break;
-+    }
-+}
---- metamail-2.7.orig/src/richmail/richlex.h
-+++ metamail-2.7/src/richmail/richlex.h
-@@ -0,0 +1,166 @@
-+/*-------------------------------------------------------------------------
-+
-+  richlex.h - Lexical analysis routines for parsing richtext messages.
-+ 
-+  Copyright (c) 1992 Rhys Weatherley
-+
-+  Permission to use, copy, modify, and distribute this material
-+  for any purpose and without fee is hereby granted, provided
-+  that the above copyright notice and this permission notice
-+  appear in all copies, and that the name of Rhys Weatherley not be
-+  used in advertising or publicity pertaining to this
-+  material without specific, prior written permission.
-+  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
-+  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
-+  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+  Revision History:
-+  ================
-+
-+   Version  DD/MM/YY  By  Description
-+   -------  --------  --  --------------------------------------
-+     1.0    31/01/92  RW  Original Version of richlex.h
-+     1.1    19/06/92  RW  Add support for multi-byte ISO-2022 codes.
-+
-+  You may contact the author by:
-+  =============================
-+
-+   e-mail: rhys@cs.uq.oz.au
-+     mail: Rhys Weatherley
-+	   5 Horizon Drive
-+	   Jamboree Heights
-+	   Queensland 4074
-+	   Australia
-+
-+-------------------------------------------------------------------------*/
-+
-+#ifndef	__RICHTEXT_H__
-+#define	__RICHTEXT_H__
-+
-+#include <metamail/common.h>
-+
-+BEGIN_C_DECLS
-+
-+//#ifdef	__cplusplus
-+//extern "C" {
-+//#endif
-+
-+/*
-+ * Define the data type to be used by characters in the richtext
-+ * system.  Note: this is a long because some machines, MS-DOS
-+ * machines for example, only have 16-bit integers and hence won't
-+ * be able to cope with large multi-byte character codes.  If
-+ * something is strange with your character processing, it is
-+ * probably because you aren't using the right types.
-+ */
-+typedef	long	RCHAR;
-+
-+/*
-+ * Set the following variable to zero to disable the
-+ * correction of richtext commands.  The default
-+ * value is non-zero.
-+ */
-+extern	int CorrectionEnabled;
-+
-+/*
-+ * Set the following value to non-zero to enable the
-+ * multi-byte '<' hack which ignores richtext commands
-+ * in multi-byte modes.  The default value is zero.
-+ */
-+extern	int RichtextLessThanFlag;
-+
-+/*
-+ * Define the function to call to get characters from
-+ * the message.  The calling convention of this
-+ * function is: "int func (void *param)".  The default
-+ * value is "fgetc".  The function must return EOF
-+ * at the end of the messsage;
-+ */
-+extern	int (*RichtextGetc) ();
-+
-+/*
-+ * Define the function to call to output characters from
-+ * richtextcorrect.  The calling convention of this
-+ * function is: "int func (int c,void *param)".  The default
-+ * value is "fputc".
-+ */
-+extern	int (*RichtextPutc) ();
-+
-+/*
-+ * Define the maximum size of richtext command tokens.
-+ */
-+#define	MAX_TOKEN_SIZE		50
-+
-+/*
-+ * Define the special token values that are returned by
-+ * the "richtextlex" function.  These values were chosen
-+ * to keep away from legal ASCII.
-+ *
-+ * Version 1.1: modified to negative values to keep away
-+ * from legal ISO-2022 and other multi-byte characters.
-+ */
-+#define	RICHTEXT_COMMAND	((RCHAR)(-2))
-+#define	RICHTEXT_NEG_COMMAND	((RCHAR)(-3))
-+
-+/*
-+ * Reset the richtext parsing mechanism.
-+ */
-+extern	richtextreset();
-+
-+/*
-+ * Get the next token from the input stream.  RICHTEXT_COMMAND
-+ * or RICHTEXT_NEG_COMMAND are returned if it is a richtext command.
-+ * e.g. "<cmd>" or "</cmd>".  The "token" buffer will receive the
-+ * name of the command (without <,> or /) if it is a command.  This
-+ * function will also truncate commands longer than MAX_TOKEN_SIZE - 1
-+ * characters and abort command parsing if white space is encountered,
-+ * so, for example, errors like "<bold hi kids</bold>" don't cause
-+ * problems: it will be corrected to "<bold>hi kids</bold>".
-+ * The "file" parameter is passed to the function pointed to by
-+ * "RichtextGetc" on each call.
-+ */
-+extern	RCHAR	richtextlex( /* void *file,char *token,int TextEnriched */ );
-+
-+/*
-+ * Read the input stream, correct the richtext, and write the
-+ * results to the output stream.  "outparam" is passed to the
-+ * "RichtextPutc" function as the second argument, and "inparam"
-+ * is passed to "richtextlex" during parsing.
-+ */
-+extern	richtextcorrect( /* void *inparam,void *outparam,int TextEnriched */ );
-+
-+#define	RICH_ENC_US_ASCII	0	/* US-ASCII encoding: one-byte */
-+#define	RICH_ENC_JP_ASCII	1	/* JP-ASCII encoding: one-byte */
-+#define	RICH_ENC_KR_ASCII	2	/* KR-ASCII encoding: one-byte */
-+#define	RICH_ENC_JIS_1978	100	/* JIS-X-0208-1978: two-byte */
-+#define	RICH_ENC_JIS_1983	101	/* JIS-X-0208-1983: two-byte */
-+#define	RICH_ENC_KSC_5601	200	/* KSC-5601 (Korean): two-byte */
-+
-+/*
-+ * The following variable contains the current character
-+ * encoding in use.  This should only be read.  Setting it
-+ * is done via "richtextencoding".
-+ */
-+extern	int	RichtextCharEncoding;
-+
-+/*
-+ * Change the encoding used for characters not present in
-+ * richtext command sequences.
-+ */
-+extern	richtextencoding( /* int encoding */ );
-+
-+/*
-+ * Define a number of macros for decoding multi-byte character
-+ * codes.  The names of the macros have the form "RICHCHn_xxx"
-+ * where "n" is the number of bytes in the character.
-+ */
-+#define	RICHCH2_FIRST(c)	(((c) >> 8) & 0xFF)
-+#define	RICHCH2_SECOND(c)	((c) & 0xFF)
-+
-+//#ifdef	__cplusplus
-+//};
-+//#endif
-+
-+END_C_DECLS
-+
-+#endif	/* __RICHTEXT_H__ */
---- metamail-2.7.orig/src/richmail/richtext.c
-+++ metamail-2.7/src/richmail/richtext.c
-@@ -0,0 +1,905 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+
-+#include <metamail/common.h>
-+
-+#include <curses.h>  /* This and next for tgetstr(3X) and kin */
-+#include <term.h>
-+
-+#include "richlex.h"
-+#include "richset.h"
-+
-+int iso2022_fputc ();
-+
-+/*
-+ * ########################################################################
-+ * The function "InitGlobals" must be updated whenever a new variable is
-+ * added here or a default value is changed.  The same must be done for
-+ * the next section of variables also.  This is needed because this module
-+ * could be linked into another program as a library and called more than
-+ * once in a single program execution.
-+ * ########################################################################
-+ */
-+static int linepos = 0, inspace = 0, leftmargin = 0, rightmargin, biggertext=0;
-+static int workingleft = 0, workingright, inexcerpt = 0, insignature = 0;
-+static int highlight=0, underline=0, bold=0, nofill=0;
-+static int termcolumns=80, termrows=23;
-+int controlputc();
-+
-+/* A common problem, in justifying text, is figuring out how to format a 
-+   line when part of it wants to be left-justified, part right-justified, 
-+   and part centered, or some combination thereof.  There is no perfect 
-+   solution to this problem, so this program takes an incredibly cheesy 
-+   but simple way out:  voting.  For each character on the line, a point
-+   is added to the "center" score if it is supposed to be centered, and 
-+   so on.  If it is inside TWO "center" environments, two points are added.
-+   This may be the world's first implementation of justification by voting...
-+*/
-+
-+static int centerenv=0, leftjustenv=0, rightjustenv=0;
-+static int centerct=0, leftjustct=0, rightjustct=0;
-+static int UsePager = 0;
-+static int linesused = 0;
-+static int JustSawCmd=0;
-+static int JustCorrect = 0;	/* Non-zero to just correct and not format */
-+static int OverStrike = 0;
-+static int TextEnriched = 0;
-+static char MoveRight[10];
-+static char highlightbuf[50], highlightendbuf[50], StartUnderline[50], StopUnderline[50];
-+static char KS[50], KE[50], BoldOn[50], BoldOff[50];
-+static char charsetname[50];
-+static int FakeTerminal;
-+
-+extern tputs();
-+
-+static outputc(), realoutputc(), MakeWorkingMargins(), Pause(), fputsmovingright(), ResetTerminalCodes(), FinalizeTerminal(), outputstr(), FPUTS(), lc2strcmp();
-+
-+#define	OUTC(c)		(outputc((RCHAR)(c)))
-+
-+static void
-+InitGlobals()
-+{
-+    linepos = 0;
-+    inspace = 0;
-+    leftmargin = 0;
-+    biggertext = 0;
-+    workingleft = 0;
-+    inexcerpt = 0;
-+    insignature = 0;
-+    termcolumns = 80;
-+    termrows = 23;
-+    centerenv = 0;
-+    leftjustenv = 0;
-+    rightjustenv = 0;
-+    centerct = 0;
-+    leftjustct = 0;
-+    rightjustct = 0;
-+    UsePager = 0;
-+    linesused = 0;
-+    JustSawCmd = 0;
-+    JustCorrect = 0;
-+    highlight = 0;
-+    underline = 0;
-+    bold = 0;
-+    TextEnriched = 0;
-+    nofill = 0;
-+}
-+
-+static void
-+cleanup(signum)
-+int signum;
-+{
-+    FinalizeTerminal();
-+    signal(signum, SIG_DFL);
-+    kill(getpid(), signum);
-+}
-+
-+static InitSignals() {
-+    signal(SIGINT, cleanup);
-+    signal(SIGILL, cleanup);
-+    signal(SIGTRAP, cleanup);
-+    signal(SIGIOT, cleanup);
-+    signal(SIGFPE, cleanup);
-+#ifndef linux
-+    signal(SIGEMT, cleanup);
-+    signal(SIGBUS, cleanup);
-+#endif
-+    signal(SIGSEGV, cleanup);
-+    signal(SIGTERM, cleanup);
-+#ifdef SIGXCPU
-+    signal(SIGXCPU, cleanup);
-+#endif
-+}
-+
-+static nomemabort() {
-+    fprintf(stderr, "richtext: Out of memory\n");
-+    FinalizeTerminal();
-+    exit(-1);
-+}
-+
-+#ifndef	RICHTEXT_LIBRARY
-+
-+/*
-+ * Only include the main function if this module is not being used as a
-+ * library call.
-+ */
-+
-+main(argc, argv)
-+int argc;
-+char **argv;
-+{
-+  exit(richtext_main(argc, argv));
-+}
-+
-+#endif
-+
-+richtext_main(argc, argv)
-+int argc;
-+char **argv;
-+{
-+    RCHAR c;
-+    int i, atstart, negated,
-+    ForceTermcap=0, ForcePlain=0, NotTtyEnv = 0;
-+    char token[MAX_TOKEN_SIZE], *tok, *nottty;
-+    char tbuf[1024], *term, *dum;
-+    FILE *InputFP = stdin, *tmpfp;
-+
-+    InitSignals();
-+    InitGlobals();
-+    richtextreset();
-+    strcpy(charsetname,"us-ascii");
-+    dum = (char *) getenv("MM_USEPAGER");
-+    if (dum && atoi(dum)) ++UsePager;
-+    for (i=1; i< argc; ++i) {
-+        if (!strcmp(argv[i], "-p")) {
-+            ++UsePager;
-+        } else if (!strcmp(argv[i],"-c")) {
-+            /* Only perform correction: don't format */
-+            JustCorrect = 1;
-+        } else if (!strcmp(argv[i], "-f")) {
-+            /* Force termcap usage */
-+            ForceTermcap = 1;
-+        } else if (!strcmp(argv[i], "-t")) {
-+            /* Force plain text */
-+            ForcePlain = 1;
-+        } else if (!strcmp(argv[i],"-n")) {
-+            /* Disable the richtext correction routines */
-+            CorrectionEnabled = 0;
-+        } else if (!strcmp(argv[i],"-m")) {
-+            /* Enable the multi-byte '<' hack */
-+            RichtextLessThanFlag = 1;
-+	} else if (!strncmp(argv[i], "-s", 2)) {
-+	    /* Specify the character set to use (and convert to lower case) */
-+	    char *name;
-+	    if (argv[i][2])
-+		strcpy(charsetname, argv[i] + 2);
-+	    else if (i < (argc - 1))
-+		strcpy(charsetname, argv[++i]);
-+	    name = charsetname;
-+	    while (*name) {
-+		if (isupper(*name))
-+		    *name = tolower(*name);
-+		++name;
-+	    }
-+	} else if (!strcmp(argv[i], "-o")) {
-+	    /* Use Overstriking */
-+	    OverStrike = 1;
-+	    ForcePlain = 1;
-+	} else if (!strcmp(argv[i], "-e")) {
-+		/* Work with text/enriched instead of text/richtext */
-+		TextEnriched = 1;
-+        } else {
-+            /* open for input */
-+            tmpfp = fopen(argv[i], "r");
-+            if (tmpfp)
-+	    	InputFP = tmpfp;
-+	    else {
-+	    	perror (argv[i]);
-+		exit (1);
-+	    }
-+        }
-+    }
-+    /* THIS IS THE UNIX TERMINAL INITIALIZATION CODE */
-+    nottty = (char *) getenv("MM_NOTTTY");
-+    if (nottty) NotTtyEnv = atoi(nottty);
-+    if (UsePager && (!isatty(0) || !isatty(1) || NotTtyEnv)) {
-+        UsePager = 0;   /* Disable pager if I/O has been redirected or we're under a window-oriented mail reader */
-+    }
-+    if ((!ForcePlain && (isatty(1) || isatty(0))) || ForceTermcap) {
-+        term = (char *) getenv("TERM");
-+    } else {
-+        term = NULL;
-+    }
-+    if (term && tgetent(tbuf, term) != 1) {
-+        term = NULL;
-+    }
-+    if (term) {
-+        static char cb[1024];
-+        char *cp;
-+                   
-+        cp = cb;
-+	
-+        if (dum = (char*) tgetstr("ks", &cp)) 
-+	  strcpy (KS, dum); 
-+	else
-+	  KS[0] = '\0';
-+        if (dum = (char*) tgetstr("ke", &cp)) 
-+	  strcpy (KE, dum); 
-+	else
-+	  KE[0] = '\0';
-+        if (dum = (char*) tgetstr("so", &cp))
-+	  strcpy (highlightbuf, dum); highlightbuf[0] = '\0';
-+        if (dum = (char*) tgetstr("se", &cp))
-+	  strcpy (highlightendbuf, dum); highlightendbuf[0] = '\0';
-+        if (dum = (char*) tgetstr("md", &cp)) 
-+	  strcpy (BoldOn, dum); 
-+	else 
-+	  strcpy(BoldOn, highlightbuf);
-+        if (dum = (char*) tgetstr("me", &cp)) 
-+	  strcpy (BoldOff, dum); 
-+	else 
-+	  strcpy(BoldOff, highlightendbuf);
-+        if (dum = (char*) tgetstr("us", &cp))
-+	  strcpy (StartUnderline, dum);
-+	else
-+	  StartUnderline[0] = '\0';
-+        if (dum = (char*) tgetstr("ue", &cp))
-+	  strcpy (StopUnderline, dum);
-+	else StopUnderline[0] = '\0';
-+        if (dum = (char*) tgetstr("nd", &cp))
-+	  strcpy (MoveRight, dum);
-+	else {
-+            MoveRight[0] = ' ';
-+            MoveRight[1] = '\0';
-+        }
-+        /* Some TERMCAP entries have REALLY screwed up "nd" fields, sigh... */
-+        if (!strcmp(MoveRight, "\014")) strcpy(MoveRight, " ");
-+        termcolumns = tgetnum("co");
-+        if (termcolumns <= 0) termcolumns = 80;
-+        termrows = tgetnum("li");
-+        if (termrows <= 0) termrows = 23;
-+	else termrows--;
-+        FakeTerminal=0;
-+    } else if (OverStrike) {
-+        KS[0] = '\0';
-+        KE[0] = '\0';
-+	FakeTerminal = 1;
-+	BoldOn[0] = '\0';
-+	BoldOff[0] = '\0';
-+	highlightbuf[0] = '\0';
-+	highlightendbuf[0] = '\0';
-+	StartUnderline[0] = '\0';
-+	StopUnderline[0] = '\0';
-+	strcpy(MoveRight, " ");
-+        termcolumns = 80;
-+        termrows = 23;
-+    } else {
-+        KS[0] = '\0';
-+        KE[0] = '\0';
-+        FakeTerminal = 1;
-+        strcpy(BoldOn, "*");
-+        strcpy(BoldOff, "*");
-+        strcpy(highlightbuf, "_");
-+        strcpy(highlightendbuf, "_");
-+        strcpy(StartUnderline, "_");
-+        strcpy(StopUnderline, "_");
-+        strcpy(MoveRight, " ");
-+        termcolumns = 80;
-+        termrows = 23;
-+    }
-+    /* Check for the LINES & COLUMNS hack */
-+    dum = getenv("LINES");
-+    if (dum && ((i=atoi(dum)) > 0)) termrows = i - 1;
-+    dum = getenv("COLUMNS");
-+    if (dum && ((i=atoi(dum)) > 0)) termcolumns = i;
-+    charsetnameinit(charsetname);
-+    RichtextPutc = iso2022_fputc;
-+    if (JustCorrect) {
-+        richtextcorrect(InputFP,stdout,TextEnriched);
-+        return(0);
-+    }
-+    FPUTS(KS, stdout);
-+    rightmargin = workingright = termcolumns - 1;
-+    while((c = richtextlex(InputFP,token,TextEnriched, nofill)) != (RCHAR)EOF) {
-+        if (c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND) { 
-+            negated = (c == RICHTEXT_NEG_COMMAND);
-+            tok = token;
-+
-+	    /* Try to process the command with the character set processors */
-+	    if (charsetcommand (tok,negated))
-+	        continue;
-+
-+	    /* Do the default action for the command */
-+            switch(tok[0]) {
-+                case 'b':
-+                    if (!strcmp(tok, "bold")) {
-+                        if (negated) {
-+                            --bold;
-+                            if (bold <= 0) {
-+				if (FakeTerminal) outputstr(BoldOff);
-+				else controloutput(BoldOff, 0);
-+			    }
-+                        } else {
-+                            ++bold;
-+                        }
-+                        ResetTerminalCodes(FakeTerminal, highlight, underline,
-+                                            bold, highlightbuf, highlightendbuf, 0,
-+                                            StartUnderline, StopUnderline, 0, BoldOn,
-+                                            BoldOff, 1);
-+                    } else if (!strcmp(tok, "bigger")) {
-+                        if (negated) --biggertext; else ++biggertext;
-+                    }
-+                    break;
-+                case 'c':
-+                    if (!strcmp(tok, "center")) {
-+                        if (negated) --centerenv; else ++centerenv;
-+                    } else if (!TextEnriched && !strcmp(tok, "comment")) {
-+                        int commct=1;
-+			int tempc;
-+                        while (commct > 0) {
-+                            while ((tempc = getc(InputFP)) != '<' 
-+                                    && tempc != EOF) ;
-+                            if (tempc == EOF) break;
-+                            for (i=0; (tempc = getc(InputFP)) != '>' 
-+                              && tempc != EOF; ++i) {
-+                                token[i] = isupper(tempc) ? 
-+                                  tolower(tempc) : tempc;
-+				if (i == MAX_TOKEN_SIZE-2) break;
-+                            }
-+                            if (tempc== EOF) break;
-+                            token[i] = 0;
-+                            if (!strcmp(token, "/comment")) --commct;
-+                            if (!strcmp(token, "comment")) ++commct;
-+                        }
-+                    }
-+                    break;
-+                case 'e':
-+                    if (!strcmp(tok, "excerpt")) {
-+                        atstart = !(linepos > workingleft);
-+                        if (negated) {
-+                            leftmargin -= 4;
-+                            rightmargin += 4;
-+                            --inexcerpt;
-+                        } else {
-+                            leftmargin += 4;
-+                            rightmargin -= 4;
-+                            ++inexcerpt;
-+                        }
-+                        MakeWorkingMargins();
-+                        if (!atstart) OUTC('\n');
-+                    }
-+                    break;
-+                case 'f':
-+                    if (!strcmp(tok, "flushleft")) {
-+                        if (negated) --leftjustenv; else ++leftjustenv;
-+                    } else if (!strcmp(tok, "flushright")) {
-+                        if (negated) --rightjustenv; else ++rightjustenv;
-+                    }
-+                    break;
-+                case 'i':
-+                    if (!strcmp(tok, "italic")) {
-+                        if (negated) {
-+                            --highlight;
-+                            if (highlight <= 0) {
-+				if (FakeTerminal) outputstr(highlightendbuf);
-+				else controloutput(highlightendbuf, 0);
-+			    }
-+                        } else {
-+                            ++highlight;
-+                        }
-+                        ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
-+                                            highlightbuf, highlightendbuf, 1, StartUnderline,
-+                                            StopUnderline, 0, BoldOn, BoldOff, 0);
-+                    } else if (!strcmp(tok, "indent")) {
-+                        if (negated) {
-+                            leftmargin -= 4;
-+                        } else {
-+                            leftmargin += 4;
-+                        }
-+                    } else if (!strcmp(tok, "indentright")) {
-+                        if (negated) {
-+                            rightmargin += 4;
-+                        } else {
-+                            rightmargin -= 4;
-+                        }
-+		    } else if (TextEnriched && !strcmp(tok, "iNtErNaL-nL")) {
-+			OUTC('\n');
-+                    }
-+                    MakeWorkingMargins();
-+                    break;
-+                case 'l':
-+                    if (!TextEnriched && !strcmp(tok, "lt")) {
-+                        OUTC('<');
-+                    }
-+                    break;
-+                case 'n':
-+ 		    if (!TextEnriched && !strcmp(tok, "nl")) {
-+                        OUTC('\n');
-+		    } else if (TextEnriched && !strcmp(tok, "nofill")) {
-+			if (negated) {
-+			    --nofill;
-+			} else {
-+			    ++nofill;
-+			}
-+                    } else if (!TextEnriched && !strcmp(tok, "np")) {
-+                        OUTC('\n');
-+                        OUTC('\014');
-+                    }
-+                    break;
-+                case 'o':
-+                    if (!TextEnriched && !strcmp(tok, "outdent")) {
-+                        if (negated) {
-+                            leftmargin += 4;
-+                        } else {
-+                            leftmargin -= 4;
-+                        }
-+                    } else if (!TextEnriched && !strcmp(tok, "outdentright")) {
-+                        if (negated) {
-+                            rightmargin -= 4;
-+                        } else {
-+                            rightmargin += 4;
-+                        }
-+                    }
-+                    MakeWorkingMargins();
-+                    break;                    
-+                case 'p':
-+                    if (!TextEnriched && !strcmp(tok, "paragraph")) {
-+                        if (negated) OUTC('\n');
-+                        OUTC('\n');
-+                    } else if (TextEnriched && !strcmp(tok, "param")) {
-+                        int commct=1;
-+                        while (commct > 0) {
-+			    for (;;) {
-+				c = richtextlex(InputFP,token,TextEnriched, nofill);
-+				if (c == EOF || c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND)
-+				    break;
-+                            }
-+			    if (c == EOF) break;
-+			    if (!strcmp(token,"param")) {
-+				if (c == RICHTEXT_NEG_COMMAND) --commct;
-+				else if (c == RICHTEXT_COMMAND) ++commct;
-+                        }
-+                    }
-+		    }
-+                    break;
-+                case 's':
-+                    if (!TextEnriched && !strcmp(tok, "signature")) {
-+                        atstart = !(linepos > workingleft);
-+                        if (negated) {
-+                            leftmargin -= 4;
-+                            rightmargin += 4;
-+                            --insignature;
-+                        } else {
-+                            leftmargin += 4;
-+                            rightmargin -= 4;
-+                            ++insignature;
-+                        }
-+                        MakeWorkingMargins();
-+                        if (!atstart) OUTC('\n');
-+                    }
-+                    break;
-+                case 'u':
-+                    if (!strcmp(tok, "underline")) {
-+                        if (negated) {
-+                            --underline;
-+                            if (underline <= 0) {
-+				if (FakeTerminal) outputstr(StopUnderline);
-+				else controloutput(StopUnderline,0);
-+			    }
-+                        } else {
-+                            ++underline;
-+                        }
-+                        ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
-+                                            highlightbuf, highlightendbuf, 0, StartUnderline,
-+                                            StopUnderline, 1, BoldOn, BoldOff, 0);
-+                    }
-+                    break;
-+                case 'v':
-+                    if (TextEnriched && !strcmp(tok, "verbatim")) {
-+                        for (;;) {
-+			    int tempc;
-+                            while ((tempc = getc(InputFP)) != '<' 
-+                                    && tempc != EOF)
-+				OUTC(tempc);
-+                            if (tempc == EOF) break;
-+			    ungetc(tempc = getc(InputFP), InputFP);
-+			    if (tempc == '<') {
-+				OUTC('<');
-+				getc(InputFP);
-+				continue;
-+			    }
-+                            for (i=0; (tempc = getc(InputFP)) != '>' 
-+                              && tempc != EOF; ++i) {
-+                                token[i] = tempc;
-+				if (i == MAX_TOKEN_SIZE-2) break;
-+                            }
-+                            if (tempc== EOF) break;
-+                            token[i] = 0;
-+                            if (!lc2strcmp(token, "/verbatim")) break;
-+			    else for (i=0; token[i]; i++)
-+			        OUTC(token[i]);
-+                        }
-+                    }
-+                    break;
-+                default:
-+                    /* Ignore all other tokens */
-+                    break;
-+            }
-+            JustSawCmd = 1;
-+        } else if (c == '\n') {
-+	    if (nofill) {
-+		OUTC(c);
-+	    } else if (linepos > 0 && !inspace) {
-+                OUTC(' ');
-+            }
-+            JustSawCmd = 0;
-+        } else {
-+            OUTC(c);
-+            JustSawCmd = 0;
-+        }
-+    }
-+    if (term) { /* cleanup a bit for insurance */
-+        controloutput(highlightendbuf, 0);
-+        controloutput(StopUnderline, 0);
-+    }
-+    OUTC('\n'); /* for good measure */
-+    FPUTS(KE, stdout);
-+    fflush(stdout);
-+    if (UsePager) {
-+        Pause();
-+    }
-+    return(0);
-+}
-+
-+static struct charsetmember OutputBuf[1000] = {0,0};
-+static int PendingOutput = 0, PendingControls = 0;
-+
-+controlputc(c)
-+int c;
-+{
-+    charmemberctrl (&OutputBuf[PendingOutput],(RCHAR)c);
-+    ++PendingOutput;
-+    ++PendingControls;
-+}
-+
-+static immediate_controlputc(c)
-+int c;
-+{
-+    (*RichtextPutc) (c, stdout);
-+}
-+
-+controloutput(s, immediate)
-+char *s;
-+int immediate;
-+{
-+    tputs(s, 1, immediate ? immediate_controlputc : controlputc);
-+}
-+
-+static folding_point (buf, pos)
-+struct	charsetmember *buf;
-+int	pos;
-+{
-+    int i;
-+    for (i = pos; i > 0; --i) {
-+    	if (!charisctrl (buf[i]) && charmemberfold (buf[i]))
-+	    return (i);
-+    }
-+    return (0);
-+}
-+
-+static calc_column (buf, pos)
-+struct	charsetmember *buf;
-+int	pos;
-+{
-+    struct charsetmember *s;
-+    int col = 0;
-+    for (s = buf; (s -> ch); ++s) {
-+    	if (!charisctrl (*s))
-+    	    col += charmemberwidth (*s);
-+	else
-+	    ++col;
-+    }
-+    return (col);
-+}
-+
-+static FlushOut() {
-+    int i, j, x;
-+    static struct charsetmember NewOutputBuf[1000];
-+    struct charsetmember *s;
-+    int NewPendingControls=0, NewPendingOutput = 0;
-+
-+    OutputBuf[PendingOutput].ch = 0;
-+    OutputBuf[PendingOutput].charset = NULL;
-+    if (linepos >= workingright) {
-+        for (i=0, j=0; j<workingright && i < PendingOutput; ++i) {
-+            if (!charisctrl (OutputBuf[i])) ++j;
-+        }
-+	x = folding_point (OutputBuf,i);
-+	if ((workingleft + 4) < x)
-+	    i = x;
-+	else
-+            while (i > workingleft + 4) {
-+                if (!charisctrl (OutputBuf[i])
-+                     && isspace((unsigned char) OutputBuf[i].ch)) {
-+                    break;
-+                }
-+                --i;
-+            }
-+        for (j=0; i<PendingOutput; ++j, ++i) {
-+            NewOutputBuf[j] = OutputBuf[i];
-+            ++NewPendingOutput;
-+            if (charisctrl (NewOutputBuf[j])) ++NewPendingControls;
-+        }
-+        PendingOutput -= NewPendingOutput;
-+        PendingControls -= NewPendingControls;
-+        charmember (&OutputBuf[PendingOutput],(RCHAR)'\n');
-+	PendingOutput++;
-+        OutputBuf[PendingOutput].ch = 0;
-+        OutputBuf[PendingOutput].charset = 0;
-+#ifdef MISTAKE
-+        ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
-+                            highlightbuf, highlightendbuf, 0, StartUnderline,
-+                            StopUnderline, 0, BoldOn, BoldOff, 0);
-+#endif
-+    }
-+    if ((rightjustct > leftjustct)
-+         && (rightjustct > centerct)
-+         && (rightjustct > 0)) {
-+        /* right justified */
-+        i = rightmargin - calc_column (OutputBuf,PendingOutput) 
-+		+ PendingControls;
-+        for (j=0; j<i; ++j)  {
-+            controloutput(MoveRight, 1);
-+        }
-+        fputsmovingright(OutputBuf, stdout);
-+        ++linesused;
-+    } else if ((leftjustct > centerct)
-+                && (leftjustct > 0)) {
-+        /* left justified */
-+        for (s=OutputBuf; s -> ch && isspace((unsigned char) (s -> ch)); ++s)
-+	    {;}
-+        fputsmovingright(s, stdout);
-+        ++linesused;
-+    } else if (centerct > 0) {
-+        /* centered */
-+        i = (termcolumns - calc_column (OutputBuf,PendingOutput) - 1
-+		+ PendingControls) / 2;
-+        for (j=0; j<i; ++j) {
-+            controloutput(MoveRight, 1);
-+        }
-+        fputsmovingright(OutputBuf, stdout);
-+        ++linesused;
-+    } else {
-+        /* Leave indentation (margins) as-is */
-+        fputsmovingright(OutputBuf, stdout);
-+        ++linesused;
-+    }
-+    if (linesused >= termrows && UsePager) Pause();
-+    rightjustct = leftjustct = centerct = 0; /* not quite right for wrapping, sigh... */
-+    PendingOutput = PendingControls = linepos = 0;
-+    inspace = 1;
-+    j = (isspace((unsigned char) NewOutputBuf[0].ch)) ? 1 : 0;
-+    for ( ; j<NewPendingOutput; ++j) {
-+        if (charisctrl (NewOutputBuf[j])) {
-+	    OutputBuf[PendingOutput++] = NewOutputBuf[j];
-+            ++PendingControls;
-+        } else {
-+            realoutputc(NewOutputBuf[j], 1);
-+        }
-+    }
-+    ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
-+                        highlightbuf, highlightendbuf, 0, StartUnderline,
-+                        StopUnderline, 0, BoldOn, BoldOff, 0);
-+}
-+
-+static outputc(c)
-+RCHAR c;
-+{
-+    struct charsetmember member;
-+    charmember (&member,c);
-+    realoutputc(member, 0);
-+}
-+
-+static realoutputc(c, alreadyformatted)
-+struct charsetmember c;
-+int alreadyformatted;
-+{
-+    int i, newinspace;
-+
-+    if (c.ch == '\n') {
-+    	charmember (&OutputBuf[PendingOutput],(RCHAR)'\n');
-+	PendingOutput++;
-+        FlushOut();
-+    } else if (c.ch == '\t') {
-+        int tabpos = (linepos + 8) / 8;
-+        if (tabpos >= workingright) {
-+    	    charmember (&OutputBuf[PendingOutput],(RCHAR)'\n');
-+	    PendingOutput++;
-+            FlushOut();
-+        } else {
-+            int spaces = (8*tabpos) - linepos;
-+            while (spaces-->0) {
-+    	        charmember (&OutputBuf[PendingOutput],(RCHAR)' ');
-+	        PendingOutput++;
-+                ++linepos;
-+            }
-+        }
-+    } else {
-+        newinspace = isspace((unsigned char) c.ch);
-+        if (!inspace || !newinspace || !JustSawCmd) {
-+            if (linepos == 0) {
-+                int i = workingleft;
-+                if (inexcerpt) {
-+    	            charmember (&OutputBuf[PendingOutput],(RCHAR)'>');
-+	            PendingOutput++;
-+                    --i;
-+                }
-+                if (insignature) {
-+    	            charmember (&OutputBuf[PendingOutput],(RCHAR)'+');
-+	            PendingOutput++;
-+                    --i;
-+                }
-+                while (i-->0) {
-+    	            charmember (&OutputBuf[PendingOutput],(RCHAR)' ');
-+	            PendingOutput++;
-+                }
-+                linepos = workingleft;
-+            }
-+            if (!alreadyformatted && biggertext && !(inspace && newinspace)) {
-+    	        charmember (&OutputBuf[PendingOutput],(RCHAR)'_');
-+	        PendingOutput++;
-+                ++linepos;
-+            }
-+            inspace = newinspace;
-+            linepos += charmemberwidth (c);
-+	    OutputBuf[PendingOutput++] = c;
-+	    if (OverStrike && !inspace) {
-+		if (bold) {
-+		    controlputc('\b');
-+		    controlputc((int) c.ch);
-+		}
-+		if (highlight||underline) {
-+		    controlputc('\b');
-+		    controlputc('_');
-+		}
-+	    }
-+            leftjustct += leftjustenv;
-+            rightjustct += rightjustenv;
-+            centerct += centerenv;
-+            if (c.ch == '\014') inspace = 1;
-+            if (linepos >= workingright) FlushOut();
-+        }
-+    }
-+}
-+
-+static MakeWorkingMargins() {
-+    int oldworkingleft=workingleft, i;
-+
-+    workingleft = leftmargin;
-+    workingright = rightmargin;
-+    if (workingleft < 0) workingleft = 0;
-+    if (workingright < 0) workingright = 0;
-+    if (workingright > (termcolumns - 1)) workingright = (termcolumns - 1);
-+    if (workingleft > (workingright - 8)) workingleft = workingright -8;
-+    if (linepos == oldworkingleft && linepos != 0) {
-+        for (i=workingleft-oldworkingleft; i > 0; --i) OUTC(' ');
-+    }
-+}
-+
-+static Pause()
-+{
-+    int	c;
-+
-+    (void) fputs("Press RETURN to continue (or 'q' to quit):\n", stdout);
-+    fflush(stdout);
-+    c = getc(stdin);
-+    if (c == 'q' || c == 'Q') exit(0);
-+    linesused = 0;
-+}
-+
-+/* Leading spaces should be output as MoveRight, to avoid 
-+   having margins that are underlined or reverse video */
-+
-+static fputsmovingright(s, fp)
-+struct charsetmember *s;
-+FILE *fp;
-+{
-+    int inmargin=1;
-+    if (!s) return;
-+    while (s -> ch) {
-+        if (inmargin && (s -> ch) == ' ') {
-+            controloutput(MoveRight, 1);
-+        } else {
-+            if (inmargin) inmargin = 0;
-+	    if (charisctrl (*s))
-+	        (*RichtextPutc) ((int)(s -> ch), fp);
-+	    else
-+	    	charmemberrender (*s, fp);
-+        }
-+        ++s;
-+    }
-+}
-+
-+static ResetTerminalCodes(FakeTerminal, highlight, underline, bold, highlightbuf, highlightendbuf,
-+                    modifiedhighlight, StartUnderline, StopUnderline, modifiedunderline,
-+                    BoldOn, BoldOff, modifiedbold)
-+char *highlightbuf, *highlightendbuf, *StartUnderline, *StopUnderline,
-+    *BoldOn, *BoldOff;
-+{
-+    if (OverStrike)
-+	return;
-+
-+    /* We always turn back on the appropriate terminal modes, because
-+      on some terminals one thing turns off all of them */
-+    if (highlight >= 1) {
-+        if (FakeTerminal) {
-+            if (modifiedhighlight && highlight == 1) outputstr(highlightbuf);
-+        } else controloutput(highlightbuf, 0);
-+    }
-+    if (bold >= 1) {
-+        if (FakeTerminal) {
-+            if (modifiedbold && bold == 1) outputstr(BoldOn);
-+        } else controloutput(BoldOn, 0);
-+    }
-+    if (underline >= 1) {
-+        if (FakeTerminal) {
-+            if (modifiedunderline && underline == 1) outputstr(StartUnderline);
-+        } else controloutput(StartUnderline, 0);
-+    }
-+}
-+
-+static FinalizeTerminal() {
-+    tputs(highlightendbuf, 1, immediate_controlputc);
-+    tputs(BoldOff, 1, immediate_controlputc);
-+    tputs(StopUnderline, 1, immediate_controlputc);
-+    FPUTS(KE, stdout);
-+}
-+
-+static outputstr(s)
-+char *s;
-+{
-+    while (*s) OUTC(*s++);
-+}
-+
-+static FPUTS(s,fp)
-+unsigned char *s;
-+FILE *fp;
-+{
-+    while(*s) (*RichtextPutc)((int)(*s++),fp);
-+}
-+
-+static lc2strcmp(s1, s2)
-+char *s1, *s2;
-+{
-+    if (!s1 || !s2) return (-1);
-+    while (*s1 && *s2) {
-+	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
-+	++s1; ++s2;
-+    }
-+    return((*s1 == *s2) ? 0 : -1);
-+}
-+
-+static lc2strncmp(s1, s2, len)
-+char *s1, *s2;
-+int len;
-+{
-+    if (!s1 || !s2) return (-1);
-+    while (*s1 && *s2 && len > 0) {
-+	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
-+	++s1; ++s2; --len;
-+    }
-+    if (len <= 0) return(0);
-+    return((*s1 == *s2) ? 0 : -1);
-+}
---- metamail-2.7.orig/src/richmail/richset.c
-+++ metamail-2.7/src/richmail/richset.c
-@@ -0,0 +1,222 @@
-+/*-------------------------------------------------------------------------
-+
-+  richset.c - Handling for different character sets in richtext.
-+ 
-+  Copyright (c) 1992 Rhys Weatherley
-+
-+  Permission to use, copy, modify, and distribute this material
-+  for any purpose and without fee is hereby granted, provided
-+  that the above copyright notice and this permission notice
-+  appear in all copies, and that the name of Rhys Weatherley not be
-+  used in advertising or publicity pertaining to this
-+  material without specific, prior written permission.
-+  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
-+  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
-+  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+  Revision History:
-+  ================
-+
-+   Version  DD/MM/YY  By  Description
-+   -------  --------  --  --------------------------------------
-+     1.0    21/06/92  RW  Original Version of richset.c
-+
-+  You may contact the author by:
-+  =============================
-+
-+   e-mail: rhys@cs.uq.oz.au
-+     mail: Rhys Weatherley
-+	   5 Horizon Drive
-+	   Jamboree Heights
-+	   Queensland 4074
-+	   Australia
-+
-+-------------------------------------------------------------------------*/
-+
-+#include <metamail/common.h>
-+
-+#include "richlex.h"
-+#include "richset.h"
-+
-+/*
-+ * Define a list of all character set processors in memory.
-+ */
-+static	struct	charsetproc	*CharacterSets[] =
-+	  {&usascii_charset,
-+	   &iso2022_charset,
-+	   NULL};
-+
-+/*
-+ * Global data for this module.
-+ */
-+#define	MAX_CHAR_SETS	100
-+static	int	NumCharSets=0;
-+static	struct	charsetproc	*CharSets[MAX_CHAR_SETS];
-+static	int	CharEncStack[MAX_CHAR_SETS];
-+
-+/*
-+ * Initialise the stack of character set processors, starting with
-+ * a particular base processor.  The initialisation function of all
-+ * character set processors is called.
-+ */
-+charsetinit (charset,name)
-+struct	charsetproc *charset;
-+char	*name;
-+{
-+    int temp = 0;
-+    CharSets[0] = charset;
-+    NumCharSets = 1;
-+    while (CharacterSets[temp]) {
-+        (*(CharacterSets[temp] -> init))
-+		((CharacterSets[temp] == charset ? name : NULL));
-+	++temp;
-+    }
-+}
-+
-+/*
-+ * Initialise the stack, starting with a character set processor with
-+ * a particular name.
-+ */
-+charsetnameinit	(name)
-+char	*name;
-+{
-+    int temp = 0;
-+    int succeed = 0;
-+    char *temp1,*temp2;
-+    struct charsetproc *charset = &usascii_charset;
-+    while (!succeed && CharacterSets[temp]) {
-+	temp2 = CharacterSets[temp] -> names;
-+	while (!succeed && *temp2) {
-+	    temp1 = name;
-+	    while (*temp1 && *temp2 && *temp2 != ':' && *temp2 == *temp1) {
-+		++temp1;
-+		++temp2;
-+	    }
-+	    if (*temp1 == '\0' && (*temp2 == '\0' || *temp2 == ':')) {
-+		succeed = 1;
-+		charset = CharacterSets[temp];
-+	    }
-+	    while (*temp2 && *temp2 != ':') {
-+		++temp2;
-+	    }
-+	    if (*temp2 == ':') {
-+		++temp2;
-+	    }
-+	}
-+	++temp;
-+    }
-+    charsetinit (charset,name);
-+}
-+
-+/*
-+ * Push a new character set processor onto the stack.
-+ */
-+charsetpush (charset)
-+struct	charsetproc *charset;
-+{
-+    if (NumCharSets >= MAX_CHAR_SETS) {
-+    	fprintf (stderr,"Too many nested character sets: aborting\n");
-+	exit (1);
-+    } else {
-+	CharEncStack[NumCharSets - 1] = RichtextCharEncoding;
-+	(*(CharSets[NumCharSets - 1] -> encoding)) (-1); /* Leave current */
-+    	CharSets[NumCharSets++] = charset;
-+    }
-+}
-+
-+/*
-+ * Pop the top-most character set processor off the stack
-+ * if it matches the given processor.  Note: the base
-+ * processor is never popped off.
-+ */
-+charsetpop (charset)
-+struct	charsetproc *charset;
-+{
-+    if (NumCharSets > 1 && CharSets[NumCharSets - 1] == charset) {
-+        --NumCharSets;
-+	richtextencoding (CharEncStack[NumCharSets - 1]);
-+	(*(CharSets[NumCharSets - 1] -> encoding)) (RichtextCharEncoding);
-+    }
-+}
-+
-+/*
-+ * See if the character set processor on the top of the stack
-+ * matches the given processor.
-+ */
-+int	charsettop (charset)
-+struct	charsetproc *charset;
-+{
-+    if (NumCharSets > 1) {
-+	return (CharSets[NumCharSets - 1] == charset);
-+    } else {
-+	return (0);
-+    }
-+}
-+
-+/*
-+ * Set the details for a character set member in the top-most
-+ * character set.
-+ */
-+charmember (member,ch)
-+struct	charsetmember *member;
-+RCHAR	ch;
-+{
-+    member -> ch = ch;
-+    member -> charset = CharSets[NumCharSets - 1];
-+}
-+
-+/*
-+ * Set the details for a member of a specific character set.
-+ */
-+charmemberspec (member,ch,charset)
-+struct	charsetmember *member;
-+RCHAR	ch;
-+struct	charsetproc *charset;
-+{
-+    member -> ch = ch;
-+    member -> charset = charset;
-+}
-+
-+/*
-+ * Set the details for a output control code character.
-+ */
-+charmemberctrl (member,ch)
-+struct	charsetmember *member;
-+RCHAR	ch;
-+{
-+    member -> ch = ch;
-+    member -> charset = NULL;
-+}
-+
-+/*
-+ * Attempt to process a richtext command by passing it to the
-+ * "command" function of all character set processors.  Returns
-+ * zero if the command was not processed.
-+ */
-+int	charsetcommand (token,negated)
-+char	*token;
-+int	negated;
-+{
-+    int temp = 0;
-+    while (CharacterSets[temp]) {
-+    	if ((*(CharacterSets[temp] -> command)) (token,negated))
-+	    return (1);
-+	++temp;
-+    }
-+    return (0);
-+}
-+
-+/*
-+ * Test for an extension singleton command.
-+ */
-+int	charsetsingle (token)
-+char	*token;
-+{
-+    int temp = 0;
-+    while (CharacterSets[temp]) {
-+    	if ((*(CharacterSets[temp] -> single)) (token))
-+	    return (1);
-+	++temp;
-+    }
-+    return (0);
-+}
---- metamail-2.7.orig/src/richmail/richset.h
-+++ metamail-2.7/src/richmail/richset.h
-@@ -0,0 +1,172 @@
-+/*-------------------------------------------------------------------------
-+
-+  richset.h - Handling for different character sets in richtext.
-+ 
-+  Copyright (c) 1992 Rhys Weatherley
-+
-+  Permission to use, copy, modify, and distribute this material
-+  for any purpose and without fee is hereby granted, provided
-+  that the above copyright notice and this permission notice
-+  appear in all copies, and that the name of Rhys Weatherley not be
-+  used in advertising or publicity pertaining to this
-+  material without specific, prior written permission.
-+  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
-+  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
-+  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+
-+  Revision History:
-+  ================
-+
-+   Version  DD/MM/YY  By  Description
-+   -------  --------  --  --------------------------------------
-+     1.0    19/06/92  RW  Original Version of richset.h
-+
-+  You may contact the author by:
-+  =============================
-+
-+   e-mail: rhys@cs.uq.oz.au
-+     mail: Rhys Weatherley
-+	   5 Horizon Drive
-+	   Jamboree Heights
-+	   Queensland 4074
-+	   Australia
-+
-+-------------------------------------------------------------------------*/
-+
-+#ifndef	__RICHSET_H__
-+#define	__RICHSET_H__
-+
-+#include <metamail/common.h>
-+
-+BEGIN_C_DECLS
-+
-+/*
-+ * Define the interface structure for a character set processor.
-+ * The fields are as follows:
-+ *
-+ *	names	- Colon-separated list of character set names.
-+ *	init	- Initialize the character set processor.
-+ *	command	- Process a command before the default processing.
-+ *		  Returns non-zero if processed, zero if not.
-+ *	single	- Should return non-zero for a singleton command.
-+ *	width	- Get the width in terminal characters of the character.
-+ *	fold	- Returns non-zero if the character can be folded at.
-+ *	render	- Render the character through RichtextPutc.
-+ *	encoding- Enter or leave an encoding. newenc is -1 to leave.
-+ *
-+ */
-+struct	charsetproc
-+		{
-+		    char *names;
-+		    int (*init) ( /* char *name */ );
-+		    int (*command) ( /* char *token, int negated */ );
-+		    int (*single) ( /* char *token */ );
-+		    int (*width) ( /* RCHAR c */ );
-+		    int (*fold) ( /* RCHAR c */ );
-+		    int (*render) ( /* RCHAR c, void *param */ );
-+		    int (*encoding) ( /* int newenc */ );
-+		};
-+
-+/*
-+ * Define some standard character set processors.
-+ */
-+extern	struct 	charsetproc	usascii_charset;
-+extern	struct	charsetproc	iso2022_charset;
-+
-+/*
-+ * Define the information to be kept in the internal buffers
-+ * about a character.  If "charset" is NULL, it is a control
-+ * character.
-+ */
-+struct	charsetmember
-+		{
-+		    RCHAR ch;			 /* The character itself */
-+		    struct charsetproc *charset; /* Character set of ch */
-+		};
-+
-+/*
-+ * Initialise the stack of character set processors, starting with
-+ * a particular base processor.  The initialisation function of all
-+ * character set processors is called.
-+ */
-+extern	charsetinit	( /* struct charsetproc *charset, char *name */ );
-+
-+/*
-+ * Initialise the stack, starting with a character set processor with
-+ * a particular name.
-+ */
-+extern	charsetnameinit	( /* char *name */ );
-+
-+/*
-+ * Push a new character set processor onto the stack.
-+ */
-+extern	charsetpush	( /* struct charsetproc *charset */ );
-+
-+/*
-+ * Pop the top-most character set processor off the stack
-+ * if it matches the given processor.  Note: the base
-+ * processor is never popped off.
-+ */
-+extern	charsetpop	( /* struct charsetproc *charset */ );
-+
-+/*
-+ * See if the character set processor on the top of the stack
-+ * matches the given processor.
-+ */
-+extern	int	charsettop ( /* struct charsetproc *charset */ );
-+
-+/*
-+ * Set the details for a character set member in the top-most
-+ * character set.
-+ */
-+extern	charmember	( /* struct charsetmember *member, RCHAR ch */ );
-+
-+/*
-+ * Set the details for a member of a specific character set.
-+ */
-+extern	charmemberspec	( /* struct charsetmember *member, RCHAR ch,
-+			     struct charset *charset */ );
-+
-+/*
-+ * Set the details for a output control code character.
-+ */
-+extern	charmemberctrl	( /* struct charsetmember *member, RCHAR ch */ );
-+
-+/*
-+ * Determine if the given character is a control code character.
-+ */
-+#define	charisctrl(member)	((member).charset == (struct charsetproc *)0)
-+
-+/*
-+ * Attempt to process a richtext command by passing it to the
-+ * "command" function of all character set processors.  Returns
-+ * zero if the command was not processed.
-+ */
-+extern	int	charsetcommand	( /* char *token, int negated */ );
-+
-+/*
-+ * Test for an extension singleton command.
-+ */
-+extern	int	charsetsingle	( /* char *token */ );
-+
-+/*
-+ * Get the width of a particular character.
-+ */
-+#define	charmemberwidth(member) \
-+		((*((member).charset -> width)) ((member).ch))
-+
-+/*
-+ * Determine if a character can be folded at.
-+ */
-+#define	charmemberfold(member) \
-+		((*((member).charset -> fold)) ((member).ch))
-+
-+/*
-+ * Render a character on an output stream.
-+ */
-+#define	charmemberrender(member,param) \
-+		((*((member).charset -> render)) ((member).ch,param))
-+
-+END_C_DECLS
-+
-+#endif	/* __RICHSET_H__ */
---- metamail-2.7.orig/src/richmail/richtoatk.c
-+++ metamail-2.7/src/richmail/richtoatk.c
-@@ -0,0 +1,98 @@
-+/*
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+*/
-+#include <metamail/common.h>
-+
-+#include "richlex.h"
-+
-+char *translate(t)
-+char *t;
-+{
-+    if (!strcmp(t, "fixed")) return("typewriter");
-+    if (!strcmp(t, "excerpt")) return("quotation");
-+    /* Really ought to handle ISO-10646 and ISO-8859-X somehow */
-+    return(t);
-+}
-+
-+main() {
-+    RCHAR c;
-+    int i, JustDidNewline = 0;
-+    char tok[MAX_TOKEN_SIZE + 1],*token;
-+
-+    fputs("\\begindata{text, 42}\n\\template{messages}\n", stdout);
-+    /* The 0, 0 means that we're not implementing text/enriched */
-+    while((c = richtextlex(stdin,tok + 1, 0, 0)) != (RCHAR)EOF) {
-+	if (c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND) {
-+	    if (c == RICHTEXT_NEG_COMMAND) {
-+		tok[0] = '/';
-+		token = tok;
-+	    } else
-+		token = tok + 1;
-+            if (!strcmp(token, "lt")) {
-+                putc('<', stdout);
-+                JustDidNewline = 0;
-+            } else if (!strcmp(token, "nl")) {
-+                fputs(JustDidNewline ? "\n" : "\n\n", stdout);
-+                JustDidNewline = 1;
-+            } else if (!strcmp(token, "/paragraph")) {
-+                fputs(JustDidNewline ? "\n\n" : "\n\n\n", stdout);
-+                JustDidNewline = 1;
-+            } else if (!strcmp(token, "comment")) {
-+	        int tempc;
-+                while (strcmp(token, "/comment")) {
-+                    while ((tempc = getc(stdin)) != '<') ;
-+                    for (i=0; (tempc = getc(stdin)) != '>'; ++i) {
-+                        token[i] = isupper(tempc) ? tolower(tempc) : tempc;
-+                    }
-+                    token[i] = '\0';
-+                }
-+            } else if (!ignoretoken(token)) {
-+                if (token[0] == '/') {
-+                    putc('}', stdout);
-+                } else {
-+                    fprintf(stdout, "\\%s{", translate(token));
-+                    JustDidNewline = 0;
-+                }
-+            }
-+        } else if (c == '\n') {
-+            putc(' ', stdout);
-+            JustDidNewline = 0;
-+        } else {
-+            putc((int)c, stdout);
-+            JustDidNewline = 0;
-+        }
-+    }
-+    fputs("\n \n\\enddata{text, 42}\n", stdout);
-+}
-+
-+ignoretoken(t)
-+char *t;
-+{
-+    if (*t == '/') ++t;
-+    if (!strcmp(t, "us-ascii")) return(1);
-+    if (!strcmp(t, "paragraph")) return(1); /* handled otherwise */
-+    if (!strcmp(t, "no-op")) return(1);
-+    return(0);
-+}
-+
-+controlputc(c)
-+int c;
-+{
-+}
-+
-+controloutput(s, immediate)
-+char *s;
-+int immediate;
-+{
-+}
---- metamail-2.7.orig/replace/vfprintf.c
-+++ metamail-2.7/replace/vfprintf.c
-@@ -0,0 +1,43 @@
-+/* vfprintf.c -- implement vfprintf() for architectures without it
-+   Copyright (C) 2000 Gary V. Vaughan
-+  
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+  
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+  
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#if HAVE_STDARG_H && !HAVE_VARARGS_H
-+#  include <stdarg.h>
-+#else /*!HAVE_STDARG_H || HAVE_VARARGS_H*/
-+#  include <varargs.h>
-+#endif /*HAVE_STDARG_H && !HAVE_VARARGS_H*/
-+
-+/* Some systems define this! */
-+#undef vfprintf
-+
-+extern int _doprnt ();
-+
-+int
-+vfprintf (file, format, ap)
-+     FILE *file;
-+     const char *format;
-+     va_list ap;
-+{
-+   return _doprnt (format, ap, file);
-+}
---- metamail-2.7.orig/replace/basename.c
-+++ metamail-2.7/replace/basename.c
-@@ -0,0 +1,45 @@
-+/* basename.c -- implement basename() for architectures without it
-+   Copyright (C) 2000 Gary V. Vaughan
-+  
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+  
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+  
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#if HAVE_STRING_H
-+#  include <string.h>
-+#elif HAVE_STRINGS_H
-+#  include <strings.h>
-+#endif
-+
-+#if !HAVE_STRRCHR
-+#  ifndef strrchr
-+#    define strrchr rindex
-+#  endif
-+#endif
-+
-+char*
-+basename (path)
-+     char *path;
-+{
-+  /* Search for the last directory separator in PATH.  */
-+  char *basename = strrchr (path, '/');
-+  
-+  /* If found, return the address of the following character,
-+     or the start of the parameter passed in.  */
-+  return basename ? ++basename : (char*)path;
-+}
-+
---- metamail-2.7.orig/replace/putenv.c
-+++ metamail-2.7/replace/putenv.c
-@@ -0,0 +1,100 @@
-+/* Copyright (C) 1991 Free Software Foundation, Inc.
-+This file is part of the GNU C Library.
-+
-+The GNU C Library is free software; you can redistribute it and/or
-+modify it under the terms of the GNU Library General Public License as
-+published by the Free Software Foundation; either version 2 of the
-+License, or (at your option) any later version.
-+
-+The GNU C Library is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+Library General Public License for more details.
-+
-+You should have received a copy of the GNU Library General Public
-+License along with the GNU C Library; see the file COPYING.LIB.  If
-+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-+Cambridge, MA 02139, USA.  */
-+
-+#include <config.h>
-+#include <sys/types.h>
-+#include <errno.h>
-+#ifdef STDC_HEADERS
-+#include <stdlib.h>
-+#else
-+extern int errno;
-+#endif
-+
-+#if defined(STDC_HEADERS) || defined(USG) || defined(SYSV)
-+#include <string.h>
-+#else /* not (STDC_HEADERS or USG) */
-+#include <strings.h>
-+#endif /* STDC_HEADERS or USG */
-+
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#ifndef NULL
-+#define NULL 0
-+#endif
-+
-+#if !__STDC__
-+#define const
-+#endif
-+
-+extern char **environ;
-+
-+/* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
-+int
-+putenv (string)
-+     const char *string;
-+{
-+  char *name_end = index (string, '=');
-+  register size_t size;
-+  register char **ep;
-+
-+  if (name_end == NULL)
-+    {
-+      /* Remove the variable from the environment.  */
-+      size = strlen (string);
-+      for (ep = environ; *ep != NULL; ++ep)
-+	if (!strncmp (*ep, string, size) && (*ep)[size] == '=')
-+	  {
-+	    while (ep[1] != NULL)
-+	      {
-+		ep[0] = ep[1];
-+		++ep;
-+	      }
-+	    *ep = NULL;
-+	    return 0;
-+	  }
-+    }
-+
-+  size = 0;
-+  for (ep = environ; *ep != NULL; ++ep)
-+    if (!strncmp (*ep, string, name_end - string) &&
-+	(*ep)[name_end - string] == '=')
-+      break;
-+    else
-+      ++size;
-+
-+  if (*ep == NULL)
-+    {
-+      static char **last_environ = NULL;
-+      char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
-+      if (new_environ == NULL)
-+	return -1;
-+      (void) bcopy ((char *) environ, (char *) new_environ, size * sizeof (char *));
-+      new_environ[size] = (char *) string;
-+      new_environ[size + 1] = NULL;
-+      if (last_environ != NULL)
-+	free ((char *) last_environ);
-+      last_environ = new_environ;
-+      environ = new_environ;
-+    }
-+  else
-+    *ep = (char *) string;
-+
-+  return 0;
-+}
---- metamail-2.7.orig/replace/Makefile.am
-+++ metamail-2.7/replace/Makefile.am
-@@ -0,0 +1,9 @@
-+## Makefile.am -- Process this file with automake to produce Makefile.in
-+
-+MAINTAINERCLEANFILES	= Makefile.in
-+
-+INCLUDES		=  -I$(top_builddir) -I$(top_srcdir)
-+
-+noinst_LTLIBRARIES	= libreplace.la
-+libreplace_la_SOURCES	= 
-+libreplace_la_LIBADD	= @LTLIBOBJS@
---- metamail-2.7.orig/replace/Makefile.in
-+++ metamail-2.7/replace/Makefile.in
-@@ -0,0 +1,343 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+MAINTAINERCLEANFILES = Makefile.in
-+
-+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-+
-+noinst_LTLIBRARIES = libreplace.la
-+libreplace_la_SOURCES = 
-+libreplace_la_LIBADD = @LTLIBOBJS@
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = ../metamail/config.h
-+CONFIG_CLEAN_FILES = 
-+LTLIBRARIES =  $(noinst_LTLIBRARIES)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir) -I../metamail
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
-+libreplace_la_LDFLAGS = 
-+libreplace_la_DEPENDENCIES =  @LTLIBOBJS@
-+libreplace_la_OBJECTS = 
-+CFLAGS = @CFLAGS@
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON =  Makefile.am Makefile.in basename.c putenv.c strerror.c \
-+vfprintf.c
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+DEP_FILES =  .deps/basename.P .deps/putenv.P .deps/strerror.P \
-+.deps/vfprintf.P
-+SOURCES = $(libreplace_la_SOURCES)
-+OBJECTS = $(libreplace_la_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .lo .o .obj .s
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign replace/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+mostlyclean-noinstLTLIBRARIES:
-+
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+
-+distclean-noinstLTLIBRARIES:
-+
-+maintainer-clean-noinstLTLIBRARIES:
-+
-+# FIXME: We should only use cygpath when building on Windows,
-+# and only if it is available.
-+.c.obj:
-+	$(COMPILE) -c `cygpath -w $<`
-+
-+.s.o:
-+	$(COMPILE) -c $<
-+
-+.S.o:
-+	$(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+	-rm -f *.o core *.core
-+	-rm -f *.$(OBJEXT)
-+
-+clean-compile:
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+.s.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+.S.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+
-+maintainer-clean-libtool:
-+
-+libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES)
-+	$(LINK)  $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = replace
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign replace/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am:
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am:
-+uninstall: uninstall-am
-+all-am: Makefile $(LTLIBRARIES)
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
-+		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-+		mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
-+		clean-tags clean-depend clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
-+		distclean-libtool distclean-tags distclean-depend \
-+		distclean-generic clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
-+		maintainer-clean-compile maintainer-clean-libtool \
-+		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-+clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
-+mostlyclean-compile distclean-compile clean-compile \
-+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-+distclean-tags clean-tags maintainer-clean-tags distdir \
-+mostlyclean-depend distclean-depend clean-depend \
-+maintainer-clean-depend info-am info dvi-am dvi check check-am \
-+installcheck-am installcheck install-exec-am install-exec \
-+install-data-am install-data install-am install uninstall-am uninstall \
-+all-redirect all-am all installdirs mostlyclean-generic \
-+distclean-generic clean-generic maintainer-clean-generic clean \
-+mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/replace/strerror.c
-+++ metamail-2.7/replace/strerror.c
-@@ -0,0 +1,610 @@
-+/* strerror.c -- implement strerror() for architectures without it
-+   Written by Fred Fish.  fnf@cygnus.com
-+   This file is in the public domain.  --Per Bothner.
-+*/
-+
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#ifdef HAVE_SYS_ERRLIST
-+/* Note that errno.h (not sure what OS) or stdio.h (BSD 4.4, at least)
-+   might declare sys_errlist in a way that the compiler might consider
-+   incompatible with our later declaration, perhaps by using const
-+   attributes.  So we hide the declaration in errno.h (if any) using a
-+   macro. */
-+#define sys_errlist no_such_symbol
-+#endif
-+
-+#include <stdio.h>
-+
-+#if HAVE_ERRNO_H
-+#  include <errno.h>
-+#endif
-+
-+#ifdef HAVE_SYS_ERRLIST
-+#  undef sys_errlist
-+#endif
-+
-+/*  Routines imported from standard C runtime libraries. */
-+
-+#ifdef __STDC__
-+#include <stddef.h>
-+extern void *malloc (size_t size);				/* 4.10.3.3 */
-+extern void *memset (void *s, int c, size_t n);			/* 4.11.6.1 */
-+#else	/* !__STDC__ */
-+extern char *malloc ();		/* Standard memory allocater */
-+extern char *memset ();
-+#endif	/* __STDC__ */
-+
-+#ifndef MAX
-+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
-+#endif
-+
-+/* Translation table for errno values.  See intro(2) in most UNIX systems
-+   Programmers Reference Manuals.
-+
-+   Note that this table is generally only accessed when it is used at runtime
-+   to initialize errno name and message tables that are indexed by errno
-+   value.
-+
-+   Not all of these errnos will exist on all systems.  This table is the only
-+   thing that should have to be updated as new error numbers are introduced.
-+   It's sort of ugly, but at least its portable. */
-+
-+struct error_info
-+{
-+  int value;		/* The numeric value from <errno.h> */
-+  const char *name;	/* The equivalent symbolic value */
-+#ifndef HAVE_SYS_ERRLIST
-+  const char *msg;	/* Short message about this value */
-+#endif
-+};
-+
-+#ifndef HAVE_SYS_ERRLIST
-+#   define ENTRY(value, name, msg)	{value, name, msg}
-+#else
-+#   define ENTRY(value, name, msg)	{value, name}
-+#endif
-+
-+static const struct error_info error_table[] =
-+{
-+#if defined (EPERM)
-+  ENTRY(EPERM, "EPERM", "Not owner"),
-+#endif
-+#if defined (ENOENT)
-+  ENTRY(ENOENT, "ENOENT", "No such file or directory"),
-+#endif
-+#if defined (ESRCH)
-+  ENTRY(ESRCH, "ESRCH", "No such process"),
-+#endif
-+#if defined (EINTR)
-+  ENTRY(EINTR, "EINTR", "Interrupted system call"),
-+#endif
-+#if defined (EIO)
-+  ENTRY(EIO, "EIO", "I/O error"),
-+#endif
-+#if defined (ENXIO)
-+  ENTRY(ENXIO, "ENXIO", "No such device or address"),
-+#endif
-+#if defined (E2BIG)
-+  ENTRY(E2BIG, "E2BIG", "Arg list too long"),
-+#endif
-+#if defined (ENOEXEC)
-+  ENTRY(ENOEXEC, "ENOEXEC", "Exec format error"),
-+#endif
-+#if defined (EBADF)
-+  ENTRY(EBADF, "EBADF", "Bad file number"),
-+#endif
-+#if defined (ECHILD)
-+  ENTRY(ECHILD, "ECHILD", "No child processes"),
-+#endif
-+#if defined (EWOULDBLOCK)	/* Put before EAGAIN, sometimes aliased */
-+  ENTRY(EWOULDBLOCK, "EWOULDBLOCK", "Operation would block"),
-+#endif
-+#if defined (EAGAIN)
-+  ENTRY(EAGAIN, "EAGAIN", "No more processes"),
-+#endif
-+#if defined (ENOMEM)
-+  ENTRY(ENOMEM, "ENOMEM", "Not enough space"),
-+#endif
-+#if defined (EACCES)
-+  ENTRY(EACCES, "EACCES", "Permission denied"),
-+#endif
-+#if defined (EFAULT)
-+  ENTRY(EFAULT, "EFAULT", "Bad address"),
-+#endif
-+#if defined (ENOTBLK)
-+  ENTRY(ENOTBLK, "ENOTBLK", "Block device required"),
-+#endif
-+#if defined (EBUSY)
-+  ENTRY(EBUSY, "EBUSY", "Device busy"),
-+#endif
-+#if defined (EEXIST)
-+  ENTRY(EEXIST, "EEXIST", "File exists"),
-+#endif
-+#if defined (EXDEV)
-+  ENTRY(EXDEV, "EXDEV", "Cross-device link"),
-+#endif
-+#if defined (ENODEV)
-+  ENTRY(ENODEV, "ENODEV", "No such device"),
-+#endif
-+#if defined (ENOTDIR)
-+  ENTRY(ENOTDIR, "ENOTDIR", "Not a directory"),
-+#endif
-+#if defined (EISDIR)
-+  ENTRY(EISDIR, "EISDIR", "Is a directory"),
-+#endif
-+#if defined (EINVAL)
-+  ENTRY(EINVAL, "EINVAL", "Invalid argument"),
-+#endif
-+#if defined (ENFILE)
-+  ENTRY(ENFILE, "ENFILE", "File table overflow"),
-+#endif
-+#if defined (EMFILE)
-+  ENTRY(EMFILE, "EMFILE", "Too many open files"),
-+#endif
-+#if defined (ENOTTY)
-+  ENTRY(ENOTTY, "ENOTTY", "Not a typewriter"),
-+#endif
-+#if defined (ETXTBSY)
-+  ENTRY(ETXTBSY, "ETXTBSY", "Text file busy"),
-+#endif
-+#if defined (EFBIG)
-+  ENTRY(EFBIG, "EFBIG", "File too large"),
-+#endif
-+#if defined (ENOSPC)
-+  ENTRY(ENOSPC, "ENOSPC", "No space left on device"),
-+#endif
-+#if defined (ESPIPE)
-+  ENTRY(ESPIPE, "ESPIPE", "Illegal seek"),
-+#endif
-+#if defined (EROFS)
-+  ENTRY(EROFS, "EROFS", "Read-only file system"),
-+#endif
-+#if defined (EMLINK)
-+  ENTRY(EMLINK, "EMLINK", "Too many links"),
-+#endif
-+#if defined (EPIPE)
-+  ENTRY(EPIPE, "EPIPE", "Broken pipe"),
-+#endif
-+#if defined (EDOM)
-+  ENTRY(EDOM, "EDOM", "Math argument out of domain of func"),
-+#endif
-+#if defined (ERANGE)
-+  ENTRY(ERANGE, "ERANGE", "Math result not representable"),
-+#endif
-+#if defined (ENOMSG)
-+  ENTRY(ENOMSG, "ENOMSG", "No message of desired type"),
-+#endif
-+#if defined (EIDRM)
-+  ENTRY(EIDRM, "EIDRM", "Identifier removed"),
-+#endif
-+#if defined (ECHRNG)
-+  ENTRY(ECHRNG, "ECHRNG", "Channel number out of range"),
-+#endif
-+#if defined (EL2NSYNC)
-+  ENTRY(EL2NSYNC, "EL2NSYNC", "Level 2 not synchronized"),
-+#endif
-+#if defined (EL3HLT)
-+  ENTRY(EL3HLT, "EL3HLT", "Level 3 halted"),
-+#endif
-+#if defined (EL3RST)
-+  ENTRY(EL3RST, "EL3RST", "Level 3 reset"),
-+#endif
-+#if defined (ELNRNG)
-+  ENTRY(ELNRNG, "ELNRNG", "Link number out of range"),
-+#endif
-+#if defined (EUNATCH)
-+  ENTRY(EUNATCH, "EUNATCH", "Protocol driver not attached"),
-+#endif
-+#if defined (ENOCSI)
-+  ENTRY(ENOCSI, "ENOCSI", "No CSI structure available"),
-+#endif
-+#if defined (EL2HLT)
-+  ENTRY(EL2HLT, "EL2HLT", "Level 2 halted"),
-+#endif
-+#if defined (EDEADLK)
-+  ENTRY(EDEADLK, "EDEADLK", "Deadlock condition"),
-+#endif
-+#if defined (ENOLCK)
-+  ENTRY(ENOLCK, "ENOLCK", "No record locks available"),
-+#endif
-+#if defined (EBADE)
-+  ENTRY(EBADE, "EBADE", "Invalid exchange"),
-+#endif
-+#if defined (EBADR)
-+  ENTRY(EBADR, "EBADR", "Invalid request descriptor"),
-+#endif
-+#if defined (EXFULL)
-+  ENTRY(EXFULL, "EXFULL", "Exchange full"),
-+#endif
-+#if defined (ENOANO)
-+  ENTRY(ENOANO, "ENOANO", "No anode"),
-+#endif
-+#if defined (EBADRQC)
-+  ENTRY(EBADRQC, "EBADRQC", "Invalid request code"),
-+#endif
-+#if defined (EBADSLT)
-+  ENTRY(EBADSLT, "EBADSLT", "Invalid slot"),
-+#endif
-+#if defined (EDEADLOCK)
-+  ENTRY(EDEADLOCK, "EDEADLOCK", "File locking deadlock error"),
-+#endif
-+#if defined (EBFONT)
-+  ENTRY(EBFONT, "EBFONT", "Bad font file format"),
-+#endif
-+#if defined (ENOSTR)
-+  ENTRY(ENOSTR, "ENOSTR", "Device not a stream"),
-+#endif
-+#if defined (ENODATA)
-+  ENTRY(ENODATA, "ENODATA", "No data available"),
-+#endif
-+#if defined (ETIME)
-+  ENTRY(ETIME, "ETIME", "Timer expired"),
-+#endif
-+#if defined (ENOSR)
-+  ENTRY(ENOSR, "ENOSR", "Out of streams resources"),
-+#endif
-+#if defined (ENONET)
-+  ENTRY(ENONET, "ENONET", "Machine is not on the network"),
-+#endif
-+#if defined (ENOPKG)
-+  ENTRY(ENOPKG, "ENOPKG", "Package not installed"),
-+#endif
-+#if defined (EREMOTE)
-+  ENTRY(EREMOTE, "EREMOTE", "Object is remote"),
-+#endif
-+#if defined (ENOLINK)
-+  ENTRY(ENOLINK, "ENOLINK", "Link has been severed"),
-+#endif
-+#if defined (EADV)
-+  ENTRY(EADV, "EADV", "Advertise error"),
-+#endif
-+#if defined (ESRMNT)
-+  ENTRY(ESRMNT, "ESRMNT", "Srmount error"),
-+#endif
-+#if defined (ECOMM)
-+  ENTRY(ECOMM, "ECOMM", "Communication error on send"),
-+#endif
-+#if defined (EPROTO)
-+  ENTRY(EPROTO, "EPROTO", "Protocol error"),
-+#endif
-+#if defined (EMULTIHOP)
-+  ENTRY(EMULTIHOP, "EMULTIHOP", "Multihop attempted"),
-+#endif
-+#if defined (EDOTDOT)
-+  ENTRY(EDOTDOT, "EDOTDOT", "RFS specific error"),
-+#endif
-+#if defined (EBADMSG)
-+  ENTRY(EBADMSG, "EBADMSG", "Not a data message"),
-+#endif
-+#if defined (ENAMETOOLONG)
-+  ENTRY(ENAMETOOLONG, "ENAMETOOLONG", "File name too long"),
-+#endif
-+#if defined (EOVERFLOW)
-+  ENTRY(EOVERFLOW, "EOVERFLOW", "Value too large for defined data type"),
-+#endif
-+#if defined (ENOTUNIQ)
-+  ENTRY(ENOTUNIQ, "ENOTUNIQ", "Name not unique on network"),
-+#endif
-+#if defined (EBADFD)
-+  ENTRY(EBADFD, "EBADFD", "File descriptor in bad state"),
-+#endif
-+#if defined (EREMCHG)
-+  ENTRY(EREMCHG, "EREMCHG", "Remote address changed"),
-+#endif
-+#if defined (ELIBACC)
-+  ENTRY(ELIBACC, "ELIBACC", "Can not access a needed shared library"),
-+#endif
-+#if defined (ELIBBAD)
-+  ENTRY(ELIBBAD, "ELIBBAD", "Accessing a corrupted shared library"),
-+#endif
-+#if defined (ELIBSCN)
-+  ENTRY(ELIBSCN, "ELIBSCN", ".lib section in a.out corrupted"),
-+#endif
-+#if defined (ELIBMAX)
-+  ENTRY(ELIBMAX, "ELIBMAX", "Attempting to link in too many shared libraries"),
-+#endif
-+#if defined (ELIBEXEC)
-+  ENTRY(ELIBEXEC, "ELIBEXEC", "Cannot exec a shared library directly"),
-+#endif
-+#if defined (EILSEQ)
-+  ENTRY(EILSEQ, "EILSEQ", "Illegal byte sequence"),
-+#endif
-+#if defined (ENOSYS)
-+  ENTRY(ENOSYS, "ENOSYS", "Operation not applicable"),
-+#endif
-+#if defined (ELOOP)
-+  ENTRY(ELOOP, "ELOOP", "Too many symbolic links encountered"),
-+#endif
-+#if defined (ERESTART)
-+  ENTRY(ERESTART, "ERESTART", "Interrupted system call should be restarted"),
-+#endif
-+#if defined (ESTRPIPE)
-+  ENTRY(ESTRPIPE, "ESTRPIPE", "Streams pipe error"),
-+#endif
-+#if defined (ENOTEMPTY)
-+  ENTRY(ENOTEMPTY, "ENOTEMPTY", "Directory not empty"),
-+#endif
-+#if defined (EUSERS)
-+  ENTRY(EUSERS, "EUSERS", "Too many users"),
-+#endif
-+#if defined (ENOTSOCK)
-+  ENTRY(ENOTSOCK, "ENOTSOCK", "Socket operation on non-socket"),
-+#endif
-+#if defined (EDESTADDRREQ)
-+  ENTRY(EDESTADDRREQ, "EDESTADDRREQ", "Destination address required"),
-+#endif
-+#if defined (EMSGSIZE)
-+  ENTRY(EMSGSIZE, "EMSGSIZE", "Message too long"),
-+#endif
-+#if defined (EPROTOTYPE)
-+  ENTRY(EPROTOTYPE, "EPROTOTYPE", "Protocol wrong type for socket"),
-+#endif
-+#if defined (ENOPROTOOPT)
-+  ENTRY(ENOPROTOOPT, "ENOPROTOOPT", "Protocol not available"),
-+#endif
-+#if defined (EPROTONOSUPPORT)
-+  ENTRY(EPROTONOSUPPORT, "EPROTONOSUPPORT", "Protocol not supported"),
-+#endif
-+#if defined (ESOCKTNOSUPPORT)
-+  ENTRY(ESOCKTNOSUPPORT, "ESOCKTNOSUPPORT", "Socket type not supported"),
-+#endif
-+#if defined (EOPNOTSUPP)
-+  ENTRY(EOPNOTSUPP, "EOPNOTSUPP", "Operation not supported on transport endpoint"),
-+#endif
-+#if defined (EPFNOSUPPORT)
-+  ENTRY(EPFNOSUPPORT, "EPFNOSUPPORT", "Protocol family not supported"),
-+#endif
-+#if defined (EAFNOSUPPORT)
-+  ENTRY(EAFNOSUPPORT, "EAFNOSUPPORT", "Address family not supported by protocol"),
-+#endif
-+#if defined (EADDRINUSE)
-+  ENTRY(EADDRINUSE, "EADDRINUSE", "Address already in use"),
-+#endif
-+#if defined (EADDRNOTAVAIL)
-+  ENTRY(EADDRNOTAVAIL, "EADDRNOTAVAIL","Cannot assign requested address"),
-+#endif
-+#if defined (ENETDOWN)
-+  ENTRY(ENETDOWN, "ENETDOWN", "Network is down"),
-+#endif
-+#if defined (ENETUNREACH)
-+  ENTRY(ENETUNREACH, "ENETUNREACH", "Network is unreachable"),
-+#endif
-+#if defined (ENETRESET)
-+  ENTRY(ENETRESET, "ENETRESET", "Network dropped connection because of reset"),
-+#endif
-+#if defined (ECONNABORTED)
-+  ENTRY(ECONNABORTED, "ECONNABORTED", "Software caused connection abort"),
-+#endif
-+#if defined (ECONNRESET)
-+  ENTRY(ECONNRESET, "ECONNRESET", "Connection reset by peer"),
-+#endif
-+#if defined (ENOBUFS)
-+  ENTRY(ENOBUFS, "ENOBUFS", "No buffer space available"),
-+#endif
-+#if defined (EISCONN)
-+  ENTRY(EISCONN, "EISCONN", "Transport endpoint is already connected"),
-+#endif
-+#if defined (ENOTCONN)
-+  ENTRY(ENOTCONN, "ENOTCONN", "Transport endpoint is not connected"),
-+#endif
-+#if defined (ESHUTDOWN)
-+  ENTRY(ESHUTDOWN, "ESHUTDOWN", "Cannot send after transport endpoint shutdown"),
-+#endif
-+#if defined (ETOOMANYREFS)
-+  ENTRY(ETOOMANYREFS, "ETOOMANYREFS", "Too many references: cannot splice"),
-+#endif
-+#if defined (ETIMEDOUT)
-+  ENTRY(ETIMEDOUT, "ETIMEDOUT", "Connection timed out"),
-+#endif
-+#if defined (ECONNREFUSED)
-+  ENTRY(ECONNREFUSED, "ECONNREFUSED", "Connection refused"),
-+#endif
-+#if defined (EHOSTDOWN)
-+  ENTRY(EHOSTDOWN, "EHOSTDOWN", "Host is down"),
-+#endif
-+#if defined (EHOSTUNREACH)
-+  ENTRY(EHOSTUNREACH, "EHOSTUNREACH", "No route to host"),
-+#endif
-+#if defined (EALREADY)
-+  ENTRY(EALREADY, "EALREADY", "Operation already in progress"),
-+#endif
-+#if defined (EINPROGRESS)
-+  ENTRY(EINPROGRESS, "EINPROGRESS", "Operation now in progress"),
-+#endif
-+#if defined (ESTALE)
-+  ENTRY(ESTALE, "ESTALE", "Stale NFS file handle"),
-+#endif
-+#if defined (EUCLEAN)
-+  ENTRY(EUCLEAN, "EUCLEAN", "Structure needs cleaning"),
-+#endif
-+#if defined (ENOTNAM)
-+  ENTRY(ENOTNAM, "ENOTNAM", "Not a XENIX named type file"),
-+#endif
-+#if defined (ENAVAIL)
-+  ENTRY(ENAVAIL, "ENAVAIL", "No XENIX semaphores available"),
-+#endif
-+#if defined (EISNAM)
-+  ENTRY(EISNAM, "EISNAM", "Is a named type file"),
-+#endif
-+#if defined (EREMOTEIO)
-+  ENTRY(EREMOTEIO, "EREMOTEIO", "Remote I/O error"),
-+#endif
-+  ENTRY(0, NULL, NULL)
-+};
-+
-+#ifdef EVMSERR
-+/* This is not in the table, because the numeric value of EVMSERR (32767)
-+   lies outside the range of sys_errlist[].  */
-+static struct { int value; const char *name, *msg; }
-+  evmserr = { EVMSERR, "EVMSERR", "VMS-specific error" };
-+#endif
-+
-+/* Translation table allocated and initialized at runtime.  Indexed by the
-+   errno value to find the equivalent symbolic value. */
-+
-+static const char **error_names;
-+static int num_error_names = 0;
-+
-+/* Translation table allocated and initialized at runtime, if it does not
-+   already exist in the host environment.  Indexed by the errno value to find
-+   the descriptive string.
-+
-+   We don't export it for use in other modules because even though it has the
-+   same name, it differs from other implementations in that it is dynamically
-+   initialized rather than statically initialized. */
-+
-+#ifndef HAVE_SYS_ERRLIST
-+
-+static int sys_nerr;
-+static const char **sys_errlist;
-+
-+#else
-+
-+extern int sys_nerr;
-+extern char *sys_errlist[];
-+
-+#endif
-+
-+
-+#ifndef HAVE_SYS_ERRLIST
-+/*
-+
-+NAME
-+
-+	init_error_tables -- initialize the name and message tables
-+
-+SYNOPSIS
-+
-+	static void init_error_tables ();
-+
-+DESCRIPTION
-+
-+	Using the error_table, which is initialized at compile time, generate
-+	the error_names and the sys_errlist (if needed) tables, which are
-+	indexed at runtime by a specific errno value.
-+
-+BUGS
-+
-+	The initialization of the tables may fail under low memory conditions,
-+	in which case we don't do anything particularly useful, but we don't
-+	bomb either.  Who knows, it might succeed at a later point if we free
-+	some memory in the meantime.  In any case, the other routines know
-+	how to deal with lack of a table after trying to initialize it.  This
-+	may or may not be considered to be a bug, that we don't specifically
-+	warn about this particular failure mode.
-+
-+*/
-+
-+static void
-+init_error_tables ()
-+{
-+  const struct error_info *eip;
-+  int nbytes;
-+
-+  /* If we haven't already scanned the error_table once to find the maximum
-+     errno value, then go find it now. */
-+
-+  if (num_error_names == 0)
-+    {
-+      for (eip = error_table; eip -> name != NULL; eip++)
-+	{
-+	  if (eip -> value >= num_error_names)
-+	    {
-+	      num_error_names = eip -> value + 1;
-+	    }
-+	}
-+    }
-+
-+  /* Now attempt to allocate the sys_errlist table, zero it out, and then
-+     initialize it from the statically initialized error_table. */
-+
-+  if (sys_errlist == NULL)
-+    {
-+      nbytes = num_error_names * sizeof (char *);
-+      if ((sys_errlist = (const char **) malloc (nbytes)) != NULL)
-+	{
-+	  memset (sys_errlist, 0, nbytes);
-+	  sys_nerr = num_error_names;
-+	  for (eip = error_table; eip -> name != NULL; eip++)
-+	    {
-+	      sys_errlist[eip -> value] = eip -> msg;
-+	    }
-+	}
-+    }
-+}
-+#endif
-+
-+
-+/*
-+
-+NAME
-+
-+	strerror -- map an error number to an error message string
-+
-+SYNOPSIS
-+
-+	char *strerror (int errnoval)
-+
-+DESCRIPTION
-+
-+	Maps an errno number to an error message string, the contents of
-+	which are implementation defined.  On systems which have the external
-+	variables sys_nerr and sys_errlist, these strings will be the same
-+	as the ones used by perror().
-+
-+	If the supplied error number is within the valid range of indices
-+	for the sys_errlist, but no message is available for the particular
-+	error number, then returns the string "Error NUM", where NUM is the
-+	error number.
-+
-+	If the supplied error number is not a valid index into sys_errlist,
-+	returns NULL.
-+
-+	The returned string is only guaranteed to be valid only until the
-+	next call to strerror.
-+
-+*/
-+
-+char *
-+strerror (errnoval)
-+  int errnoval;
-+{
-+  char *msg;
-+  static char buf[32];
-+
-+#ifndef HAVE_SYS_ERRLIST
-+
-+  if (error_names == NULL)
-+    {
-+      init_error_tables ();
-+    }
-+
-+#endif
-+
-+  if ((errnoval < 0) || (errnoval >= sys_nerr))
-+    {
-+#ifdef EVMSERR
-+      if (errnoval == evmserr.value)
-+	msg = evmserr.msg;
-+      else
-+#endif
-+      /* Out of range, just return NULL */
-+      msg = NULL;
-+    }
-+  else if ((sys_errlist == NULL) || (sys_errlist[errnoval] == NULL))
-+    {
-+      /* In range, but no sys_errlist or no entry at this index. */
-+      sprintf (buf, "Error %d", errnoval);
-+      msg = buf;
-+    }
-+  else
-+    {
-+      /* In range, and a valid message.  Just return the message. */
-+      msg = (char *) sys_errlist[errnoval];
-+    }
-+  
-+  return (msg);
-+}
---- metamail-2.7.orig/aclocal.m4
-+++ metamail-2.7/aclocal.m4
-@@ -0,0 +1,3824 @@
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-+
-+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl This program is distributed in the hope that it will be useful,
-+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+dnl PARTICULAR PURPOSE.
-+
-+# Like AC_CONFIG_HEADER, but automatically create stamp file.
-+
-+AC_DEFUN([AM_CONFIG_HEADER],
-+[AC_PREREQ([2.12])
-+AC_CONFIG_HEADER([$1])
-+dnl When config.status generates a header, we must update the stamp-h file.
-+dnl This file resides in the same directory as the config header
-+dnl that is generated.  We must strip everything past the first ":",
-+dnl and everything past the last "/".
-+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-+ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-+<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-+<<am_indx=1
-+for am_file in <<$1>>; do
-+  case " <<$>>CONFIG_HEADERS " in
-+  *" <<$>>am_file "*<<)>>
-+    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-+    ;;
-+  esac
-+  am_indx=`expr "<<$>>am_indx" + 1`
-+done<<>>dnl>>)
-+changequote([,]))])
-+
-+# Do all the work for Automake.  This macro actually does too much --
-+# some checks are only needed if your package does certain things.
-+# But this isn't really a big deal.
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-+
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])
-+PACKAGE=[$1]
-+AC_SUBST(PACKAGE)
-+VERSION=[$2]
-+AC_SUBST(VERSION)
-+dnl test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+ifelse([$3],,
-+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-+AC_REQUIRE([AM_SANITY_CHECK])
-+AC_REQUIRE([AC_ARG_PROGRAM])
-+dnl FIXME This is truly gross.
-+missing_dir=`cd $ac_aux_dir && pwd`
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-+AC_REQUIRE([AC_PROG_MAKE_SET])])
-+
-+# Copyright 2002  Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-+
-+#
-+# Check to make sure that the build environment is sane.
-+#
-+
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftestfile
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-+   if test "[$]*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftestfile`
-+   fi
-+   if test "[$]*" != "X $srcdir/configure conftestfile" \
-+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "[$]2" = conftestfile
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+rm -f conftest*
-+AC_MSG_RESULT(yes)])
-+
-+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-+dnl The program must properly implement --version.
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_MSG_CHECKING(for working $2)
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if ($2 --version) < /dev/null > /dev/null 2>&1; then
-+   $1=$2
-+   AC_MSG_RESULT(found)
-+else
-+   $1="$3/missing $2"
-+   AC_MSG_RESULT(missing)
-+fi
-+AC_SUBST($1)])
-+
-+# Add --enable-maintainer-mode option to configure.
-+# From Jim Meyering
-+
-+# serial 1
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode enable make rules and dependencies not useful
-+                          (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-+  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+# Define a conditional.
-+
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_SUBST($1_TRUE)
-+AC_SUBST($1_FALSE)
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi])
-+
-+# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
-+
-+# serial 46 AC_PROG_LIBTOOL
-+
-+AC_DEFUN([AC_PROG_LIBTOOL],
-+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
-+
-+# Prevent multiple expansion
-+define([AC_PROG_LIBTOOL], [])
-+])
-+
-+AC_DEFUN([AC_LIBTOOL_SETUP],
-+[AC_PREREQ(2.13)dnl
-+AC_REQUIRE([AC_ENABLE_SHARED])dnl
-+AC_REQUIRE([AC_ENABLE_STATIC])dnl
-+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_LD])dnl
-+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-+AC_REQUIRE([AC_PROG_NM])dnl
-+AC_REQUIRE([LT_AC_PROG_SED])dnl
-+
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-+AC_REQUIRE([AC_OBJEXT])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
-+dnl
-+
-+_LT_AC_PROG_ECHO_BACKSLASH
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    AC_PATH_MAGIC
-+  fi
-+  ;;
-+esac
-+
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+AC_CHECK_TOOL(STRIP, strip, :)
-+
-+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-+enable_win32_dll=yes, enable_win32_dll=no)
-+
-+AC_ARG_ENABLE(libtool-lock,
-+  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -32"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -n32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -64"
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+    [AC_LANG_SAVE
-+     AC_LANG_C
-+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+     AC_LANG_RESTORE])
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
-+
-+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+  AC_CHECK_TOOL(AS, as, false)
-+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+
-+  # recent cygwin and mingw systems supply a stub DllMain which the user
-+  # can override, but on older systems we have to supply one
-+  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-+    [AC_TRY_LINK([],
-+      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-+      DllMain (0, 0, 0);],
-+      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-+
-+  case $host/$CC in
-+  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-+    # old mingw systems require "-dll" to link a DLL, while more recent ones
-+    # require "-mdll"
-+    SAVE_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS -mdll"
-+    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-+      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-+    CFLAGS="$SAVE_CFLAGS" ;;
-+  *-*-cygwin* | *-*-pw32*)
-+    # cygwin systems need to pass --dll to the linker, and not link
-+    # crt.o which will require a WinMain@16 definition.
-+    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-+  esac
-+  ;;
-+  ])
-+esac
-+
-+_LT_AC_LTCONFIG_HACK
-+
-+])
-+
-+# AC_LIBTOOL_HEADER_ASSERT
-+# ------------------------
-+AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
-+[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
-+    [lt_cv_func_assert_works],
-+    [case $host in
-+    *-*-solaris*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
-+        case `$CC --version 2>/dev/null` in
-+        [[12]].*) lt_cv_func_assert_works=no ;;
-+        *)        lt_cv_func_assert_works=yes ;;
-+        esac
-+      fi
-+      ;;
-+    esac])
-+
-+if test "x$lt_cv_func_assert_works" = xyes; then
-+  AC_CHECK_HEADERS(assert.h)
-+fi
-+])# AC_LIBTOOL_HEADER_ASSERT
-+
-+# _LT_AC_CHECK_DLFCN
-+# --------------------
-+AC_DEFUN([_LT_AC_CHECK_DLFCN],
-+[AC_CHECK_HEADERS(dlfcn.h)
-+])# _LT_AC_CHECK_DLFCN
-+
-+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+# ---------------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-+[AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([AC_PROG_NM])
-+AC_REQUIRE([AC_OBJEXT])
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
-+
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+
-+# Transform the above into a raw symbol and a C symbol.
-+symxfrm='\1 \2\3 \3'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[[BCDT]]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[[ABCDGISTW]]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[[BCDEGRST]]'
-+  ;;
-+osf*)
-+  symcode='[[BCDEGQRST]]'
-+  ;;
-+solaris* | sysv5*)
-+  symcode='[[BDT]]'
-+  ;;
-+sysv4)
-+  symcode='[[DFNSTU]]'
-+  ;;
-+esac
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $host_os in
-+mingw*)
-+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-+  symcode='[[ABCDGISTW]]'
-+fi
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Write the raw and C identifiers.
-+lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+  if AC_TRY_EVAL(ac_compile); then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-+	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
-+
-+	  cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr void *
-+#else
-+# define lt_ptr char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr address;
-+}
-+lt_preloaded_symbols[[]] =
-+{
-+EOF
-+	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
-+	  cat <<\EOF >> conftest.$ac_ext
-+  {0, (lt_ptr) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  save_LIBS="$LIBS"
-+	  save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$no_builtin_flag"
-+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$save_LIBS"
-+	  CFLAGS="$save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&AC_FD_CC
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -f conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+])
-+global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  global_symbol_to_cdecl=
-+  global_symbol_to_c_name_address=
-+else
-+  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
-+  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
-+fi
-+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
-+then
-+  AC_MSG_RESULT(failed)
-+else
-+  AC_MSG_RESULT(ok)
-+fi
-+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+
-+# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
-+# ---------------------------------
-+AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
-+[# Find the correct PATH separator.  Usually this is `:', but
-+# DJGPP uses `;' like DOS.
-+if test "X${PATH_SEPARATOR+set}" != Xset; then
-+  UNAME=${UNAME-`uname 2>/dev/null`}
-+  case X$UNAME in
-+    *-DOS) lt_cv_sys_path_separator=';' ;;
-+    *)     lt_cv_sys_path_separator=':' ;;
-+  esac
-+  PATH_SEPARATOR=$lt_cv_sys_path_separator
-+fi
-+])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
-+
-+# _LT_AC_PROG_ECHO_BACKSLASH
-+# --------------------------
-+# Add some code to the start of the generated configure script which
-+# will find an echo command which doesn't interpret backslashes.
-+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-+[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-+			      [AC_DIVERT_PUSH(NOTICE)])
-+_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
-+
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+  ;;
-+esac
-+
-+echo=${ECHO-echo}
-+if test "X[$]1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X[$]1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+fi
-+
-+if test "X[$]1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit 0
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+if test -z "$ECHO"; then
-+if test "X${echo_test_string+set}" != Xset; then
-+# find a string as large as possible, as long as the shell can cope with it
-+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+       echo_test_string="`eval $cmd`" &&
-+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-+    then
-+      break
-+    fi
-+  done
-+fi
-+
-+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+   test "X$echo_testing_string" = "X$echo_test_string"; then
-+  :
-+else
-+  # The Solaris, AIX, and Digital Unix default echo programs unquote
-+  # backslashes.  This makes it impossible to quote backslashes using
-+  #   echo "$something" | sed 's/\\/\\\\/g'
-+  #
-+  # So, first we look for a working echo in the user's PATH.
-+
-+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for dir in $PATH /usr/ucb; do
-+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      echo="$dir/echo"
-+      break
-+    fi
-+  done
-+  IFS="$save_ifs"
-+
-+  if test "X$echo" = Xecho; then
-+    # We didn't find a better echo, so look for alternatives.
-+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      # This shell has a builtin print -r that does the trick.
-+      echo='print -r'
-+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-+      # If we have ksh, try running configure again with it.
-+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+      export ORIGINAL_CONFIG_SHELL
-+      CONFIG_SHELL=/bin/ksh
-+      export CONFIG_SHELL
-+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+    else
-+      # Try using printf.
-+      echo='printf %s\n'
-+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+	 test "X$echo_testing_string" = "X$echo_test_string"; then
-+	# Cool, printf works
-+	:
-+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	export CONFIG_SHELL
-+	SHELL="$CONFIG_SHELL"
-+	export SHELL
-+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-+      else
-+	# maybe with a smaller string...
-+	prev=:
-+
-+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-+	  then
-+	    break
-+	  fi
-+	  prev="$cmd"
-+	done
-+
-+	if test "$prev" != 'sed 50q "[$]0"'; then
-+	  echo_test_string=`eval $prev`
-+	  export echo_test_string
-+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-+	else
-+	  # Oops.  We lost completely, so just stick with echo.
-+	  echo=echo
-+	fi
-+      fi
-+    fi
-+  fi
-+fi
-+fi
-+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+ECHO=$echo
-+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-+fi
-+
-+AC_SUBST(ECHO)
-+AC_DIVERT_POP
-+])# _LT_AC_PROG_ECHO_BACKSLASH
-+
-+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ------------------------------------------------------------------
-+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-+[if test "$cross_compiling" = yes; then :
-+  [$4]
-+else
-+  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+[#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+
-+    exit (status);
-+}]
-+EOF
-+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) $1 ;;
-+      x$lt_dlneed_uscore) $2 ;;
-+      x$lt_unknown|x*) $3 ;;
-+    esac
-+  else :
-+    # compilation failed
-+    $3
-+  fi
-+fi
-+rm -fr conftest*
-+])# _LT_AC_TRY_DLOPEN_SELF
-+
-+# AC_LIBTOOL_DLOPEN_SELF
-+# -------------------
-+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-+[if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  *)
-+    AC_CHECK_FUNC([shl_load],
-+          [lt_cv_dlopen="shl_load"],
-+      [AC_CHECK_LIB([dld], [shl_load],
-+            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-+	[AC_CHECK_FUNC([dlopen],
-+	      [lt_cv_dlopen="dlopen"],
-+	  [AC_CHECK_LIB([dl], [dlopen],
-+	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+	    [AC_CHECK_LIB([svld], [dlopen],
-+	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+	      [AC_CHECK_LIB([dld], [dld_link],
-+	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+	      ])
-+	    ])
-+	  ])
-+	])
-+      ])
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
-+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+    AC_CACHE_CHECK([whether a program can dlopen itself],
-+	  lt_cv_dlopen_self, [dnl
-+	  _LT_AC_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+    ])
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      LDFLAGS="$LDFLAGS $link_static_flag"
-+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-+    	  lt_cv_dlopen_self_static, [dnl
-+	  _LT_AC_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-+      ])
-+    fi
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+])# AC_LIBTOOL_DLOPEN_SELF
-+
-+AC_DEFUN([_LT_AC_LTCONFIG_HACK],
-+[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
-+sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Constants:
-+rm="rm -f"
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except M$VC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+need_locks="$enable_libtool_lock"
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
-+
-+if test x"$host" != x"$build"; then
-+  ac_tool_prefix=${host_alias}-
-+else
-+  ac_tool_prefix=
-+fi
-+
-+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-+case $host_os in
-+linux-gnu*) ;;
-+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-+esac
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  *)
-+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+
-+# Allow CC to be a program name with arguments.
-+set dummy $CC
-+compiler="[$]2"
-+
-+AC_MSG_CHECKING([for objdir])
-+rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null
-+AC_MSG_RESULT($objdir)
-+
-+
-+AC_ARG_WITH(pic,
-+[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-+pic_mode="$withval", pic_mode=default)
-+test -z "$pic_mode" && pic_mode=default
-+
-+# We assume here that the value for lt_cv_prog_cc_pic will not be cached
-+# in isolation, and that seeing it set (from the cache) indicates that
-+# the associated values are set (in the cache) correctly too.
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+AC_CACHE_VAL(lt_cv_prog_cc_pic,
-+[ lt_cv_prog_cc_pic=
-+  lt_cv_prog_cc_shlib=
-+  lt_cv_prog_cc_wl=
-+  lt_cv_prog_cc_static=
-+  lt_cv_prog_cc_no_builtin=
-+  lt_cv_prog_cc_can_build_shared=$can_build_shared
-+
-+  if test "$GCC" = yes; then
-+    lt_cv_prog_cc_wl='-Wl,'
-+    lt_cv_prog_cc_static='-static'
-+
-+    case $host_os in
-+    aix*)
-+      # Below there is a dirty hack to force normal static linking with -ldl
-+      # The problem is because libdl dynamically linked with both libc and
-+      # libC (AIX C++ library), which obviously doesn't included in libraries
-+      # list by gcc. This cause undefined symbols with -static flags.
-+      # This hack allows C programs to be linked with "-static -ldl", but
-+      # not sure about C++ programs.
-+      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
-+      ;;
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_cv_prog_cc_pic='-fno-common'
-+      ;;
-+    cygwin* | mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	 lt_cv_prog_cc_pic=-Kconform_pic
-+      fi
-+      ;;
-+    *)
-+      lt_cv_prog_cc_pic='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for PIC flags for the system compiler.
-+    case $host_os in
-+    aix3* | aix4* | aix5*)
-+      lt_cv_prog_cc_wl='-Wl,'
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_cv_prog_cc_static='-Bstatic'
-+      else
-+	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
-+      lt_cv_prog_cc_pic='+Z'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static='-non_shared'
-+      # PIC (with -KPIC) is the default.
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-+      ;;
-+
-+    newsos6)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      # All OSF/1 code is PIC.
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static='-non_shared'
-+      ;;
-+
-+    sco3.2v5*)
-+      lt_cv_prog_cc_pic='-Kpic'
-+      lt_cv_prog_cc_static='-dn'
-+      lt_cv_prog_cc_shlib='-belf'
-+      ;;
-+
-+    solaris*)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Wl,'
-+      ;;
-+
-+    sunos4*)
-+      lt_cv_prog_cc_pic='-PIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Qoption ld '
-+      ;;
-+
-+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Wl,'
-+      ;;
-+
-+    uts4*)
-+      lt_cv_prog_cc_pic='-pic'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_cv_prog_cc_pic='-Kconform_pic'
-+	lt_cv_prog_cc_static='-Bstatic'
-+      fi
-+      ;;
-+
-+    *)
-+      lt_cv_prog_cc_can_build_shared=no
-+      ;;
-+    esac
-+  fi
-+])
-+if test -z "$lt_cv_prog_cc_pic"; then
-+  AC_MSG_RESULT([none])
-+else
-+  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
-+
-+  # Check to make sure the pic_flag actually works.
-+  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
-+  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
-+    save_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
-+    AC_TRY_COMPILE([], [], [dnl
-+      case $host_os in
-+      hpux9* | hpux10* | hpux11*)
-+	# On HP-UX, both CC and GCC only warn that PIC is supported... then
-+	# they create non-PIC objects.  So, if there were any warnings, we
-+	# assume that PIC is not supported.
-+	if test -s conftest.err; then
-+	  lt_cv_prog_cc_pic_works=no
-+	else
-+	  lt_cv_prog_cc_pic_works=yes
-+	fi
-+	;;
-+      *)
-+	lt_cv_prog_cc_pic_works=yes
-+	;;
-+      esac
-+    ], [dnl
-+      lt_cv_prog_cc_pic_works=no
-+    ])
-+    CFLAGS="$save_CFLAGS"
-+  ])
-+
-+  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
-+    lt_cv_prog_cc_pic=
-+    lt_cv_prog_cc_can_build_shared=no
-+  else
-+    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
-+  fi
-+
-+  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
-+fi
-+
-+# Check for any special shared library compilation flags.
-+if test -n "$lt_cv_prog_cc_shlib"; then
-+  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
-+  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
-+  else
-+   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
-+    lt_cv_prog_cc_can_build_shared=no
-+  fi
-+fi
-+
-+AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
-+AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
-+  lt_cv_prog_cc_static_works=no
-+  save_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
-+  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
-+  LDFLAGS="$save_LDFLAGS"
-+])
-+
-+# Belt *and* braces to stop my trousers falling down:
-+test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-+AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
-+
-+pic_flag="$lt_cv_prog_cc_pic"
-+special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
-+wl="$lt_cv_prog_cc_wl"
-+link_static_flag="$lt_cv_prog_cc_static"
-+no_builtin_flag="$lt_cv_prog_cc_no_builtin"
-+can_build_shared="$lt_cv_prog_cc_can_build_shared"
-+
-+
-+# Check to see if options -o and -c are simultaneously supported by compiler
-+AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
-+AC_CACHE_VAL([lt_cv_compiler_c_o], [
-+$rm -r conftest 2>/dev/null
-+mkdir conftest
-+cd conftest
-+echo "int some_variable = 0;" > conftest.$ac_ext
-+mkdir out
-+# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-+# that will create temporary files in the current directory regardless of
-+# the output directory.  Thus, making CWD read-only will cause this test
-+# to fail, enabling locking or at least warning the user not to do parallel
-+# builds.
-+chmod -w .
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
-+compiler_c_o=no
-+if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
-+  # The compiler can only warn and ignore the option if not recognized
-+  # So say no if there are warnings
-+  if test -s out/conftest.err; then
-+    lt_cv_compiler_c_o=no
-+  else
-+    lt_cv_compiler_c_o=yes
-+  fi
-+else
-+  # Append any errors to the config.log.
-+  cat out/conftest.err 1>&AC_FD_CC
-+  lt_cv_compiler_c_o=no
-+fi
-+CFLAGS="$save_CFLAGS"
-+chmod u+w .
-+$rm conftest* out/*
-+rmdir out
-+cd ..
-+rmdir conftest
-+$rm -r conftest 2>/dev/null
-+])
-+compiler_c_o=$lt_cv_compiler_c_o
-+AC_MSG_RESULT([$compiler_c_o])
-+
-+if test x"$compiler_c_o" = x"yes"; then
-+  # Check to see if we can write to a .lo
-+  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
-+  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
-+  lt_cv_compiler_o_lo=no
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -c -o conftest.lo"
-+  save_objext="$ac_objext"
-+  ac_objext=lo
-+  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
-+    # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+    if test -s conftest.err; then
-+      lt_cv_compiler_o_lo=no
-+    else
-+      lt_cv_compiler_o_lo=yes
-+    fi
-+  ])
-+  ac_objext="$save_objext"
-+  CFLAGS="$save_CFLAGS"
-+  ])
-+  compiler_o_lo=$lt_cv_compiler_o_lo
-+  AC_MSG_RESULT([$compiler_o_lo])
-+else
-+  compiler_o_lo=no
-+fi
-+
-+# Check to see if we can do hard links to lock some files if needed
-+hard_links="nottested"
-+if test "$compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  AC_MSG_CHECKING([if we can lock with hard links])
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  AC_MSG_RESULT([$hard_links])
-+  if test "$hard_links" = no; then
-+    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
-+if test "$GCC" = yes; then
-+  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-+  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
-+  echo "int some_variable = 0;" > conftest.$ac_ext
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
-+  compiler_rtti_exceptions=no
-+  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
-+    # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+    if test -s conftest.err; then
-+      compiler_rtti_exceptions=no
-+    else
-+      compiler_rtti_exceptions=yes
-+    fi
-+  ])
-+  CFLAGS="$save_CFLAGS"
-+  AC_MSG_RESULT([$compiler_rtti_exceptions])
-+
-+  if test "$compiler_rtti_exceptions" = "yes"; then
-+    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-+  else
-+    no_builtin_flag=' -fno-builtin'
-+  fi
-+fi
-+
-+# See if the linker supports building shared libraries.
-+AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
-+
-+allow_undefined_flag=
-+no_undefined_flag=
-+need_lib_prefix=unknown
-+need_version=unknown
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+archive_cmds=
-+archive_expsym_cmds=
-+old_archive_from_new_cmds=
-+old_archive_from_expsyms_cmds=
-+export_dynamic_flag_spec=
-+whole_archive_flag_spec=
-+thread_safe_flag_spec=
-+hardcode_into_libs=no
-+hardcode_libdir_flag_spec=
-+hardcode_libdir_separator=
-+hardcode_direct=no
-+hardcode_minus_L=no
-+hardcode_shlibpath_var=unsupported
-+runpath_var=
-+link_all_deplibs=unknown
-+always_export_symbols=no
-+export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+# include_expsyms should be a list of space-separated symbols to be *always*
-+# included in the symbol list
-+include_expsyms=
-+# exclude_expsyms can be an egrep regular expression of symbols to exclude
-+# it will be wrapped by ` (' and `)$', so one must not match beginning or
-+# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+# as well as any symbol that contains `d'.
-+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+# platforms (ab)use it in PIC code, but their linkers get confused if
-+# the symbol is explicitly referenced.  Since portable code cannot
-+# rely on this symbol name, it's probably fine to never include it in
-+# preloaded symbol tables.
-+extract_expsyms_cmds=
-+
-+case $host_os in
-+cygwin* | mingw* | pw32*)
-+  # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+  # When not using gcc, we currently assume that we are using
-+  # Microsoft Visual C++.
-+  if test "$GCC" != yes; then
-+    with_gnu_ld=no
-+  fi
-+  ;;
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
-+esac
-+
-+ld_shlibs=yes
-+if test "$with_gnu_ld" = yes; then
-+  # If archive_cmds runs LD, not CC, wlarc should be empty
-+  wlarc='${wl}'
-+
-+  # See if GNU ld supports shared libraries.
-+  case $host_os in
-+  aix3* | aix4* | aix5*)
-+    # On AIX, the GNU linker is very broken
-+    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
-+    ld_shlibs=no
-+    cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+
-+    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+    # that the semantics of dynamic libraries on AmigaOS, at least up
-+    # to version 4, is to share data among multiple programs linked
-+    # with the same dynamic library.  Since this doesn't match the
-+    # behavior of shared libraries on other platforms, we can use
-+    # them.
-+    ld_shlibs=no
-+    ;;
-+
-+  beos*)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      allow_undefined_flag=unsupported
-+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+      # support --undefined.  This deserves some investigation.  FIXME
-+      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+
-+    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
-+      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
-+      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-+      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
-+      else $CC -o impgen impgen.c ; fi)~
-+      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
-+
-+    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
-+
-+    # cygwin and mingw dlls have different entry points and sets of symbols
-+    # to exclude.
-+    # FIXME: what about values for MSVC?
-+    dll_entry=__cygwin_dll_entry@12
-+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
-+    case $host_os in
-+    mingw*)
-+      # mingw values
-+      dll_entry=_DllMainCRTStartup@12
-+      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
-+      ;;
-+    esac
-+
-+    # mingw and cygwin differ, and it's simplest to just exclude the union
-+    # of the two symbol sets.
-+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
-+
-+    # recent cygwin and mingw systems supply a stub DllMain which the user
-+    # can override, but on older systems we have to supply one (in ltdll.c)
-+    if test "x$lt_cv_need_dllmain" = "xyes"; then
-+      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
-+      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
-+	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
-+    else
-+      ltdll_obj=
-+      ltdll_cmds=
-+    fi
-+
-+    # Extract the symbol export list from an `--export-all' def file,
-+    # then regenerate the def file from the symbol export list, so that
-+    # the compiled dll only exports the symbol export list.
-+    # Be careful not to strip the DATA tag left be newer dlltools.
-+    export_symbols_cmds="$ltdll_cmds"'
-+      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
-+      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
-+
-+    # If the export-symbols file already is a .def file (1st line
-+    # is EXPORTS), use it as is.
-+    # If DATA tags from a recent dlltool are present, honour them!
-+    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
-+	cp $export_symbols $output_objdir/$soname-def;
-+      else
-+	echo EXPORTS > $output_objdir/$soname-def;
-+	_lt_hint=1;
-+	cat $export_symbols | while read symbol; do
-+	 set dummy \$symbol;
-+	 case \[$]# in
-+	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-+	   4) echo "   \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
-+	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
-+	 esac;
-+	 _lt_hint=`expr 1 + \$_lt_hint`;
-+	done;
-+      fi~
-+      '"$ltdll_cmds"'
-+      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
-+      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
-+      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+      wlarc=
-+    else
-+      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    fi
-+    ;;
-+
-+  solaris* | sysv5*)
-+    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-+      ld_shlibs=no
-+      cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  sunos4*)
-+    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+    wlarc=
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+  esac
-+
-+  if test "$ld_shlibs" = yes; then
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    case $host_os in
-+    cygwin* | mingw* | pw32*)
-+      # dlltool doesn't understand --whole-archive et. al.
-+      whole_archive_flag_spec=
-+      ;;
-+    *)
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+	whole_archive_flag_spec=
-+      fi
-+      ;;
-+    esac
-+  fi
-+else
-+  # PORTME fill in a description of your system's linker (not GNU ld)
-+  case $host_os in
-+  aix3*)
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+    # Note: this linker hardcodes the directories in LIBPATH if there
-+    # are no directories specified by -L.
-+    hardcode_minus_L=yes
-+    if test "$GCC" = yes && test -z "$link_static_flag"; then
-+      # Neither direct hardcoding nor static linking is supported with a
-+      # broken collect2.
-+      hardcode_direct=unsupported
-+    fi
-+    ;;
-+
-+  aix4* | aix5*)
-+    if test "$host_cpu" = ia64; then
-+      # On IA64, the linker does run time linking by default, so we don't
-+      # have to do anything special.
-+      aix_use_runtimelinking=no
-+      exp_sym_flag='-Bexport'
-+      no_entry_flag=""
-+    else
-+      aix_use_runtimelinking=no
-+
-+      # Test if we are trying to use run time linking or normal
-+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+      # need to do runtime linking.
-+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+	for ld_flag in $LDFLAGS; do
-+	  case $ld_flag in
-+	  *-brtl*)
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  ;;
-+	  esac
-+	done
-+      esac
-+
-+      exp_sym_flag='-bexport'
-+      no_entry_flag='-bnoentry'
-+    fi
-+
-+    # When large executables or shared objects are built, AIX ld can
-+    # have problems creating the table of contents.  If linking a library
-+    # or program results in "error TOC overflow" add -mminimal-toc to
-+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+    hardcode_direct=yes
-+    archive_cmds=''
-+    hardcode_libdir_separator=':'
-+    if test "$GCC" = yes; then
-+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+	collect2name=`${CC} -print-prog-name=collect2`
-+	if test -f "$collect2name" && \
-+	  strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	then
-+	  # We have reworked collect2
-+	  hardcode_direct=yes
-+	else
-+	  # We have old collect2
-+	  hardcode_direct=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  hardcode_minus_L=yes
-+	  hardcode_libdir_flag_spec='-L$libdir'
-+	  hardcode_libdir_separator=
-+	fi
-+      esac
-+
-+      shared_flag='-shared'
-+    else
-+      # not using gcc
-+      if test "$host_cpu" = ia64; then
-+	shared_flag='${wl}-G'
-+      else
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag='${wl}-G'
-+	else
-+	  shared_flag='${wl}-bM:SRE'
-+	fi
-+      fi
-+    fi
-+
-+    # It seems that -bexpall can do strange things, so it is better to
-+    # generate a list of symbols to export.
-+    always_export_symbols=yes
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # Warning - without using the other runtime loading flags (-brtl),
-+      # -berok will link without error, but may produce a broken library.
-+      allow_undefined_flag='-berok'
-+      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-+      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+    else
-+      if test "$host_cpu" = ia64; then
-+	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	allow_undefined_flag="-z nodefs"
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+      else
-+	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-+	# Warning - without using the other run time loading flags,
-+	# -berok will link without error, but may produce a broken library.
-+	allow_undefined_flag='${wl}-berok'
-+	# This is a bit strange, but is similar to how AIX traditionally builds
-+	# it's shared libraries.
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
-+      fi
-+    fi
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    # see comment about different semantics on the GNU ld section
-+    ld_shlibs=no
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec=' '
-+    allow_undefined_flag=unsupported
-+    # Tell ltmain to make .lib files, not .a files.
-+    libext=lib
-+    # FIXME: Setting linknames here is a bad hack.
-+    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+    # The linker will automatically build a .lib file if we build a DLL.
-+    old_archive_from_new_cmds='true'
-+    # FIXME: Should let the user specify the lib program.
-+    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+    fix_srcfile_path='`cygpath -w "$srcfile"`'
-+    ;;
-+
-+  darwin* | rhapsody*)
-+    case "$host_os" in
-+    rhapsody* | darwin1.[[012]])
-+      allow_undefined_flag='-undefined suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      allow_undefined_flag='-flat_namespace -undefined suppress'
-+      ;;
-+    esac
-+    # FIXME: Relying on posixy $() will cause problems for
-+    #        cross-compilation, but unfortunately the echo tests do not
-+    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-+    #	     `"' quotes if we put them in here... so don't!
-+    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
-+    # We need to add '_' to the symbols in $export_symbols first
-+    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    whole_archive_flag_spec='-all_load $convenience'
-+    ;;
-+
-+  freebsd1*)
-+    ld_shlibs=no
-+    ;;
-+
-+  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+  # support.  Future versions do this automatically, but an explicit c++rt0.o
-+  # does not break anything, and helps significantly (at the cost of a little
-+  # extra space).
-+  freebsd2.2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+  freebsd2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+  freebsd*)
-+    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  hpux9* | hpux10* | hpux11*)
-+    case $host_os in
-+    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-+    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
-+    esac
-+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes # Not in the search PATH, but as the default
-+			 # location of the library.
-+    export_dynamic_flag_spec='${wl}-E'
-+    ;;
-+
-+  irix5* | irix6* | nonstopux*)
-+    if test "$GCC" = yes; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    else
-+      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-+    fi
-+    hardcode_libdir_separator=:
-+    link_all_deplibs=yes
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+    else
-+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+    fi
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  newsos6)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  openbsd*)
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
-+    else
-+      case "$host_os" in
-+      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_libdir_flag_spec='-R$libdir'
-+        ;;
-+      *)
-+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+        ;;
-+      esac
-+    fi
-+    ;;
-+
-+  os2*)
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    allow_undefined_flag=unsupported
-+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+    ;;
-+
-+  osf3*)
-+    if test "$GCC" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+    if test "$GCC" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+      #Both c and cxx compiler support -rpath directly
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-+    fi
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  sco3.2v5*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_shlibpath_var=no
-+    runpath_var=LD_RUN_PATH
-+    hardcode_runpath_var=yes
-+    export_dynamic_flag_spec='${wl}-Bexport'
-+    ;;
-+
-+  solaris*)
-+    # gcc --version < 3.0 without binutils cannot create self contained
-+    # shared libraries reliably, requiring libgcc.a to resolve some of
-+    # the object symbols generated in some cases.  Libraries that use
-+    # assert need libgcc.a to resolve __eprintf, for example.  Linking
-+    # a copy of libgcc.a into every shared library to guarantee resolving
-+    # such symbols causes other problems:  According to Tim Van Holder
-+    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
-+    # (to the application) exception stack for one thing.
-+    no_undefined_flag=' -z defs'
-+    if test "$GCC" = yes; then
-+      case `$CC --version 2>/dev/null` in
-+      [[12]].*)
-+	cat <<EOF 1>&2
-+
-+*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
-+*** create self contained shared libraries on Solaris systems, without
-+*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
-+*** -no-undefined support, which will at least allow you to build shared
-+*** libraries.  However, you may find that when you link such libraries
-+*** into an application without using GCC, you have to manually add
-+*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
-+*** upgrade to a newer version of GCC.  Another option is to rebuild your
-+*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
-+
-+EOF
-+        no_undefined_flag=
-+	;;
-+      esac
-+    fi
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_shlibpath_var=no
-+    case $host_os in
-+    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+    esac
-+    link_all_deplibs=yes
-+    ;;
-+
-+  sunos4*)
-+    if test "x$host_vendor" = xsequent; then
-+      # Use $CC to link under sequent, because it throws in some extra .o
-+      # files that make .init and .fini sections work.
-+      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+    else
-+      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+    fi
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4)
-+    case $host_vendor in
-+      sni)
-+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+        hardcode_direct=yes # is this really true???
-+        ;;
-+      siemens)
-+        ## LD is ld it makes a PLAMLIB
-+        ## CC just makes a GrossModule.
-+        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+        reload_cmds='$CC -r -o $output$reload_objs'
-+        hardcode_direct=no
-+        ;;
-+      motorola)
-+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+        ;;
-+    esac
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4.3*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_shlibpath_var=no
-+    export_dynamic_flag_spec='-Bexport'
-+    ;;
-+
-+  sysv5*)
-+    no_undefined_flag=' -z text'
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+    hardcode_libdir_flag_spec=
-+    hardcode_shlibpath_var=no
-+    runpath_var='LD_RUN_PATH'
-+    ;;
-+
-+  uts4*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  dgux*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4*MP*)
-+    if test -d /usr/nec; then
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      runpath_var=LD_RUN_PATH
-+      hardcode_runpath_var=yes
-+      ld_shlibs=yes
-+    fi
-+    ;;
-+
-+  sysv4.2uw2*)
-+    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_minus_L=no
-+    hardcode_shlibpath_var=no
-+    hardcode_runpath_var=yes
-+    runpath_var=LD_RUN_PATH
-+    ;;
-+
-+  sysv5uw7* | unixware7*)
-+    no_undefined_flag='${wl}-z ${wl}text'
-+    if test "$GCC" = yes; then
-+      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+    else
-+      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+    fi
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    ld_shlibs=no
-+    ;;
-+  esac
-+fi
-+AC_MSG_RESULT([$ld_shlibs])
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+# Check hardcoding attributes.
-+AC_MSG_CHECKING([how to hardcode library paths into programs])
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" || \
-+   test -n "$runpath_var"; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$hardcode_shlibpath_var" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
-+AC_MSG_RESULT([$hardcode_action])
-+
-+striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  AC_MSG_RESULT([yes])
-+else
-+  AC_MSG_RESULT([no])
-+fi
-+
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+# PORTME Fill in your ld.so characteristics
-+AC_MSG_CHECKING([dynamic linker characteristics])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}.so$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[[01]] | aix4.[[01]].*)
-+	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	     echo ' yes '
-+	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	  :
-+	else
-+	  can_build_shared=no
-+	fi
-+	;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can
-+    # not hardcode correct soname into executable. Probably we can
-+    # add versioning support to collect2, so additional links can
-+    # be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}.so$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  hardcode_into_libs=yes
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}.so'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
-+bsdi4*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  export_dynamic_flag_spec=-rdynamic
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
-+  need_version=no
-+  need_lib_prefix=no
-+  case $GCC,$host_os in
-+  yes,cygwin*)
-+    library_names_spec='$libname.dll.a'
-+    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
-+    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog .libs/$dlname \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    ;;
-+  yes,mingw*)
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
-+    ;;
-+  yes,pw32*)
-+    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-+    ;;
-+  *)
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  # FIXME: Relying on posixy $() will cause problems for
-+  #        cross-compilation, but unfortunately the echo tests do not
-+  #        yet detect zsh echo's removal of \ escapes.
-+  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
-+  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
-+freebsd*-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU/FreeBSD ld.so'
-+  ;;
-+
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  *)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  dynamic_linker="$host_os dld.sl"
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  shlibpath_var=SHLIB_PATH
-+  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-+  soname_spec='${libname}${release}.sl$major'
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)          version_type=irix ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
-+
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+    soname_spec='${libname}${release}.so$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case "$host_os" in
-+    openbsd2.[[89]] | openbsd2.[[89]].*)
-+      shlibpath_overrides_runpath=no
-+      ;;
-+    *)
-+      shlibpath_overrides_runpath=yes
-+      ;;
-+    esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  need_lib_prefix=no
-+  library_names_spec='$libname.dll $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_version=no
-+  need_lib_prefix=no
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  hardcode_into_libs=yes
-+  ;;
-+
-+sco3.2v5*)
-+  version_type=osf
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      export_dynamic_flag_spec='${wl}-Blargedynsym'
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-+    soname_spec='$libname.so.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+# Report the final consequences.
-+AC_MSG_CHECKING([if libtool supports shared libraries])
-+AC_MSG_RESULT([$can_build_shared])
-+
-+AC_MSG_CHECKING([whether to build shared libraries])
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+
-+aix4*)
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-+  ;;
-+esac
-+AC_MSG_RESULT([$enable_shared])
-+
-+AC_MSG_CHECKING([whether to build static libraries])
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+AC_MSG_RESULT([$enable_static])
-+
-+if test "$hardcode_action" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+AC_LIBTOOL_DLOPEN_SELF
-+
-+if test "$enable_shared" = yes && test "$GCC" = yes; then
-+  case $archive_cmds in
-+  *'~'*)
-+    # FIXME: we may have to deal with multi-command sequences.
-+    ;;
-+  '$CC '*)
-+    # Test whether the compiler implicitly links with -lc since on some
-+    # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+    # to ld, don't add -lc before -lgcc.
-+    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-+    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
-+    [$rm conftest*
-+    echo 'static int dummy;' > conftest.$ac_ext
-+
-+    if AC_TRY_EVAL(ac_compile); then
-+      soname=conftest
-+      lib=conftest
-+      libobjs=conftest.$ac_objext
-+      deplibs=
-+      wl=$lt_cv_prog_cc_wl
-+      compiler_flags=-v
-+      linker_flags=-v
-+      verstring=
-+      output_objdir=.
-+      libname=conftest
-+      save_allow_undefined_flag=$allow_undefined_flag
-+      allow_undefined_flag=
-+      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-+      then
-+	lt_cv_archive_cmds_need_lc=no
-+      else
-+	lt_cv_archive_cmds_need_lc=yes
-+      fi
-+      allow_undefined_flag=$save_allow_undefined_flag
-+    else
-+      cat conftest.err 1>&5
-+    fi])
-+    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
-+    ;;
-+  esac
-+fi
-+need_lc=${lt_cv_archive_cmds_need_lc-yes}
-+
-+# The second clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  :
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
-+  test -f Makefile && make "$ltmain"
-+fi
-+
-+if test -f "$ltmain"; then
-+  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
-+  $rm -f "${ofile}T"
-+
-+  echo creating $ofile
-+
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
-+  for var in echo old_CC old_CFLAGS SED \
-+    AR AR_FLAGS CC LD LN_S NM SHELL \
-+    reload_flag reload_cmds wl \
-+    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-+    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-+    library_names_spec soname_spec \
-+    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-+    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
-+    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd export_symbols_cmds \
-+    deplibs_check_method allow_undefined_flag no_undefined_flag \
-+    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-+    global_symbol_to_c_name_address \
-+    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-+
-+    case $var in
-+    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-+    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  cat <<__EOF__ > "${ofile}T"
-+#! $SHELL
-+
-+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# 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.
-+
-+# A sed that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="${SED} -e s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$need_lc
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# The default C compiler.
-+CC=$lt_CC
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC
-+
-+# The linker used to build libraries.
-+LD=$lt_LD
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_wl
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_pic_flag
-+pic_mode=$pic_mode
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_compiler_c_o
-+
-+# Can we write directly to a .lo ?
-+compiler_o_lo=$lt_compiler_o_lo
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_link_static_flag
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_no_builtin_flag
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+
-+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
-+
-+# ### END LIBTOOL CONFIG
-+
-+__EOF__
-+
-+  case $host_os in
-+  aix3*)
-+    cat <<\EOF >> "${ofile}T"
-+
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+EOF
-+    ;;
-+  esac
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32* | os2*)
-+    cat <<'EOF' >> "${ofile}T"
-+      # This is a source program that is used to create dlls on Windows
-+      # Don't remove nor modify the starting and closing comments
-+# /* ltdll.c starts here */
-+# #define WIN32_LEAN_AND_MEAN
-+# #include <windows.h>
-+# #undef WIN32_LEAN_AND_MEAN
-+# #include <stdio.h>
-+#
-+# #ifndef __CYGWIN__
-+# #  ifdef __CYGWIN32__
-+# #    define __CYGWIN__ __CYGWIN32__
-+# #  endif
-+# #endif
-+#
-+# #ifdef __cplusplus
-+# extern "C" {
-+# #endif
-+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-+# #ifdef __cplusplus
-+# }
-+# #endif
-+#
-+# #ifdef __CYGWIN__
-+# #include <cygwin/cygwin_dll.h>
-+# DECLARE_CYGWIN_DLL( DllMain );
-+# #endif
-+# HINSTANCE __hDllInstance_base;
-+#
-+# BOOL APIENTRY
-+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-+# {
-+#   __hDllInstance_base = hInst;
-+#   return TRUE;
-+# }
-+# /* ltdll.c ends here */
-+	# This is a source program that is used to create import libraries
-+	# on Windows for dlls which lack them. Don't remove nor modify the
-+	# starting and closing comments
-+# /* impgen.c starts here */
-+# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
-+#
-+#  This file is part of GNU libtool.
-+#
-+#  This program is free software; you can redistribute it and/or modify
-+#  it under the terms of the GNU General Public License as published by
-+#  the Free Software Foundation; either version 2 of the License, or
-+#  (at your option) any later version.
-+#
-+#  This program is distributed in the hope that it will be useful,
-+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#  GNU General Public License for more details.
-+#
-+#  You should have received a copy of the GNU General Public License
-+#  along with this program; if not, write to the Free Software
-+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#  */
-+#
-+# #include <stdio.h>		/* for printf() */
-+# #include <unistd.h>		/* for open(), lseek(), read() */
-+# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
-+# #include <string.h>		/* for strdup() */
-+#
-+# /* O_BINARY isn't required (or even defined sometimes) under Unix */
-+# #ifndef O_BINARY
-+# #define O_BINARY 0
-+# #endif
-+#
-+# static unsigned int
-+# pe_get16 (fd, offset)
-+#      int fd;
-+#      int offset;
-+# {
-+#   unsigned char b[2];
-+#   lseek (fd, offset, SEEK_SET);
-+#   read (fd, b, 2);
-+#   return b[0] + (b[1]<<8);
-+# }
-+#
-+# static unsigned int
-+# pe_get32 (fd, offset)
-+#     int fd;
-+#     int offset;
-+# {
-+#   unsigned char b[4];
-+#   lseek (fd, offset, SEEK_SET);
-+#   read (fd, b, 4);
-+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+# }
-+#
-+# static unsigned int
-+# pe_as32 (ptr)
-+#      void *ptr;
-+# {
-+#   unsigned char *b = ptr;
-+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+# }
-+#
-+# int
-+# main (argc, argv)
-+#     int argc;
-+#     char *argv[];
-+# {
-+#     int dll;
-+#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
-+#     unsigned long export_rva, export_size, nsections, secptr, expptr;
-+#     unsigned long name_rvas, nexp;
-+#     unsigned char *expdata, *erva;
-+#     char *filename, *dll_name;
-+#
-+#     filename = argv[1];
-+#
-+#     dll = open(filename, O_RDONLY|O_BINARY);
-+#     if (dll < 1)
-+# 	return 1;
-+#
-+#     dll_name = filename;
-+#
-+#     for (i=0; filename[i]; i++)
-+# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
-+# 	    dll_name = filename + i +1;
-+#
-+#     pe_header_offset = pe_get32 (dll, 0x3c);
-+#     opthdr_ofs = pe_header_offset + 4 + 20;
-+#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
-+#
-+#     if (num_entries < 1) /* no exports */
-+# 	return 1;
-+#
-+#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
-+#     export_size = pe_get32 (dll, opthdr_ofs + 100);
-+#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
-+#     secptr = (pe_header_offset + 4 + 20 +
-+# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
-+#
-+#     expptr = 0;
-+#     for (i = 0; i < nsections; i++)
-+#     {
-+# 	char sname[8];
-+# 	unsigned long secptr1 = secptr + 40 * i;
-+# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-+# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
-+# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-+# 	lseek(dll, secptr1, SEEK_SET);
-+# 	read(dll, sname, 8);
-+# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
-+# 	{
-+# 	    expptr = fptr + (export_rva - vaddr);
-+# 	    if (export_rva + export_size > vaddr + vsize)
-+# 		export_size = vsize - (export_rva - vaddr);
-+# 	    break;
-+# 	}
-+#     }
-+#
-+#     expdata = (unsigned char*)malloc(export_size);
-+#     lseek (dll, expptr, SEEK_SET);
-+#     read (dll, expdata, export_size);
-+#     erva = expdata - export_rva;
-+#
-+#     nexp = pe_as32 (expdata+24);
-+#     name_rvas = pe_as32 (expdata+32);
-+#
-+#     printf ("EXPORTS\n");
-+#     for (i = 0; i<nexp; i++)
-+#     {
-+# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
-+# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
-+#     }
-+#
-+#     return 0;
-+# }
-+# /* impgen.c ends here */
-+
-+EOF
-+    ;;
-+  esac
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
-+
-+  mv -f "${ofile}T" "$ofile" || \
-+    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
-+  chmod +x "$ofile"
-+fi
-+
-+])# _LT_AC_LTCONFIG_HACK
-+
-+# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-+AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-+
-+# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-+AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-+
-+# AC_ENABLE_SHARED - implement the --enable-shared flag
-+# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-+#   `yes'.
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE(shared,
-+changequote(<<, >>)dnl
-+<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-+changequote([, ])dnl
-+[p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_shared=yes ;;
-+no) enable_shared=no ;;
-+*)
-+  enable_shared=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_shared=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac],
-+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-+])
-+
-+# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_SHARED(no)])
-+
-+# AC_ENABLE_STATIC - implement the --enable-static flag
-+# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-+#   `yes'.
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE(static,
-+changequote(<<, >>)dnl
-+<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-+changequote([, ])dnl
-+[p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_static=yes ;;
-+no) enable_static=no ;;
-+*)
-+  enable_static=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_static=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac],
-+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-+])
-+
-+# AC_DISABLE_STATIC - set the default static flag to --disable-static
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_STATIC(no)])
-+
-+
-+# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-+# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-+#   `yes'.
-+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE(fast-install,
-+changequote(<<, >>)dnl
-+<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-+changequote([, ])dnl
-+[p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_fast_install=yes ;;
-+no) enable_fast_install=no ;;
-+*)
-+  enable_fast_install=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_fast_install=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac],
-+enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-+])
-+
-+# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_FAST_INSTALL(no)])
-+
-+# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-+# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-+#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-+#   `both'.
-+AC_DEFUN([AC_LIBTOOL_PICMODE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+pic_mode=ifelse($#,1,$1,default)])
-+
-+
-+# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-+AC_DEFUN([AC_PATH_TOOL_PREFIX],
-+[AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+  /*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+  ?:/*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-+  ;;
-+  *)
-+  ac_save_MAGIC_CMD="$MAGIC_CMD"
-+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word.  This closes a longstanding sh security hole.
-+  ac_dummy="ifelse([$2], , $PATH, [$2])"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$1; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    egrep "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  MAGIC_CMD="$ac_save_MAGIC_CMD"
-+  ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  AC_MSG_RESULT($MAGIC_CMD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+])
-+
-+
-+# AC_PATH_MAGIC - find a file program which can recognise a shared library
-+AC_DEFUN([AC_PATH_MAGIC],
-+[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-+AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+])
-+
-+
-+# AC_PROG_LD - find the path to the GNU or non-GNU linker
-+AC_DEFUN([AC_PROG_LD],
-+[AC_ARG_WITH(gnu-ld,
-+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  AC_MSG_CHECKING([for ld used by GCC])
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
-+      re_direlt='/[[^/]][[^/]]*/\.\./'
-+      # Canonicalize the path of ld
-+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  AC_MSG_CHECKING([for GNU ld])
-+else
-+  AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some GNU ld's only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+	test "$with_gnu_ld" != no && break
-+      else
-+	test "$with_gnu_ld" != yes && break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  AC_MSG_RESULT($LD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_PROG_LD_GNU
-+])
-+
-+# AC_PROG_LD_GNU -
-+AC_DEFUN([AC_PROG_LD_GNU],
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  lt_cv_prog_gnu_ld=yes
-+else
-+  lt_cv_prog_gnu_ld=no
-+fi])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])
-+
-+# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-+#   -- PORTME Some linkers may need a different reload flag.
-+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-+[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-+[lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+test -n "$reload_flag" && reload_flag=" $reload_flag"
-+])
-+
-+# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-+#  -- PORTME fill in with the dynamic library characteristics
-+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-+[AC_CACHE_CHECK([how to recognise dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given egrep regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+bsdi4*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  case "$host_os" in
-+  rhapsody* | darwin1.[[012]])
-+    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
-+    ;;
-+  *) # Darwin 1.3 on
-+    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-+    ;;
-+  esac
-+  ;;
-+
-+freebsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20*|hpux11*)
-+  lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-+    ;;
-+  *)
-+    case $LD in
-+    *-32|*"-32 ") libmagic=32-bit;;
-+    *-n32|*"-n32 ") libmagic=N32;;
-+    *-64|*"-64 ") libmagic=64-bit;;
-+    *) libmagic=never-match;;
-+    esac
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
-+    ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  case $host_cpu in
-+  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
-+    lt_cv_deplibs_check_method=pass_all ;;
-+  *)
-+    # glibc up to 2.1.1 does not perform some relocations on ARM
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-+  ;;
-+
-+netbsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+openbsd*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
-+  else
-+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  # this will be overridden with pass_all, but let us keep it just in case
-+  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sco3.2v5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=/lib/libc.so
-+  ;;
-+
-+sysv5uw[[78]]* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  case $host_vendor in
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  esac
-+  ;;
-+esac
-+])
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+])
-+
-+
-+# AC_PROG_NM - find the path to a BSD-compatible name lister
-+AC_DEFUN([AC_PROG_NM],
-+[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
-+AC_MSG_CHECKING([for BSD-compatible nm])
-+AC_CACHE_VAL(lt_cv_path_NM,
-+[if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-+    test -z "$ac_dir" && ac_dir=.
-+    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-+    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-+      # Check to see if the nm accepts a BSD-compat flag.
-+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+      #   nm: unknown option "B" ignored
-+      # Tru64's nm complains that /dev/null is an invalid object file
-+      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-+	lt_cv_path_NM="$tmp_nm -B"
-+	break
-+      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-+	lt_cv_path_NM="$tmp_nm -p"
-+	break
-+      else
-+	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	continue # so that we can try to find one that supports BSD flags
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+fi])
-+NM="$lt_cv_path_NM"
-+AC_MSG_RESULT([$NM])
-+])
-+
-+# AC_CHECK_LIBM - check for math library
-+AC_DEFUN([AC_CHECK_LIBM],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-pw32*)
-+  # These system don't have libm
-+  ;;
-+*-ncr-sysv4.3*)
-+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-+  ;;
-+*)
-+  AC_CHECK_LIB(m, main, LIBM="-lm")
-+  ;;
-+esac
-+])
-+
-+# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-+# the libltdl convenience library and LTDLINCL to the include flags for
-+# the libltdl header and adds --enable-ltdl-convenience to the
-+# configure arguments.  Note that LIBLTDL and LTDLINCL are not
-+# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-+# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-+# with '${top_builddir}/' and LTDLINCL will be prefixed with
-+# '${top_srcdir}/' (note the single quotes!).  If your package is not
-+# flat and you're not using automake, define top_builddir and
-+# top_srcdir appropriately in the Makefiles.
-+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  case $enable_ltdl_convenience in
-+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-+  "") enable_ltdl_convenience=yes
-+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-+  esac
-+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+  # For backwards non-gettext consistent compatibility...
-+  INCLTDL="$LTDLINCL"
-+])
-+
-+# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-+# the libltdl installable library and LTDLINCL to the include flags for
-+# the libltdl header and adds --enable-ltdl-install to the configure
-+# arguments.  Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
-+# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-+# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-+# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
-+# with '${top_srcdir}/' (note the single quotes!).  If your package is
-+# not flat and you're not using automake, define top_builddir and
-+# top_srcdir appropriately in the Makefiles.
-+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  AC_CHECK_LIB(ltdl, main,
-+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-+  [if test x"$enable_ltdl_install" = xno; then
-+     AC_MSG_WARN([libltdl not installed, but installation disabled])
-+   else
-+     enable_ltdl_install=yes
-+   fi
-+  ])
-+  if test x"$enable_ltdl_install" = x"yes"; then
-+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+  else
-+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-+    LIBLTDL="-lltdl"
-+    LTDLINCL=
-+  fi
-+  # For backwards non-gettext consistent compatibility...
-+  INCLTDL="$LTDLINCL"
-+])
-+
-+# old names
-+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-+
-+# This is just to silence aclocal about the macro not being used
-+ifelse([AC_DISABLE_FAST_INSTALL])
-+
-+# NOTE: This macro has been submitted for inclusion into   #
-+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-+#  a released version of Autoconf we should remove this    #
-+#  macro and use it instead.                               #
-+# LT_AC_PROG_SED
-+# --------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible.  Prefer GNU sed if found.
-+AC_DEFUN([LT_AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_executable_p="test -f"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
-+      fi
-+    done
-+  done
-+done
-+
-+  # Create a temporary directory, and hook for its removal unless debugging.
-+$debug ||
-+{
-+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+  trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+
-+# Create a (secure) tmp directory for tmp files.
-+: ${TMPDIR=/tmp}
-+{
-+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=$TMPDIR/sed$$-$RANDOM
-+  (umask 077 && mkdir $tmp)
-+} ||
-+{
-+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-+   { (exit 1); exit 1; }
-+}
-+  _max=0
-+  _count=0
-+  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+  # along with /bin/sed that truncates output.
-+  for _sed in $_sed_list /usr/xpg4/bin/sed; do
-+    test ! -f ${_sed} && break
-+    cat /dev/null > "$tmp/sed.in"
-+    _count=0
-+    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
-+    # Check for GNU sed and select it if it is found.
-+    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
-+      lt_cv_path_SED=${_sed}
-+      break
-+    fi
-+    while true; do
-+      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
-+      mv "$tmp/sed.tmp" "$tmp/sed.in"
-+      cp "$tmp/sed.in" "$tmp/sed.nl"
-+      echo >>"$tmp/sed.nl"
-+      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
-+      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
-+      # 40000 chars as input seems more than enough
-+      test $_count -gt 10 && break
-+      _count=`expr $_count + 1`
-+      if test $_count -gt $_max; then
-+        _max=$_count
-+        lt_cv_path_SED=$_sed
-+      fi
-+    done
-+  done
-+  rm -rf "$tmp"
-+])
-+if test "X$SED" != "X"; then
-+  lt_cv_path_SED=$SED
-+else
-+  SED=$lt_cv_path_SED
-+fi
-+AC_MSG_RESULT([$SED])
-+])
-+
---- metamail-2.7.orig/configure
-+++ metamail-2.7/configure
-@@ -0,0 +1,7333 @@
-+#! /bin/sh
-+
-+# Guess values for system-dependent variables and create Makefiles.
-+# Generated automatically using autoconf version 2.13 
-+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-+#
-+# This configure script is free software; the Free Software Foundation
-+# gives unlimited permission to copy, distribute and modify it.
-+
-+# Defaults:
-+ac_help=
-+ac_default_prefix=/usr/local
-+# Any additions from configure.in:
-+ac_help="$ac_help
-+  --enable-maintainer-mode enable make rules and dependencies not useful
-+                          (and sometimes confusing) to the casual installer"
-+ac_help="$ac_help
-+  --enable-shared[=PKGS]  build shared libraries [default=yes]"
-+ac_help="$ac_help
-+  --enable-static[=PKGS]  build static libraries [default=yes]"
-+ac_help="$ac_help
-+  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-+ac_help="$ac_help
-+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-+
-+# Find the correct PATH separator.  Usually this is `:', but
-+# DJGPP uses `;' like DOS.
-+if test "X${PATH_SEPARATOR+set}" != Xset; then
-+  UNAME=${UNAME-`uname 2>/dev/null`}
-+  case X$UNAME in
-+    *-DOS) lt_cv_sys_path_separator=';' ;;
-+    *)     lt_cv_sys_path_separator=':' ;;
-+  esac
-+  PATH_SEPARATOR=$lt_cv_sys_path_separator
-+fi
-+
-+
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-+  ;;
-+esac
-+
-+echo=${ECHO-echo}
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec $SHELL "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+
-+EOF
-+  exit 0
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+if test -z "$ECHO"; then
-+if test "X${echo_test_string+set}" != Xset; then
-+# find a string as large as possible, as long as the shell can cope with it
-+  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+       echo_test_string="`eval $cmd`" &&
-+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-+    then
-+      break
-+    fi
-+  done
-+fi
-+
-+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+   test "X$echo_testing_string" = "X$echo_test_string"; then
-+  :
-+else
-+  # The Solaris, AIX, and Digital Unix default echo programs unquote
-+  # backslashes.  This makes it impossible to quote backslashes using
-+  #   echo "$something" | sed 's/\\/\\\\/g'
-+  #
-+  # So, first we look for a working echo in the user's PATH.
-+
-+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for dir in $PATH /usr/ucb; do
-+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      echo="$dir/echo"
-+      break
-+    fi
-+  done
-+  IFS="$save_ifs"
-+
-+  if test "X$echo" = Xecho; then
-+    # We didn't find a better echo, so look for alternatives.
-+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      # This shell has a builtin print -r that does the trick.
-+      echo='print -r'
-+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-+      # If we have ksh, try running configure again with it.
-+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+      export ORIGINAL_CONFIG_SHELL
-+      CONFIG_SHELL=/bin/ksh
-+      export CONFIG_SHELL
-+      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-+    else
-+      # Try using printf.
-+      echo='printf %s\n'
-+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+	 test "X$echo_testing_string" = "X$echo_test_string"; then
-+	# Cool, printf works
-+	:
-+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	export CONFIG_SHELL
-+	SHELL="$CONFIG_SHELL"
-+	export SHELL
-+	echo="$CONFIG_SHELL $0 --fallback-echo"
-+      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	echo="$CONFIG_SHELL $0 --fallback-echo"
-+      else
-+	# maybe with a smaller string...
-+	prev=:
-+
-+	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-+	  then
-+	    break
-+	  fi
-+	  prev="$cmd"
-+	done
-+
-+	if test "$prev" != 'sed 50q "$0"'; then
-+	  echo_test_string=`eval $prev`
-+	  export echo_test_string
-+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-+	else
-+	  # Oops.  We lost completely, so just stick with echo.
-+	  echo=echo
-+	fi
-+      fi
-+    fi
-+  fi
-+fi
-+fi
-+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+ECHO=$echo
-+if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-+   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-+fi
-+
-+
-+ac_help="$ac_help
-+  --disable-libtool-lock  avoid locking (might break parallel builds)"
-+ac_help="$ac_help
-+  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-+
-+# Initialize some variables set by options.
-+# The variables have the same names as the options, with
-+# dashes changed to underlines.
-+build=NONE
-+cache_file=./config.cache
-+exec_prefix=NONE
-+host=NONE
-+no_create=
-+nonopt=NONE
-+no_recursion=
-+prefix=NONE
-+program_prefix=NONE
-+program_suffix=NONE
-+program_transform_name=s,x,x,
-+silent=
-+site=
-+srcdir=
-+target=NONE
-+verbose=
-+x_includes=NONE
-+x_libraries=NONE
-+bindir='${exec_prefix}/bin'
-+sbindir='${exec_prefix}/sbin'
-+libexecdir='${exec_prefix}/libexec'
-+datadir='${prefix}/share'
-+sysconfdir='${prefix}/etc'
-+sharedstatedir='${prefix}/com'
-+localstatedir='${prefix}/var'
-+libdir='${exec_prefix}/lib'
-+includedir='${prefix}/include'
-+oldincludedir='/usr/include'
-+infodir='${prefix}/info'
-+mandir='${prefix}/man'
-+
-+# Initialize some other variables.
-+subdirs=
-+MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+# Maximum number of lines to put in a shell here document.
-+ac_max_here_lines=12
-+
-+ac_prev=
-+for ac_option
-+do
-+
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$ac_prev"; then
-+    eval "$ac_prev=\$ac_option"
-+    ac_prev=
-+    continue
-+  fi
-+
-+  case "$ac_option" in
-+  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) ac_optarg= ;;
-+  esac
-+
-+  # Accept the important Cygnus configure options, so we can diagnose typos.
-+
-+  case "$ac_option" in
-+
-+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-+    ac_prev=bindir ;;
-+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-+    bindir="$ac_optarg" ;;
-+
-+  -build | --build | --buil | --bui | --bu)
-+    ac_prev=build ;;
-+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-+    build="$ac_optarg" ;;
-+
-+  -cache-file | --cache-file | --cache-fil | --cache-fi \
-+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-+    ac_prev=cache_file ;;
-+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-+    cache_file="$ac_optarg" ;;
-+
-+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+    ac_prev=datadir ;;
-+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-+  | --da=*)
-+    datadir="$ac_optarg" ;;
-+
-+  -disable-* | --disable-*)
-+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-+    # Reject names that are not valid shell variable names.
-+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-+    fi
-+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-+    eval "enable_${ac_feature}=no" ;;
-+
-+  -enable-* | --enable-*)
-+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-+    # Reject names that are not valid shell variable names.
-+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-+    fi
-+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-+    case "$ac_option" in
-+      *=*) ;;
-+      *) ac_optarg=yes ;;
-+    esac
-+    eval "enable_${ac_feature}='$ac_optarg'" ;;
-+
-+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-+  | --exec | --exe | --ex)
-+    ac_prev=exec_prefix ;;
-+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-+  | --exec=* | --exe=* | --ex=*)
-+    exec_prefix="$ac_optarg" ;;
-+
-+  -gas | --gas | --ga | --g)
-+    # Obsolete; use --with-gas.
-+    with_gas=yes ;;
-+
-+  -help | --help | --hel | --he)
-+    # Omit some internal or obsolete options to make the list less imposing.
-+    # This message is too long to be a string in the A/UX 3.1 sh.
-+    cat << EOF
-+Usage: configure [options] [host]
-+Options: [defaults in brackets after descriptions]
-+Configuration:
-+  --cache-file=FILE       cache test results in FILE
-+  --help                  print this message
-+  --no-create             do not create output files
-+  --quiet, --silent       do not print \`checking...' messages
-+  --version               print the version of autoconf that created configure
-+Directory and file names:
-+  --prefix=PREFIX         install architecture-independent files in PREFIX
-+                          [$ac_default_prefix]
-+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-+                          [same as prefix]
-+  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-+  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-+  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-+  --datadir=DIR           read-only architecture-independent data in DIR
-+                          [PREFIX/share]
-+  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-+  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-+                          [PREFIX/com]
-+  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-+  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-+  --includedir=DIR        C header files in DIR [PREFIX/include]
-+  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-+  --infodir=DIR           info documentation in DIR [PREFIX/info]
-+  --mandir=DIR            man documentation in DIR [PREFIX/man]
-+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-+  --program-prefix=PREFIX prepend PREFIX to installed program names
-+  --program-suffix=SUFFIX append SUFFIX to installed program names
-+  --program-transform-name=PROGRAM
-+                          run sed PROGRAM on installed program names
-+EOF
-+    cat << EOF
-+Host type:
-+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-+  --host=HOST             configure for HOST [guessed]
-+  --target=TARGET         configure for TARGET [TARGET=HOST]
-+Features and packages:
-+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --x-includes=DIR        X include files are in DIR
-+  --x-libraries=DIR       X library files are in DIR
-+EOF
-+    if test -n "$ac_help"; then
-+      echo "--enable and --with options recognized:$ac_help"
-+    fi
-+    exit 0 ;;
-+
-+  -host | --host | --hos | --ho)
-+    ac_prev=host ;;
-+  -host=* | --host=* | --hos=* | --ho=*)
-+    host="$ac_optarg" ;;
-+
-+  -includedir | --includedir | --includedi | --included | --include \
-+  | --includ | --inclu | --incl | --inc)
-+    ac_prev=includedir ;;
-+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-+  | --includ=* | --inclu=* | --incl=* | --inc=*)
-+    includedir="$ac_optarg" ;;
-+
-+  -infodir | --infodir | --infodi | --infod | --info | --inf)
-+    ac_prev=infodir ;;
-+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-+    infodir="$ac_optarg" ;;
-+
-+  -libdir | --libdir | --libdi | --libd)
-+    ac_prev=libdir ;;
-+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-+    libdir="$ac_optarg" ;;
-+
-+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-+  | --libexe | --libex | --libe)
-+    ac_prev=libexecdir ;;
-+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-+  | --libexe=* | --libex=* | --libe=*)
-+    libexecdir="$ac_optarg" ;;
-+
-+  -localstatedir | --localstatedir | --localstatedi | --localstated \
-+  | --localstate | --localstat | --localsta | --localst \
-+  | --locals | --local | --loca | --loc | --lo)
-+    ac_prev=localstatedir ;;
-+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+    localstatedir="$ac_optarg" ;;
-+
-+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-+    ac_prev=mandir ;;
-+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-+    mandir="$ac_optarg" ;;
-+
-+  -nfp | --nfp | --nf)
-+    # Obsolete; use --without-fp.
-+    with_fp=no ;;
-+
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c)
-+    no_create=yes ;;
-+
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+    no_recursion=yes ;;
-+
-+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-+  | --oldin | --oldi | --old | --ol | --o)
-+    ac_prev=oldincludedir ;;
-+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-+    oldincludedir="$ac_optarg" ;;
-+
-+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+    ac_prev=prefix ;;
-+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+    prefix="$ac_optarg" ;;
-+
-+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-+  | --program-pre | --program-pr | --program-p)
-+    ac_prev=program_prefix ;;
-+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-+    program_prefix="$ac_optarg" ;;
-+
-+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-+  | --program-suf | --program-su | --program-s)
-+    ac_prev=program_suffix ;;
-+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-+    program_suffix="$ac_optarg" ;;
-+
-+  -program-transform-name | --program-transform-name \
-+  | --program-transform-nam | --program-transform-na \
-+  | --program-transform-n | --program-transform- \
-+  | --program-transform | --program-transfor \
-+  | --program-transfo | --program-transf \
-+  | --program-trans | --program-tran \
-+  | --progr-tra | --program-tr | --program-t)
-+    ac_prev=program_transform_name ;;
-+  -program-transform-name=* | --program-transform-name=* \
-+  | --program-transform-nam=* | --program-transform-na=* \
-+  | --program-transform-n=* | --program-transform-=* \
-+  | --program-transform=* | --program-transfor=* \
-+  | --program-transfo=* | --program-transf=* \
-+  | --program-trans=* | --program-tran=* \
-+  | --progr-tra=* | --program-tr=* | --program-t=*)
-+    program_transform_name="$ac_optarg" ;;
-+
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil)
-+    silent=yes ;;
-+
-+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-+    ac_prev=sbindir ;;
-+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-+  | --sbi=* | --sb=*)
-+    sbindir="$ac_optarg" ;;
-+
-+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-+  | --sharedst | --shareds | --shared | --share | --shar \
-+  | --sha | --sh)
-+    ac_prev=sharedstatedir ;;
-+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-+  | --sha=* | --sh=*)
-+    sharedstatedir="$ac_optarg" ;;
-+
-+  -site | --site | --sit)
-+    ac_prev=site ;;
-+  -site=* | --site=* | --sit=*)
-+    site="$ac_optarg" ;;
-+
-+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-+    ac_prev=srcdir ;;
-+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-+    srcdir="$ac_optarg" ;;
-+
-+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-+  | --syscon | --sysco | --sysc | --sys | --sy)
-+    ac_prev=sysconfdir ;;
-+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-+    sysconfdir="$ac_optarg" ;;
-+
-+  -target | --target | --targe | --targ | --tar | --ta | --t)
-+    ac_prev=target ;;
-+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-+    target="$ac_optarg" ;;
-+
-+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-+    verbose=yes ;;
-+
-+  -version | --version | --versio | --versi | --vers)
-+    echo "configure generated by autoconf version 2.13"
-+    exit 0 ;;
-+
-+  -with-* | --with-*)
-+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-+    # Reject names that are not valid shell variable names.
-+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-+    fi
-+    ac_package=`echo $ac_package| sed 's/-/_/g'`
-+    case "$ac_option" in
-+      *=*) ;;
-+      *) ac_optarg=yes ;;
-+    esac
-+    eval "with_${ac_package}='$ac_optarg'" ;;
-+
-+  -without-* | --without-*)
-+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-+    # Reject names that are not valid shell variable names.
-+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-+    fi
-+    ac_package=`echo $ac_package| sed 's/-/_/g'`
-+    eval "with_${ac_package}=no" ;;
-+
-+  --x)
-+    # Obsolete; use --with-x.
-+    with_x=yes ;;
-+
-+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-+  | --x-incl | --x-inc | --x-in | --x-i)
-+    ac_prev=x_includes ;;
-+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-+    x_includes="$ac_optarg" ;;
-+
-+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-+    ac_prev=x_libraries ;;
-+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-+    x_libraries="$ac_optarg" ;;
-+
-+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-+    ;;
-+
-+  *)
-+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-+      echo "configure: warning: $ac_option: invalid host type" 1>&2
-+    fi
-+    if test "x$nonopt" != xNONE; then
-+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-+    fi
-+    nonopt="$ac_option"
-+    ;;
-+
-+  esac
-+done
-+
-+if test -n "$ac_prev"; then
-+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-+fi
-+
-+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-+
-+# File descriptor usage:
-+# 0 standard input
-+# 1 file creation
-+# 2 errors and warnings
-+# 3 some systems may open it to /dev/tty
-+# 4 used on the Kubota Titan
-+# 6 checking for... messages and results
-+# 5 compiler messages saved in config.log
-+if test "$silent" = yes; then
-+  exec 6>/dev/null
-+else
-+  exec 6>&1
-+fi
-+exec 5>./config.log
-+
-+echo "\
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+" 1>&5
-+
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Also quote any args containing shell metacharacters.
-+ac_configure_args=
-+for ac_arg
-+do
-+  case "$ac_arg" in
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c) ;;
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-+  esac
-+done
-+
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -rf conftest* confdefs.h
-+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-+echo > confdefs.h
-+
-+# A filename unique to this package, relative to the directory that
-+# configure is in, which we can look for to find out if srcdir is correct.
-+ac_unique_file=src/metamail/metamail.c
-+
-+# Find the source files, if location was not specified.
-+if test -z "$srcdir"; then
-+  ac_srcdir_defaulted=yes
-+  # Try the directory containing this script, then its parent.
-+  ac_prog=$0
-+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-+  srcdir=$ac_confdir
-+  if test ! -r $srcdir/$ac_unique_file; then
-+    srcdir=..
-+  fi
-+else
-+  ac_srcdir_defaulted=no
-+fi
-+if test ! -r $srcdir/$ac_unique_file; then
-+  if test "$ac_srcdir_defaulted" = yes; then
-+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-+  else
-+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-+  fi
-+fi
-+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-+
-+# Prefer explicitly selected file to automatically selected ones.
-+if test -z "$CONFIG_SITE"; then
-+  if test "x$prefix" != xNONE; then
-+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+  else
-+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+  fi
-+fi
-+for ac_site_file in $CONFIG_SITE; do
-+  if test -r "$ac_site_file"; then
-+    echo "loading site script $ac_site_file"
-+    . "$ac_site_file"
-+  fi
-+done
-+
-+if test -r "$cache_file"; then
-+  echo "loading cache $cache_file"
-+  . $cache_file
-+else
-+  echo "creating cache $cache_file"
-+  > $cache_file
-+fi
-+
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+ac_exeext=
-+ac_objext=o
-+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-+    ac_n= ac_c='
-+' ac_t='	'
-+  else
-+    ac_n=-n ac_c= ac_t=
-+  fi
-+else
-+  ac_n= ac_c='\c' ac_t=
-+fi
-+
-+
-+ac_aux_dir=
-+for ac_dir in config $srcdir/config; do
-+  if test -f $ac_dir/install-sh; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install-sh -c"
-+    break
-+  elif test -f $ac_dir/install.sh; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install.sh -c"
-+    break
-+  fi
-+done
-+if test -z "$ac_aux_dir"; then
-+  { echo "configure: error: can not find install-sh or install.sh in config $srcdir/config" 1>&2; exit 1; }
-+fi
-+ac_config_guess=$ac_aux_dir/config.guess
-+ac_config_sub=$ac_aux_dir/config.sub
-+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-+
-+
-+
-+
-+am__api_version="1.4"
-+# Find a good install program.  We prefer a C program (faster),
-+# so one script is as good as another.  But avoid the broken or
-+# incompatible versions:
-+# SysV /etc/install, /usr/sbin/install
-+# SunOS /usr/etc/install
-+# IRIX /sbin/install
-+# AIX /bin/install
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+# ./install, which can be erroneously created by make from ./install.sh.
-+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+echo "configure:734: checking for a BSD compatible install" >&5
-+if test -z "$INSTALL"; then
-+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-+  for ac_dir in $PATH; do
-+    # Account for people who put trailing slashes in PATH elements.
-+    case "$ac_dir/" in
-+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-+    *)
-+      # OSF1 and SCO ODT 3.0 have their own names for install.
-+      # Don't use installbsd from OSF since it installs stuff as root
-+      # by default.
-+      for ac_prog in ginstall scoinst install; do
-+        if test -f $ac_dir/$ac_prog; then
-+	  if test $ac_prog = install &&
-+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-+	    # AIX install.  It has an incompatible calling convention.
-+	    :
-+	  else
-+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-+	    break 2
-+	  fi
-+	fi
-+      done
-+      ;;
-+    esac
-+  done
-+  IFS="$ac_save_IFS"
-+
-+fi
-+  if test "${ac_cv_path_install+set}" = set; then
-+    INSTALL="$ac_cv_path_install"
-+  else
-+    # As a last resort, use the slow shell script.  We don't cache a
-+    # path for INSTALL within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the path is relative.
-+    INSTALL="$ac_install_sh"
-+  fi
-+fi
-+echo "$ac_t""$INSTALL" 1>&6
-+
-+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-+# It thinks the first close brace ends the variable substitution.
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-+echo "configure:787: checking whether build environment is sane" >&5
-+# Just in case
-+sleep 1
-+echo timestamp > conftestfile
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-+   if test "$*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftestfile`
-+   fi
-+   if test "$*" != "X $srcdir/configure conftestfile" \
-+      && test "$*" != "X conftestfile $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment" 1>&2; exit 1; }
-+   fi
-+
-+   test "$2" = conftestfile
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   { echo "configure: error: newly created file is older than distributed files!
-+Check your system clock" 1>&2; exit 1; }
-+fi
-+rm -f conftest*
-+echo "$ac_t""yes" 1>&6
-+if test "$program_transform_name" = s,x,x,; then
-+  program_transform_name=
-+else
-+  # Double any \ or $.  echo might interpret backslashes.
-+  cat <<\EOF_SED > conftestsed
-+s,\\,\\\\,g; s,\$,$$,g
-+EOF_SED
-+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-+  rm -f conftestsed
-+fi
-+test "$program_prefix" != NONE &&
-+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-+# Use a double $ so make ignores it.
-+test "$program_suffix" != NONE &&
-+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-+
-+# sed with no file args requires a program.
-+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-+
-+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-+echo "configure:844: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftestmake <<\EOF
-+all:
-+	@echo 'ac_maketemp="${MAKE}"'
-+EOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-+if test -n "$ac_maketemp"; then
-+  eval ac_cv_prog_make_${ac_make}_set=yes
-+else
-+  eval ac_cv_prog_make_${ac_make}_set=no
-+fi
-+rm -f conftestmake
-+fi
-+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  SET_MAKE=
-+else
-+  echo "$ac_t""no" 1>&6
-+  SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+
-+PACKAGE=metamail
-+
-+VERSION=0.0.1
-+
-+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-+fi
-+cat >> confdefs.h <<EOF
-+#define PACKAGE "$PACKAGE"
-+EOF
-+
-+cat >> confdefs.h <<EOF
-+#define VERSION "$VERSION"
-+EOF
-+
-+
-+
-+missing_dir=`cd $ac_aux_dir && pwd`
-+echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-+echo "configure:890: checking for working aclocal-${am__api_version}" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+   ACLOCAL=aclocal-${am__api_version}
-+   echo "$ac_t""found" 1>&6
-+else
-+   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-+echo "configure:903: checking for working autoconf" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOCONF=autoconf
-+   echo "$ac_t""found" 1>&6
-+else
-+   AUTOCONF="$missing_dir/missing autoconf"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-+echo "configure:916: checking for working automake-${am__api_version}" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-${am__api_version}
-+   echo "$ac_t""found" 1>&6
-+else
-+   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-+echo "configure:929: checking for working autoheader" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOHEADER=autoheader
-+   echo "$ac_t""found" 1>&6
-+else
-+   AUTOHEADER="$missing_dir/missing autoheader"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-+echo "configure:942: checking for working makeinfo" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-+   MAKEINFO=makeinfo
-+   echo "$ac_t""found" 1>&6
-+else
-+   MAKEINFO="$missing_dir/missing makeinfo"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+
-+echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-+echo "configure:956: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then
-+  enableval="$enable_maintainer_mode"
-+  USE_MAINTAINER_MODE=$enableval
-+else
-+  USE_MAINTAINER_MODE=no
-+fi
-+
-+  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-+  
-+
-+if test $USE_MAINTAINER_MODE = yes; then
-+  MAINTAINER_MODE_TRUE=
-+  MAINTAINER_MODE_FALSE='#'
-+else
-+  MAINTAINER_MODE_TRUE='#'
-+  MAINTAINER_MODE_FALSE=
-+fi
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  
-+
-+
-+
-+# Make sure we can run config.sub.
-+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-+fi
-+
-+echo $ac_n "checking host system type""... $ac_c" 1>&6
-+echo "configure:986: checking host system type" >&5
-+
-+host_alias=$host
-+case "$host_alias" in
-+NONE)
-+  case $nonopt in
-+  NONE)
-+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-+    fi ;;
-+  *) host_alias=$nonopt ;;
-+  esac ;;
-+esac
-+
-+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+echo "$ac_t""$host" 1>&6
-+
-+
-+# Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:1010: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CC="gcc"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+if test -z "$CC"; then
-+  # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:1040: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_prog_rejected=no
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-+        ac_prog_rejected=yes
-+	continue
-+      fi
-+      ac_cv_prog_CC="cc"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+if test $ac_prog_rejected = yes; then
-+  # We found a bogon in the path, so make sure we never use it.
-+  set dummy $ac_cv_prog_CC
-+  shift
-+  if test $# -gt 0; then
-+    # We chose a different compiler from the bogus one.
-+    # However, it has the same basename, so the bogon will be chosen
-+    # first if we set CC to just the basename; use the full file name.
-+    shift
-+    set dummy "$ac_dir/$ac_word" "$@"
-+    shift
-+    ac_cv_prog_CC="$@"
-+  fi
-+fi
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+  if test -z "$CC"; then
-+    case "`uname -s`" in
-+    *win32* | *WIN32*)
-+      # Extract the first word of "cl", so it can be a program name with args.
-+set dummy cl; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:1091: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CC="cl"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+ ;;
-+    esac
-+  fi
-+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-+fi
-+
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-+echo "configure:1123: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+cat > conftest.$ac_ext << EOF
-+
-+#line 1134 "configure"
-+#include "confdefs.h"
-+
-+main(){return(0);}
-+EOF
-+if { (eval echo configure:1139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  ac_cv_prog_cc_works=yes
-+  # If we can't run a trivial program, we are probably using a cross compiler.
-+  if (./conftest; exit) 2>/dev/null; then
-+    ac_cv_prog_cc_cross=no
-+  else
-+    ac_cv_prog_cc_cross=yes
-+  fi
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  ac_cv_prog_cc_works=no
-+fi
-+rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-+if test $ac_cv_prog_cc_works = no; then
-+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-+fi
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-+echo "configure:1165: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-+echo "configure:1170: checking whether we are using GNU C" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.c <<EOF
-+#ifdef __GNUC__
-+  yes;
-+#endif
-+EOF
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+  ac_cv_prog_gcc=yes
-+else
-+  ac_cv_prog_gcc=no
-+fi
-+fi
-+
-+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+
-+if test $ac_cv_prog_gcc = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
-+
-+ac_test_CFLAGS="${CFLAGS+set}"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS=
-+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  echo 'void f(){}' > conftest.c
-+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-+  ac_cv_prog_cc_g=yes
-+else
-+  ac_cv_prog_cc_g=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS="$ac_save_CFLAGS"
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
-+
-+# Find the correct PATH separator.  Usually this is `:', but
-+# DJGPP uses `;' like DOS.
-+if test "X${PATH_SEPARATOR+set}" != Xset; then
-+  UNAME=${UNAME-`uname 2>/dev/null`}
-+  case X$UNAME in
-+    *-DOS) lt_cv_sys_path_separator=';' ;;
-+    *)     lt_cv_sys_path_separator=':' ;;
-+  esac
-+  PATH_SEPARATOR=$lt_cv_sys_path_separator
-+fi
-+
-+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-+echo "configure:1241: checking for Cygwin environment" >&5
-+if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1246 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+#ifndef __CYGWIN__
-+#define __CYGWIN__ __CYGWIN32__
-+#endif
-+return __CYGWIN__;
-+; return 0; }
-+EOF
-+if { (eval echo configure:1257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_cygwin=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_cygwin=no
-+fi
-+rm -f conftest*
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_cygwin" 1>&6
-+CYGWIN=
-+test "$ac_cv_cygwin" = yes && CYGWIN=yes
-+echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-+echo "configure:1274: checking for mingw32 environment" >&5
-+if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1279 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+return __MINGW32__;
-+; return 0; }
-+EOF
-+if { (eval echo configure:1286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_mingw32=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_mingw32=no
-+fi
-+rm -f conftest*
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_mingw32" 1>&6
-+MINGW32=
-+test "$ac_cv_mingw32" = yes && MINGW32=yes
-+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-+echo "configure:1303: checking how to run the C preprocessor" >&5
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+    # This must be in double quotes, not single quotes, because CPP may get
-+  # substituted into the Makefile and "${CC-cc}" will confuse make.
-+  CPP="${CC-cc} -E"
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp.
-+  cat > conftest.$ac_ext <<EOF
-+#line 1318 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -E -traditional-cpp"
-+  cat > conftest.$ac_ext <<EOF
-+#line 1335 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -nologo -E"
-+  cat > conftest.$ac_ext <<EOF
-+#line 1352 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP=/lib/cpp
-+fi
-+rm -f conftest*
-+fi
-+rm -f conftest*
-+fi
-+rm -f conftest*
-+  ac_cv_prog_CPP="$CPP"
-+fi
-+  CPP="$ac_cv_prog_CPP"
-+else
-+  ac_cv_prog_CPP="$CPP"
-+fi
-+echo "$ac_t""$CPP" 1>&6
-+
-+# Check whether --enable-shared or --disable-shared was given.
-+if test "${enable_shared+set}" = set; then
-+  enableval="$enable_shared"
-+  p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_shared=yes ;;
-+no) enable_shared=no ;;
-+*)
-+  enable_shared=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_shared=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac
-+else
-+  enable_shared=yes
-+fi
-+
-+# Check whether --enable-static or --disable-static was given.
-+if test "${enable_static+set}" = set; then
-+  enableval="$enable_static"
-+  p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_static=yes ;;
-+no) enable_static=no ;;
-+*)
-+  enable_static=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_static=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac
-+else
-+  enable_static=yes
-+fi
-+
-+# Check whether --enable-fast-install or --disable-fast-install was given.
-+if test "${enable_fast_install+set}" = set; then
-+  enableval="$enable_fast_install"
-+  p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_fast_install=yes ;;
-+no) enable_fast_install=no ;;
-+*)
-+  enable_fast_install=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_fast_install=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac
-+else
-+  enable_fast_install=yes
-+fi
-+
-+echo $ac_n "checking build system type""... $ac_c" 1>&6
-+echo "configure:1452: checking build system type" >&5
-+
-+build_alias=$build
-+case "$build_alias" in
-+NONE)
-+  case $nonopt in
-+  NONE) build_alias=$host_alias ;;
-+  *) build_alias=$nonopt ;;
-+  esac ;;
-+esac
-+
-+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+echo "$ac_t""$build" 1>&6
-+
-+# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+if test "${with_gnu_ld+set}" = set; then
-+  withval="$with_gnu_ld"
-+  test "$withval" = no || with_gnu_ld=yes
-+else
-+  with_gnu_ld=no
-+fi
-+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-+echo "configure:1481: checking for ld used by GCC" >&5
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [\\/]* | [A-Za-z]:[\\/]*)
-+      re_direlt='/[^/][^/]*/\.\./'
-+      # Canonicalize the path of ld
-+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-+echo "configure:1511: checking for GNU ld" >&5
-+else
-+  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-+echo "configure:1514: checking for non-GNU ld" >&5
-+fi
-+if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -z "$LD"; then
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some GNU ld's only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+	test "$with_gnu_ld" != no && break
-+      else
-+	test "$with_gnu_ld" != yes && break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi
-+fi
-+
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  echo "$ac_t""$LD" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-+echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-+echo "configure:1549: checking if the linker ($LD) is GNU ld" >&5
-+if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  lt_cv_prog_gnu_ld=yes
-+else
-+  lt_cv_prog_gnu_ld=no
-+fi
-+fi
-+
-+echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+
-+
-+echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-+echo "configure:1566: checking for $LD option to reload object files" >&5
-+if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  lt_cv_ld_reload_flag='-r'
-+fi
-+
-+echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-+reload_flag=$lt_cv_ld_reload_flag
-+test -n "$reload_flag" && reload_flag=" $reload_flag"
-+
-+echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-+echo "configure:1578: checking for BSD-compatible nm" >&5
-+if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-+    test -z "$ac_dir" && ac_dir=.
-+    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-+    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-+      # Check to see if the nm accepts a BSD-compat flag.
-+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+      #   nm: unknown option "B" ignored
-+      # Tru64's nm complains that /dev/null is an invalid object file
-+      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-+	lt_cv_path_NM="$tmp_nm -B"
-+	break
-+      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-+	lt_cv_path_NM="$tmp_nm -p"
-+	break
-+      else
-+	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	continue # so that we can try to find one that supports BSD flags
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+fi
-+fi
-+
-+NM="$lt_cv_path_NM"
-+echo "$ac_t""$NM" 1>&6
-+
-+echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
-+echo "configure:1616: checking for a sed that does not truncate output" >&5
-+if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  # Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_executable_p="test -f"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
-+      fi
-+    done
-+  done
-+done
-+
-+  # Create a temporary directory, and hook for its removal unless debugging.
-+$debug ||
-+{
-+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+  trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+
-+# Create a (secure) tmp directory for tmp files.
-+: ${TMPDIR=/tmp}
-+{
-+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=$TMPDIR/sed$$-$RANDOM
-+  (umask 077 && mkdir $tmp)
-+} ||
-+{
-+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-+   { (exit 1); exit 1; }
-+}
-+  _max=0
-+  _count=0
-+  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+  # along with /bin/sed that truncates output.
-+  for _sed in $_sed_list /usr/xpg4/bin/sed; do
-+    test ! -f ${_sed} && break
-+    cat /dev/null > "$tmp/sed.in"
-+    _count=0
-+    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
-+    # Check for GNU sed and select it if it is found.
-+    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
-+      lt_cv_path_SED=${_sed}
-+      break
-+    fi
-+    while true; do
-+      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
-+      mv "$tmp/sed.tmp" "$tmp/sed.in"
-+      cp "$tmp/sed.in" "$tmp/sed.nl"
-+      echo >>"$tmp/sed.nl"
-+      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
-+      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
-+      # 40000 chars as input seems more than enough
-+      test $_count -gt 10 && break
-+      _count=`expr $_count + 1`
-+      if test $_count -gt $_max; then
-+        _max=$_count
-+        lt_cv_path_SED=$_sed
-+      fi
-+    done
-+  done
-+  rm -rf "$tmp"
-+
-+fi
-+
-+if test "X$SED" != "X"; then
-+  lt_cv_path_SED=$SED
-+else
-+  SED=$lt_cv_path_SED
-+fi
-+echo "$ac_t""$SED" 1>&6
-+
-+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-+echo "configure:1700: checking whether ln -s works" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  rm -f conftestdata
-+if ln -s X conftestdata 2>/dev/null
-+then
-+  rm -f conftestdata
-+  ac_cv_prog_LN_S="ln -s"
-+else
-+  ac_cv_prog_LN_S=ln
-+fi
-+fi
-+LN_S="$ac_cv_prog_LN_S"
-+if test "$ac_cv_prog_LN_S" = "ln -s"; then
-+  echo "$ac_t""yes" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
-+echo "configure:1721: checking how to recognise dependent libraries" >&5
-+if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given egrep regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+bsdi4*)
-+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  case "$host_os" in
-+  rhapsody* | darwin1.[012])
-+    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
-+    ;;
-+  *) # Darwin 1.3 on
-+    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-+    ;;
-+  esac
-+  ;;
-+
-+freebsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20*|hpux11*)
-+  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-+    ;;
-+  *)
-+    case $LD in
-+    *-32|*"-32 ") libmagic=32-bit;;
-+    *-n32|*"-n32 ") libmagic=N32;;
-+    *-64|*"-64 ") libmagic=64-bit;;
-+    *) libmagic=never-match;;
-+    esac
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-+    ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  case $host_cpu in
-+  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
-+    lt_cv_deplibs_check_method=pass_all ;;
-+  *)
-+    # glibc up to 2.1.1 does not perform some relocations on ARM
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-+  ;;
-+
-+netbsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+openbsd*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+  else
-+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  # this will be overridden with pass_all, but let us keep it just in case
-+  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sco3.2v5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=/lib/libc.so
-+  ;;
-+
-+sysv5uw[78]* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  case $host_vendor in
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  esac
-+  ;;
-+esac
-+
-+fi
-+
-+echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+
-+echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-+echo "configure:1907: checking for object suffix" >&5
-+if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  rm -f conftest*
-+echo 'int i = 1;' > conftest.$ac_ext
-+if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  for ac_file in conftest.*; do
-+    case $ac_file in
-+    *.c) ;;
-+    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-+    esac
-+  done
-+else
-+  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_objext" 1>&6
-+OBJEXT=$ac_cv_objext
-+ac_objext=$ac_cv_objext
-+
-+
-+
-+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-+echo "configure:1933: checking for executable suffix" >&5
-+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-+  ac_cv_exeext=.exe
-+else
-+  rm -f conftest*
-+  echo 'int main () { return 0; }' > conftest.$ac_ext
-+  ac_cv_exeext=
-+  if { (eval echo configure:1943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+    for file in conftest.*; do
-+      case $file in
-+      *.$ac_ext | *.c | *.o | *.obj) ;;
-+      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-+      esac
-+    done
-+  else
-+    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-+  fi
-+  rm -f conftest*
-+  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-+fi
-+fi
-+
-+EXEEXT=""
-+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-+echo "$ac_t""${ac_cv_exeext}" 1>&6
-+ac_exeext=$EXEEXT
-+
-+if test $host != $build; then
-+  ac_tool_prefix=${host_alias}-
-+else
-+  ac_tool_prefix=
-+fi
-+
-+
-+
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-+echo "configure:1974: checking command to parse $NM output" >&5
-+if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[BCDEGRST]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-+
-+# Transform the above into a raw symbol and a C symbol.
-+symxfrm='\1 \2\3 \3'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[BCDT]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[ABCDGISTW]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[BCDEGRST]'
-+  ;;
-+osf*)
-+  symcode='[BCDEGQRST]'
-+  ;;
-+solaris* | sysv5*)
-+  symcode='[BDT]'
-+  ;;
-+sysv4)
-+  symcode='[DFNSTU]'
-+  ;;
-+esac
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $host_os in
-+mingw*)
-+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-+  symcode='[ABCDGISTW]'
-+fi
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Write the raw and C identifiers.
-+lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+  if { (eval echo configure:2057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if { (eval echo configure:2060: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-+	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
-+
-+	  cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr void *
-+#else
-+# define lt_ptr char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr address;
-+}
-+lt_preloaded_symbols[] =
-+{
-+EOF
-+	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
-+	  cat <<\EOF >> conftest.$ac_ext
-+  {0, (lt_ptr) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  save_LIBS="$LIBS"
-+	  save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$no_builtin_flag"
-+	  if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$save_LIBS"
-+	  CFLAGS="$save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&5
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&5
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&5
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -f conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+
-+fi
-+
-+global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  global_symbol_to_cdecl=
-+  global_symbol_to_c_name_address=
-+else
-+  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
-+  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
-+fi
-+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
-+then
-+  echo "$ac_t""failed" 1>&6
-+else
-+  echo "$ac_t""ok" 1>&6
-+fi
-+
-+for ac_hdr in dlfcn.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:2160: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2165 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:2170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+
-+
-+
-+
-+
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-+echo "configure:2206: checking for ${ac_tool_prefix}file" >&5
-+if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  case $MAGIC_CMD in
-+  /*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+  ?:/*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-+  ;;
-+  *)
-+  ac_save_MAGIC_CMD="$MAGIC_CMD"
-+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="/usr/bin:$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/${ac_tool_prefix}file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    egrep "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  MAGIC_CMD="$ac_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  echo "$ac_t""$MAGIC_CMD" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    echo $ac_n "checking for file""... $ac_c" 1>&6
-+echo "configure:2268: checking for file" >&5
-+if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  case $MAGIC_CMD in
-+  /*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+  ?:/*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-+  ;;
-+  *)
-+  ac_save_MAGIC_CMD="$MAGIC_CMD"
-+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="/usr/bin:$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    egrep "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  MAGIC_CMD="$ac_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  echo "$ac_t""$MAGIC_CMD" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+
-+  fi
-+  ;;
-+esac
-+
-+# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2339: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+RANLIB="$ac_cv_prog_RANLIB"
-+if test -n "$RANLIB"; then
-+  echo "$ac_t""$RANLIB" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+if test -z "$ac_cv_prog_RANLIB"; then
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2371: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_RANLIB="ranlib"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-+fi
-+fi
-+RANLIB="$ac_cv_prog_RANLIB"
-+if test -n "$RANLIB"; then
-+  echo "$ac_t""$RANLIB" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+else
-+  RANLIB=":"
-+fi
-+fi
-+
-+# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2406: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+STRIP="$ac_cv_prog_STRIP"
-+if test -n "$STRIP"; then
-+  echo "$ac_t""$STRIP" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+if test -z "$ac_cv_prog_STRIP"; then
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2438: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_STRIP="strip"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-+fi
-+fi
-+STRIP="$ac_cv_prog_STRIP"
-+if test -n "$STRIP"; then
-+  echo "$ac_t""$STRIP" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+else
-+  STRIP=":"
-+fi
-+fi
-+
-+
-+enable_dlopen=no
-+enable_win32_dll=no
-+
-+# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+if test "${enable_libtool_lock+set}" = set; then
-+  enableval="$enable_libtool_lock"
-+  :
-+fi
-+
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '#line 2487 "configure"' > conftest.$ac_ext
-+  if { (eval echo configure:2488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -32"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -n32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -64"
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-+echo "configure:2509: checking whether the C compiler needs -belf" >&5
-+if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+     ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+     cat > conftest.$ac_ext <<EOF
-+#line 2522 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  lt_cv_cc_needs_belf=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  lt_cv_cc_needs_belf=no
-+fi
-+rm -f conftest*
-+     ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+fi
-+
-+echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
-+
-+
-+esac
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
-+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Constants:
-+rm="rm -f"
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except M$VC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+need_locks="$enable_libtool_lock"
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
-+
-+if test x"$host" != x"$build"; then
-+  ac_tool_prefix=${host_alias}-
-+else
-+  ac_tool_prefix=
-+fi
-+
-+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-+case $host_os in
-+linux-gnu*) ;;
-+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-+esac
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  *)
-+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+
-+# Allow CC to be a program name with arguments.
-+set dummy $CC
-+compiler="$2"
-+
-+echo $ac_n "checking for objdir""... $ac_c" 1>&6
-+echo "configure:2649: checking for objdir" >&5
-+rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null
-+echo "$ac_t""$objdir" 1>&6
-+
-+
-+# Check whether --with-pic or --without-pic was given.
-+if test "${with_pic+set}" = set; then
-+  withval="$with_pic"
-+  pic_mode="$withval"
-+else
-+  pic_mode=default
-+fi
-+
-+test -z "$pic_mode" && pic_mode=default
-+
-+# We assume here that the value for lt_cv_prog_cc_pic will not be cached
-+# in isolation, and that seeing it set (from the cache) indicates that
-+# the associated values are set (in the cache) correctly too.
-+echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-+echo "configure:2676: checking for $compiler option to produce PIC" >&5
-+if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+   lt_cv_prog_cc_pic=
-+  lt_cv_prog_cc_shlib=
-+  lt_cv_prog_cc_wl=
-+  lt_cv_prog_cc_static=
-+  lt_cv_prog_cc_no_builtin=
-+  lt_cv_prog_cc_can_build_shared=$can_build_shared
-+
-+  if test "$GCC" = yes; then
-+    lt_cv_prog_cc_wl='-Wl,'
-+    lt_cv_prog_cc_static='-static'
-+
-+    case $host_os in
-+    aix*)
-+      # Below there is a dirty hack to force normal static linking with -ldl
-+      # The problem is because libdl dynamically linked with both libc and
-+      # libC (AIX C++ library), which obviously doesn't included in libraries
-+      # list by gcc. This cause undefined symbols with -static flags.
-+      # This hack allows C programs to be linked with "-static -ldl", but
-+      # not sure about C++ programs.
-+      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
-+      ;;
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_cv_prog_cc_pic='-fno-common'
-+      ;;
-+    cygwin* | mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	 lt_cv_prog_cc_pic=-Kconform_pic
-+      fi
-+      ;;
-+    *)
-+      lt_cv_prog_cc_pic='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for PIC flags for the system compiler.
-+    case $host_os in
-+    aix3* | aix4* | aix5*)
-+      lt_cv_prog_cc_wl='-Wl,'
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_cv_prog_cc_static='-Bstatic'
-+      else
-+	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
-+      lt_cv_prog_cc_pic='+Z'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static='-non_shared'
-+      # PIC (with -KPIC) is the default.
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-+      ;;
-+
-+    newsos6)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      # All OSF/1 code is PIC.
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static='-non_shared'
-+      ;;
-+
-+    sco3.2v5*)
-+      lt_cv_prog_cc_pic='-Kpic'
-+      lt_cv_prog_cc_static='-dn'
-+      lt_cv_prog_cc_shlib='-belf'
-+      ;;
-+
-+    solaris*)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Wl,'
-+      ;;
-+
-+    sunos4*)
-+      lt_cv_prog_cc_pic='-PIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Qoption ld '
-+      ;;
-+
-+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Wl,'
-+      ;;
-+
-+    uts4*)
-+      lt_cv_prog_cc_pic='-pic'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_cv_prog_cc_pic='-Kconform_pic'
-+	lt_cv_prog_cc_static='-Bstatic'
-+      fi
-+      ;;
-+
-+    *)
-+      lt_cv_prog_cc_can_build_shared=no
-+      ;;
-+    esac
-+  fi
-+
-+fi
-+
-+if test -z "$lt_cv_prog_cc_pic"; then
-+  echo "$ac_t""none" 1>&6
-+else
-+  echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6
-+
-+  # Check to make sure the pic_flag actually works.
-+  echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
-+echo "configure:2824: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
-+  if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+      save_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
-+    cat > conftest.$ac_ext <<EOF
-+#line 2831 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+        case $host_os in
-+      hpux9* | hpux10* | hpux11*)
-+	# On HP-UX, both CC and GCC only warn that PIC is supported... then
-+	# they create non-PIC objects.  So, if there were any warnings, we
-+	# assume that PIC is not supported.
-+	if test -s conftest.err; then
-+	  lt_cv_prog_cc_pic_works=no
-+	else
-+	  lt_cv_prog_cc_pic_works=yes
-+	fi
-+	;;
-+      *)
-+	lt_cv_prog_cc_pic_works=yes
-+	;;
-+      esac
-+    
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+        lt_cv_prog_cc_pic_works=no
-+    
-+fi
-+rm -f conftest*
-+    CFLAGS="$save_CFLAGS"
-+  
-+fi
-+
-+
-+  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
-+    lt_cv_prog_cc_pic=
-+    lt_cv_prog_cc_can_build_shared=no
-+  else
-+    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
-+  fi
-+
-+  echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6
-+fi
-+
-+# Check for any special shared library compilation flags.
-+if test -n "$lt_cv_prog_cc_shlib"; then
-+  echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2
-+  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
-+  else
-+   echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
-+    lt_cv_prog_cc_can_build_shared=no
-+  fi
-+fi
-+
-+echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
-+echo "configure:2890: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
-+if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+    lt_cv_prog_cc_static_works=no
-+  save_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
-+  cat > conftest.$ac_ext <<EOF
-+#line 2898 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  lt_cv_prog_cc_static_works=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+  LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+
-+
-+# Belt *and* braces to stop my trousers falling down:
-+test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-+echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6
-+
-+pic_flag="$lt_cv_prog_cc_pic"
-+special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
-+wl="$lt_cv_prog_cc_wl"
-+link_static_flag="$lt_cv_prog_cc_static"
-+no_builtin_flag="$lt_cv_prog_cc_no_builtin"
-+can_build_shared="$lt_cv_prog_cc_can_build_shared"
-+
-+
-+# Check to see if options -o and -c are simultaneously supported by compiler
-+echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-+echo "configure:2932: checking if $compiler supports -c -o file.$ac_objext" >&5
-+if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+$rm -r conftest 2>/dev/null
-+mkdir conftest
-+cd conftest
-+echo "int some_variable = 0;" > conftest.$ac_ext
-+mkdir out
-+# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-+# that will create temporary files in the current directory regardless of
-+# the output directory.  Thus, making CWD read-only will cause this test
-+# to fail, enabling locking or at least warning the user not to do parallel
-+# builds.
-+chmod -w .
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
-+compiler_c_o=no
-+if { (eval echo configure:2951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
-+  # The compiler can only warn and ignore the option if not recognized
-+  # So say no if there are warnings
-+  if test -s out/conftest.err; then
-+    lt_cv_compiler_c_o=no
-+  else
-+    lt_cv_compiler_c_o=yes
-+  fi
-+else
-+  # Append any errors to the config.log.
-+  cat out/conftest.err 1>&5
-+  lt_cv_compiler_c_o=no
-+fi
-+CFLAGS="$save_CFLAGS"
-+chmod u+w .
-+$rm conftest* out/*
-+rmdir out
-+cd ..
-+rmdir conftest
-+$rm -r conftest 2>/dev/null
-+
-+fi
-+
-+compiler_c_o=$lt_cv_compiler_c_o
-+echo "$ac_t""$compiler_c_o" 1>&6
-+
-+if test x"$compiler_c_o" = x"yes"; then
-+  # Check to see if we can write to a .lo
-+  echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
-+echo "configure:2980: checking if $compiler supports -c -o file.lo" >&5
-+  if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+  lt_cv_compiler_o_lo=no
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -c -o conftest.lo"
-+  save_objext="$ac_objext"
-+  ac_objext=lo
-+  cat > conftest.$ac_ext <<EOF
-+#line 2991 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+int some_variable = 0;
-+; return 0; }
-+EOF
-+if { (eval echo configure:2998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+      # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+    if test -s conftest.err; then
-+      lt_cv_compiler_o_lo=no
-+    else
-+      lt_cv_compiler_o_lo=yes
-+    fi
-+  
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+  ac_objext="$save_objext"
-+  CFLAGS="$save_CFLAGS"
-+  
-+fi
-+
-+  compiler_o_lo=$lt_cv_compiler_o_lo
-+  echo "$ac_t""$compiler_o_lo" 1>&6
-+else
-+  compiler_o_lo=no
-+fi
-+
-+# Check to see if we can do hard links to lock some files if needed
-+hard_links="nottested"
-+if test "$compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-+echo "configure:3029: checking if we can lock with hard links" >&5
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  echo "$ac_t""$hard_links" 1>&6
-+  if test "$hard_links" = no; then
-+    echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
-+if test "$GCC" = yes; then
-+  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-+  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-+echo "configure:3048: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+  echo "int some_variable = 0;" > conftest.$ac_ext
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
-+  compiler_rtti_exceptions=no
-+  cat > conftest.$ac_ext <<EOF
-+#line 3054 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+int some_variable = 0;
-+; return 0; }
-+EOF
-+if { (eval echo configure:3061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+      # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+    if test -s conftest.err; then
-+      compiler_rtti_exceptions=no
-+    else
-+      compiler_rtti_exceptions=yes
-+    fi
-+  
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+  CFLAGS="$save_CFLAGS"
-+  echo "$ac_t""$compiler_rtti_exceptions" 1>&6
-+
-+  if test "$compiler_rtti_exceptions" = "yes"; then
-+    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-+  else
-+    no_builtin_flag=' -fno-builtin'
-+  fi
-+fi
-+
-+# See if the linker supports building shared libraries.
-+echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
-+echo "configure:3088: checking whether the linker ($LD) supports shared libraries" >&5
-+
-+allow_undefined_flag=
-+no_undefined_flag=
-+need_lib_prefix=unknown
-+need_version=unknown
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+archive_cmds=
-+archive_expsym_cmds=
-+old_archive_from_new_cmds=
-+old_archive_from_expsyms_cmds=
-+export_dynamic_flag_spec=
-+whole_archive_flag_spec=
-+thread_safe_flag_spec=
-+hardcode_into_libs=no
-+hardcode_libdir_flag_spec=
-+hardcode_libdir_separator=
-+hardcode_direct=no
-+hardcode_minus_L=no
-+hardcode_shlibpath_var=unsupported
-+runpath_var=
-+link_all_deplibs=unknown
-+always_export_symbols=no
-+export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+# include_expsyms should be a list of space-separated symbols to be *always*
-+# included in the symbol list
-+include_expsyms=
-+# exclude_expsyms can be an egrep regular expression of symbols to exclude
-+# it will be wrapped by ` (' and `)$', so one must not match beginning or
-+# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+# as well as any symbol that contains `d'.
-+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+# platforms (ab)use it in PIC code, but their linkers get confused if
-+# the symbol is explicitly referenced.  Since portable code cannot
-+# rely on this symbol name, it's probably fine to never include it in
-+# preloaded symbol tables.
-+extract_expsyms_cmds=
-+
-+case $host_os in
-+cygwin* | mingw* | pw32*)
-+  # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+  # When not using gcc, we currently assume that we are using
-+  # Microsoft Visual C++.
-+  if test "$GCC" != yes; then
-+    with_gnu_ld=no
-+  fi
-+  ;;
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
-+esac
-+
-+ld_shlibs=yes
-+if test "$with_gnu_ld" = yes; then
-+  # If archive_cmds runs LD, not CC, wlarc should be empty
-+  wlarc='${wl}'
-+
-+  # See if GNU ld supports shared libraries.
-+  case $host_os in
-+  aix3* | aix4* | aix5*)
-+    # On AIX, the GNU linker is very broken
-+    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
-+    ld_shlibs=no
-+    cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+
-+    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+    # that the semantics of dynamic libraries on AmigaOS, at least up
-+    # to version 4, is to share data among multiple programs linked
-+    # with the same dynamic library.  Since this doesn't match the
-+    # behavior of shared libraries on other platforms, we can use
-+    # them.
-+    ld_shlibs=no
-+    ;;
-+
-+  beos*)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      allow_undefined_flag=unsupported
-+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+      # support --undefined.  This deserves some investigation.  FIXME
-+      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+
-+    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
-+      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
-+      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-+      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
-+      else $CC -o impgen impgen.c ; fi)~
-+      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
-+
-+    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
-+
-+    # cygwin and mingw dlls have different entry points and sets of symbols
-+    # to exclude.
-+    # FIXME: what about values for MSVC?
-+    dll_entry=__cygwin_dll_entry@12
-+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
-+    case $host_os in
-+    mingw*)
-+      # mingw values
-+      dll_entry=_DllMainCRTStartup@12
-+      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
-+      ;;
-+    esac
-+
-+    # mingw and cygwin differ, and it's simplest to just exclude the union
-+    # of the two symbol sets.
-+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
-+
-+    # recent cygwin and mingw systems supply a stub DllMain which the user
-+    # can override, but on older systems we have to supply one (in ltdll.c)
-+    if test "x$lt_cv_need_dllmain" = "xyes"; then
-+      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
-+      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
-+	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
-+    else
-+      ltdll_obj=
-+      ltdll_cmds=
-+    fi
-+
-+    # Extract the symbol export list from an `--export-all' def file,
-+    # then regenerate the def file from the symbol export list, so that
-+    # the compiled dll only exports the symbol export list.
-+    # Be careful not to strip the DATA tag left be newer dlltools.
-+    export_symbols_cmds="$ltdll_cmds"'
-+      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
-+      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
-+
-+    # If the export-symbols file already is a .def file (1st line
-+    # is EXPORTS), use it as is.
-+    # If DATA tags from a recent dlltool are present, honour them!
-+    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
-+	cp $export_symbols $output_objdir/$soname-def;
-+      else
-+	echo EXPORTS > $output_objdir/$soname-def;
-+	_lt_hint=1;
-+	cat $export_symbols | while read symbol; do
-+	 set dummy \$symbol;
-+	 case \$# in
-+	   2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-+	   4) echo "   \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
-+	   *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
-+	 esac;
-+	 _lt_hint=`expr 1 + \$_lt_hint`;
-+	done;
-+      fi~
-+      '"$ltdll_cmds"'
-+      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
-+      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
-+      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+      wlarc=
-+    else
-+      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    fi
-+    ;;
-+
-+  solaris* | sysv5*)
-+    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-+      ld_shlibs=no
-+      cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  sunos4*)
-+    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+    wlarc=
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+  esac
-+
-+  if test "$ld_shlibs" = yes; then
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    case $host_os in
-+    cygwin* | mingw* | pw32*)
-+      # dlltool doesn't understand --whole-archive et. al.
-+      whole_archive_flag_spec=
-+      ;;
-+    *)
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+	whole_archive_flag_spec=
-+      fi
-+      ;;
-+    esac
-+  fi
-+else
-+  # PORTME fill in a description of your system's linker (not GNU ld)
-+  case $host_os in
-+  aix3*)
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+    # Note: this linker hardcodes the directories in LIBPATH if there
-+    # are no directories specified by -L.
-+    hardcode_minus_L=yes
-+    if test "$GCC" = yes && test -z "$link_static_flag"; then
-+      # Neither direct hardcoding nor static linking is supported with a
-+      # broken collect2.
-+      hardcode_direct=unsupported
-+    fi
-+    ;;
-+
-+  aix4* | aix5*)
-+    if test "$host_cpu" = ia64; then
-+      # On IA64, the linker does run time linking by default, so we don't
-+      # have to do anything special.
-+      aix_use_runtimelinking=no
-+      exp_sym_flag='-Bexport'
-+      no_entry_flag=""
-+    else
-+      aix_use_runtimelinking=no
-+
-+      # Test if we are trying to use run time linking or normal
-+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+      # need to do runtime linking.
-+      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+	for ld_flag in $LDFLAGS; do
-+	  case $ld_flag in
-+	  *-brtl*)
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  ;;
-+	  esac
-+	done
-+      esac
-+
-+      exp_sym_flag='-bexport'
-+      no_entry_flag='-bnoentry'
-+    fi
-+
-+    # When large executables or shared objects are built, AIX ld can
-+    # have problems creating the table of contents.  If linking a library
-+    # or program results in "error TOC overflow" add -mminimal-toc to
-+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+    hardcode_direct=yes
-+    archive_cmds=''
-+    hardcode_libdir_separator=':'
-+    if test "$GCC" = yes; then
-+      case $host_os in aix4.[012]|aix4.[012].*)
-+	collect2name=`${CC} -print-prog-name=collect2`
-+	if test -f "$collect2name" && \
-+	  strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	then
-+	  # We have reworked collect2
-+	  hardcode_direct=yes
-+	else
-+	  # We have old collect2
-+	  hardcode_direct=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  hardcode_minus_L=yes
-+	  hardcode_libdir_flag_spec='-L$libdir'
-+	  hardcode_libdir_separator=
-+	fi
-+      esac
-+
-+      shared_flag='-shared'
-+    else
-+      # not using gcc
-+      if test "$host_cpu" = ia64; then
-+	shared_flag='${wl}-G'
-+      else
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag='${wl}-G'
-+	else
-+	  shared_flag='${wl}-bM:SRE'
-+	fi
-+      fi
-+    fi
-+
-+    # It seems that -bexpall can do strange things, so it is better to
-+    # generate a list of symbols to export.
-+    always_export_symbols=yes
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # Warning - without using the other runtime loading flags (-brtl),
-+      # -berok will link without error, but may produce a broken library.
-+      allow_undefined_flag='-berok'
-+      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-+      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+    else
-+      if test "$host_cpu" = ia64; then
-+	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	allow_undefined_flag="-z nodefs"
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+      else
-+	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-+	# Warning - without using the other run time loading flags,
-+	# -berok will link without error, but may produce a broken library.
-+	allow_undefined_flag='${wl}-berok'
-+	# This is a bit strange, but is similar to how AIX traditionally builds
-+	# it's shared libraries.
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
-+      fi
-+    fi
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    # see comment about different semantics on the GNU ld section
-+    ld_shlibs=no
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec=' '
-+    allow_undefined_flag=unsupported
-+    # Tell ltmain to make .lib files, not .a files.
-+    libext=lib
-+    # FIXME: Setting linknames here is a bad hack.
-+    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+    # The linker will automatically build a .lib file if we build a DLL.
-+    old_archive_from_new_cmds='true'
-+    # FIXME: Should let the user specify the lib program.
-+    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+    fix_srcfile_path='`cygpath -w "$srcfile"`'
-+    ;;
-+
-+  darwin* | rhapsody*)
-+    case "$host_os" in
-+    rhapsody* | darwin1.[012])
-+      allow_undefined_flag='-undefined suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      allow_undefined_flag='-flat_namespace -undefined suppress'
-+      ;;
-+    esac
-+    # FIXME: Relying on posixy $() will cause problems for
-+    #        cross-compilation, but unfortunately the echo tests do not
-+    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-+    #	     `"' quotes if we put them in here... so don't!
-+    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
-+    # We need to add '_' to the symbols in $export_symbols first
-+    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    whole_archive_flag_spec='-all_load $convenience'
-+    ;;
-+
-+  freebsd1*)
-+    ld_shlibs=no
-+    ;;
-+
-+  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+  # support.  Future versions do this automatically, but an explicit c++rt0.o
-+  # does not break anything, and helps significantly (at the cost of a little
-+  # extra space).
-+  freebsd2.2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+  freebsd2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+  freebsd*)
-+    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  hpux9* | hpux10* | hpux11*)
-+    case $host_os in
-+    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-+    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
-+    esac
-+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes # Not in the search PATH, but as the default
-+			 # location of the library.
-+    export_dynamic_flag_spec='${wl}-E'
-+    ;;
-+
-+  irix5* | irix6* | nonstopux*)
-+    if test "$GCC" = yes; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    else
-+      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-+    fi
-+    hardcode_libdir_separator=:
-+    link_all_deplibs=yes
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+    else
-+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+    fi
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  newsos6)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  openbsd*)
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
-+    else
-+      case "$host_os" in
-+      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_libdir_flag_spec='-R$libdir'
-+        ;;
-+      *)
-+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+        ;;
-+      esac
-+    fi
-+    ;;
-+
-+  os2*)
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    allow_undefined_flag=unsupported
-+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+    ;;
-+
-+  osf3*)
-+    if test "$GCC" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+    if test "$GCC" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+      #Both c and cxx compiler support -rpath directly
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-+    fi
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  sco3.2v5*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_shlibpath_var=no
-+    runpath_var=LD_RUN_PATH
-+    hardcode_runpath_var=yes
-+    export_dynamic_flag_spec='${wl}-Bexport'
-+    ;;
-+
-+  solaris*)
-+    # gcc --version < 3.0 without binutils cannot create self contained
-+    # shared libraries reliably, requiring libgcc.a to resolve some of
-+    # the object symbols generated in some cases.  Libraries that use
-+    # assert need libgcc.a to resolve __eprintf, for example.  Linking
-+    # a copy of libgcc.a into every shared library to guarantee resolving
-+    # such symbols causes other problems:  According to Tim Van Holder
-+    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
-+    # (to the application) exception stack for one thing.
-+    no_undefined_flag=' -z defs'
-+    if test "$GCC" = yes; then
-+      case `$CC --version 2>/dev/null` in
-+      [12].*)
-+	cat <<EOF 1>&2
-+
-+*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
-+*** create self contained shared libraries on Solaris systems, without
-+*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
-+*** -no-undefined support, which will at least allow you to build shared
-+*** libraries.  However, you may find that when you link such libraries
-+*** into an application without using GCC, you have to manually add
-+*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
-+*** upgrade to a newer version of GCC.  Another option is to rebuild your
-+*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
-+
-+EOF
-+        no_undefined_flag=
-+	;;
-+      esac
-+    fi
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_shlibpath_var=no
-+    case $host_os in
-+    solaris2.[0-5] | solaris2.[0-5].*) ;;
-+    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+    esac
-+    link_all_deplibs=yes
-+    ;;
-+
-+  sunos4*)
-+    if test "x$host_vendor" = xsequent; then
-+      # Use $CC to link under sequent, because it throws in some extra .o
-+      # files that make .init and .fini sections work.
-+      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+    else
-+      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+    fi
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4)
-+    case $host_vendor in
-+      sni)
-+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+        hardcode_direct=yes # is this really true???
-+        ;;
-+      siemens)
-+        ## LD is ld it makes a PLAMLIB
-+        ## CC just makes a GrossModule.
-+        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+        reload_cmds='$CC -r -o $output$reload_objs'
-+        hardcode_direct=no
-+        ;;
-+      motorola)
-+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+        ;;
-+    esac
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4.3*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_shlibpath_var=no
-+    export_dynamic_flag_spec='-Bexport'
-+    ;;
-+
-+  sysv5*)
-+    no_undefined_flag=' -z text'
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+    hardcode_libdir_flag_spec=
-+    hardcode_shlibpath_var=no
-+    runpath_var='LD_RUN_PATH'
-+    ;;
-+
-+  uts4*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  dgux*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4*MP*)
-+    if test -d /usr/nec; then
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      runpath_var=LD_RUN_PATH
-+      hardcode_runpath_var=yes
-+      ld_shlibs=yes
-+    fi
-+    ;;
-+
-+  sysv4.2uw2*)
-+    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_minus_L=no
-+    hardcode_shlibpath_var=no
-+    hardcode_runpath_var=yes
-+    runpath_var=LD_RUN_PATH
-+    ;;
-+
-+  sysv5uw7* | unixware7*)
-+    no_undefined_flag='${wl}-z ${wl}text'
-+    if test "$GCC" = yes; then
-+      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+    else
-+      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+    fi
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    ld_shlibs=no
-+    ;;
-+  esac
-+fi
-+echo "$ac_t""$ld_shlibs" 1>&6
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+# Check hardcoding attributes.
-+echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-+echo "configure:3787: checking how to hardcode library paths into programs" >&5
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" || \
-+   test -n "$runpath_var"; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$hardcode_shlibpath_var" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
-+echo "$ac_t""$hardcode_action" 1>&6
-+
-+striplib=
-+old_striplib=
-+echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-+echo "configure:3815: checking whether stripping libraries is possible" >&5
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  echo "$ac_t""yes" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+# PORTME Fill in your ld.so characteristics
-+echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-+echo "configure:3829: checking dynamic linker characteristics" >&5
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}.so$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[01] | aix4.[01].*)
-+	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	     echo ' yes '
-+	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	  :
-+	else
-+	  can_build_shared=no
-+	fi
-+	;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can
-+    # not hardcode correct soname into executable. Probably we can
-+    # add versioning support to collect2, so additional links can
-+    # be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}.so$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  hardcode_into_libs=yes
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}.so'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
-+bsdi4*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  export_dynamic_flag_spec=-rdynamic
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
-+  need_version=no
-+  need_lib_prefix=no
-+  case $GCC,$host_os in
-+  yes,cygwin*)
-+    library_names_spec='$libname.dll.a'
-+    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-+    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog .libs/$dlname \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    ;;
-+  yes,mingw*)
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
-+    ;;
-+  yes,pw32*)
-+    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
-+    ;;
-+  *)
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  # FIXME: Relying on posixy $() will cause problems for
-+  #        cross-compilation, but unfortunately the echo tests do not
-+  #        yet detect zsh echo's removal of \ escapes.
-+  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
-+  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
-+freebsd*-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU/FreeBSD ld.so'
-+  ;;
-+
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  *)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  dynamic_linker="$host_os dld.sl"
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  shlibpath_var=SHLIB_PATH
-+  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-+  soname_spec='${libname}${release}.sl$major'
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)          version_type=irix ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
-+
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+    soname_spec='${libname}${release}.so$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case "$host_os" in
-+    openbsd2.[89] | openbsd2.[89].*)
-+      shlibpath_overrides_runpath=no
-+      ;;
-+    *)
-+      shlibpath_overrides_runpath=yes
-+      ;;
-+    esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  need_lib_prefix=no
-+  library_names_spec='$libname.dll $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_version=no
-+  need_lib_prefix=no
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  hardcode_into_libs=yes
-+  ;;
-+
-+sco3.2v5*)
-+  version_type=osf
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      export_dynamic_flag_spec='${wl}-Blargedynsym'
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-+    soname_spec='$libname.so.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+echo "$ac_t""$dynamic_linker" 1>&6
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+# Report the final consequences.
-+echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-+echo "configure:4253: checking if libtool supports shared libraries" >&5
-+echo "$ac_t""$can_build_shared" 1>&6
-+
-+echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
-+echo "configure:4257: checking whether to build shared libraries" >&5
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+
-+aix4*)
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-+  ;;
-+esac
-+echo "$ac_t""$enable_shared" 1>&6
-+
-+echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
-+echo "configure:4280: checking whether to build static libraries" >&5
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+echo "$ac_t""$enable_static" 1>&6
-+
-+if test "$hardcode_action" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  *)
-+    echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-+echo "configure:4321: checking for shl_load" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 4326 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char shl_load(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char shl_load();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_shl_load) || defined (__stub___shl_load)
-+choke me
-+#else
-+shl_load();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:4349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_shl_load=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_shl_load=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="shl_load"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-+echo "configure:4367: checking for shl_load in -ldld" >&5
-+ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4375 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char shl_load();
-+
-+int main() {
-+shl_load()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-+echo "configure:4405: checking for dlopen" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 4410 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char dlopen(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dlopen();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_dlopen) || defined (__stub___dlopen)
-+choke me
-+#else
-+dlopen();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_dlopen=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_dlopen=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-+echo "configure:4451: checking for dlopen in -ldl" >&5
-+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldl  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4459 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dlopen();
-+
-+int main() {
-+dlopen()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-+echo "configure:4489: checking for dlopen in -lsvld" >&5
-+ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lsvld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4497 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dlopen();
-+
-+int main() {
-+dlopen()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-+echo "configure:4527: checking for dld_link in -ldld" >&5
-+ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4535 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dld_link();
-+
-+int main() {
-+dld_link()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+	      
-+fi
-+
-+	    
-+fi
-+
-+	  
-+fi
-+
-+	
-+fi
-+
-+      
-+fi
-+
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+        test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
-+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-+echo "configure:4602: checking whether a program can dlopen itself" >&5
-+if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self=cross
-+else
-+    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+#line 4612 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+
-+    exit (status);
-+}
-+EOF
-+  if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self=no
-+  fi
-+fi
-+rm -fr conftest*
-+
-+    
-+fi
-+
-+echo "$ac_t""$lt_cv_dlopen_self" 1>&6
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      LDFLAGS="$LDFLAGS $link_static_flag"
-+      echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-+echo "configure:4696: checking whether a statically linked program can dlopen itself" >&5
-+if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self_static=cross
-+else
-+    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+#line 4706 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+
-+    exit (status);
-+}
-+EOF
-+  if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self_static=no
-+  fi
-+fi
-+rm -fr conftest*
-+
-+      
-+fi
-+
-+echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
-+    fi
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+
-+
-+if test "$enable_shared" = yes && test "$GCC" = yes; then
-+  case $archive_cmds in
-+  *'~'*)
-+    # FIXME: we may have to deal with multi-command sequences.
-+    ;;
-+  '$CC '*)
-+    # Test whether the compiler implicitly links with -lc since on some
-+    # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+    # to ld, don't add -lc before -lgcc.
-+    echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-+echo "configure:4816: checking whether -lc should be explicitly linked in" >&5
-+    if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  $rm conftest*
-+    echo 'static int dummy;' > conftest.$ac_ext
-+
-+    if { (eval echo configure:4823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+      soname=conftest
-+      lib=conftest
-+      libobjs=conftest.$ac_objext
-+      deplibs=
-+      wl=$lt_cv_prog_cc_wl
-+      compiler_flags=-v
-+      linker_flags=-v
-+      verstring=
-+      output_objdir=.
-+      libname=conftest
-+      save_allow_undefined_flag=$allow_undefined_flag
-+      allow_undefined_flag=
-+      if { (eval echo configure:4836: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
-+      then
-+	lt_cv_archive_cmds_need_lc=no
-+      else
-+	lt_cv_archive_cmds_need_lc=yes
-+      fi
-+      allow_undefined_flag=$save_allow_undefined_flag
-+    else
-+      cat conftest.err 1>&5
-+    fi
-+fi
-+
-+    echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
-+    ;;
-+  esac
-+fi
-+need_lc=${lt_cv_archive_cmds_need_lc-yes}
-+
-+# The second clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  :
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
-+  test -f Makefile && make "$ltmain"
-+fi
-+
-+if test -f "$ltmain"; then
-+  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
-+  $rm -f "${ofile}T"
-+
-+  echo creating $ofile
-+
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
-+  for var in echo old_CC old_CFLAGS SED \
-+    AR AR_FLAGS CC LD LN_S NM SHELL \
-+    reload_flag reload_cmds wl \
-+    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-+    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-+    library_names_spec soname_spec \
-+    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-+    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
-+    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd export_symbols_cmds \
-+    deplibs_check_method allow_undefined_flag no_undefined_flag \
-+    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-+    global_symbol_to_c_name_address \
-+    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-+
-+    case $var in
-+    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-+    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  cat <<__EOF__ > "${ofile}T"
-+#! $SHELL
-+
-+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# 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.
-+
-+# A sed that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="${SED} -e s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$need_lc
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# The default C compiler.
-+CC=$lt_CC
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC
-+
-+# The linker used to build libraries.
-+LD=$lt_LD
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_wl
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_pic_flag
-+pic_mode=$pic_mode
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_compiler_c_o
-+
-+# Can we write directly to a .lo ?
-+compiler_o_lo=$lt_compiler_o_lo
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_link_static_flag
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_no_builtin_flag
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+
-+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
-+
-+# ### END LIBTOOL CONFIG
-+
-+__EOF__
-+
-+  case $host_os in
-+  aix3*)
-+    cat <<\EOF >> "${ofile}T"
-+
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+EOF
-+    ;;
-+  esac
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32* | os2*)
-+    cat <<'EOF' >> "${ofile}T"
-+      # This is a source program that is used to create dlls on Windows
-+      # Don't remove nor modify the starting and closing comments
-+# /* ltdll.c starts here */
-+# #define WIN32_LEAN_AND_MEAN
-+# #include <windows.h>
-+# #undef WIN32_LEAN_AND_MEAN
-+# #include <stdio.h>
-+#
-+# #ifndef __CYGWIN__
-+# #  ifdef __CYGWIN32__
-+# #    define __CYGWIN__ __CYGWIN32__
-+# #  endif
-+# #endif
-+#
-+# #ifdef __cplusplus
-+# extern "C" {
-+# #endif
-+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-+# #ifdef __cplusplus
-+# }
-+# #endif
-+#
-+# #ifdef __CYGWIN__
-+# #include <cygwin/cygwin_dll.h>
-+# DECLARE_CYGWIN_DLL( DllMain );
-+# #endif
-+# HINSTANCE __hDllInstance_base;
-+#
-+# BOOL APIENTRY
-+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-+# {
-+#   __hDllInstance_base = hInst;
-+#   return TRUE;
-+# }
-+# /* ltdll.c ends here */
-+	# This is a source program that is used to create import libraries
-+	# on Windows for dlls which lack them. Don't remove nor modify the
-+	# starting and closing comments
-+# /* impgen.c starts here */
-+# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
-+#
-+#  This file is part of GNU libtool.
-+#
-+#  This program is free software; you can redistribute it and/or modify
-+#  it under the terms of the GNU General Public License as published by
-+#  the Free Software Foundation; either version 2 of the License, or
-+#  (at your option) any later version.
-+#
-+#  This program is distributed in the hope that it will be useful,
-+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#  GNU General Public License for more details.
-+#
-+#  You should have received a copy of the GNU General Public License
-+#  along with this program; if not, write to the Free Software
-+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#  */
-+#
-+# #include <stdio.h>		/* for printf() */
-+# #include <unistd.h>		/* for open(), lseek(), read() */
-+# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
-+# #include <string.h>		/* for strdup() */
-+#
-+# /* O_BINARY isn't required (or even defined sometimes) under Unix */
-+# #ifndef O_BINARY
-+# #define O_BINARY 0
-+# #endif
-+#
-+# static unsigned int
-+# pe_get16 (fd, offset)
-+#      int fd;
-+#      int offset;
-+# {
-+#   unsigned char b[2];
-+#   lseek (fd, offset, SEEK_SET);
-+#   read (fd, b, 2);
-+#   return b[0] + (b[1]<<8);
-+# }
-+#
-+# static unsigned int
-+# pe_get32 (fd, offset)
-+#     int fd;
-+#     int offset;
-+# {
-+#   unsigned char b[4];
-+#   lseek (fd, offset, SEEK_SET);
-+#   read (fd, b, 4);
-+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+# }
-+#
-+# static unsigned int
-+# pe_as32 (ptr)
-+#      void *ptr;
-+# {
-+#   unsigned char *b = ptr;
-+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+# }
-+#
-+# int
-+# main (argc, argv)
-+#     int argc;
-+#     char *argv[];
-+# {
-+#     int dll;
-+#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
-+#     unsigned long export_rva, export_size, nsections, secptr, expptr;
-+#     unsigned long name_rvas, nexp;
-+#     unsigned char *expdata, *erva;
-+#     char *filename, *dll_name;
-+#
-+#     filename = argv[1];
-+#
-+#     dll = open(filename, O_RDONLY|O_BINARY);
-+#     if (dll < 1)
-+# 	return 1;
-+#
-+#     dll_name = filename;
-+#
-+#     for (i=0; filename[i]; i++)
-+# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
-+# 	    dll_name = filename + i +1;
-+#
-+#     pe_header_offset = pe_get32 (dll, 0x3c);
-+#     opthdr_ofs = pe_header_offset + 4 + 20;
-+#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
-+#
-+#     if (num_entries < 1) /* no exports */
-+# 	return 1;
-+#
-+#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
-+#     export_size = pe_get32 (dll, opthdr_ofs + 100);
-+#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
-+#     secptr = (pe_header_offset + 4 + 20 +
-+# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
-+#
-+#     expptr = 0;
-+#     for (i = 0; i < nsections; i++)
-+#     {
-+# 	char sname[8];
-+# 	unsigned long secptr1 = secptr + 40 * i;
-+# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-+# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
-+# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-+# 	lseek(dll, secptr1, SEEK_SET);
-+# 	read(dll, sname, 8);
-+# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
-+# 	{
-+# 	    expptr = fptr + (export_rva - vaddr);
-+# 	    if (export_rva + export_size > vaddr + vsize)
-+# 		export_size = vsize - (export_rva - vaddr);
-+# 	    break;
-+# 	}
-+#     }
-+#
-+#     expdata = (unsigned char*)malloc(export_size);
-+#     lseek (dll, expptr, SEEK_SET);
-+#     read (dll, expdata, export_size);
-+#     erva = expdata - export_rva;
-+#
-+#     nexp = pe_as32 (expdata+24);
-+#     name_rvas = pe_as32 (expdata+32);
-+#
-+#     printf ("EXPORTS\n");
-+#     for (i = 0; i<nexp; i++)
-+#     {
-+# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
-+# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
-+#     }
-+#
-+#     return 0;
-+# }
-+# /* impgen.c ends here */
-+
-+EOF
-+    ;;
-+  esac
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
-+
-+  mv -f "${ofile}T" "$ofile" || \
-+    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
-+  chmod +x "$ofile"
-+fi
-+
-+
-+
-+
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+
-+# Prevent multiple expansion
-+
-+
-+
-+
-+# Extract the first word of "lp", so it can be a program name with args.
-+set dummy lp; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:5425: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_LPRCOMMAND'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$LPRCOMMAND"; then
-+  ac_cv_prog_LPRCOMMAND="$LPRCOMMAND" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_LPRCOMMAND="lp"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+LPRCOMMAND="$ac_cv_prog_LPRCOMMAND"
-+if test -n "$LPRCOMMAND"; then
-+  echo "$ac_t""$LPRCOMMAND" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+# Extract the first word of "lpr", so it can be a program name with args.
-+set dummy lpr; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:5454: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_LPRCOMMAND'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$LPRCOMMAND"; then
-+  ac_cv_prog_LPRCOMMAND="$LPRCOMMAND" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_LPRCOMMAND="lpr"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+LPRCOMMAND="$ac_cv_prog_LPRCOMMAND"
-+if test -n "$LPRCOMMAND"; then
-+  echo "$ac_t""$LPRCOMMAND" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+# Extract the first word of "cat", so it can be a program name with args.
-+set dummy cat; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:5484: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CATCOMMAND'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CATCOMMAND"; then
-+  ac_cv_prog_CATCOMMAND="$CATCOMMAND" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CATCOMMAND="cat"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CATCOMMAND="$ac_cv_prog_CATCOMMAND"
-+if test -n "$CATCOMMAND"; then
-+  echo "$ac_t""$CATCOMMAND" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+# Extract the first word of "type", so it can be a program name with args.
-+set dummy type; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:5513: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CATCOMMAND'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CATCOMMAND"; then
-+  ac_cv_prog_CATCOMMAND="$CATCOMMAND" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CATCOMMAND="type"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CATCOMMAND="$ac_cv_prog_CATCOMMAND"
-+if test -n "$CATCOMMAND"; then
-+  echo "$ac_t""$CATCOMMAND" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+
-+
-+for ac_hdr in stdlib.h unistd.h errno.h assert.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:5546: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5551 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_hdr in sys/time.h time.h signal.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:5586: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5591 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_hdr in string.h strings.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:5626: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5631 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ break
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+
-+# @start variadic
-+case $am_cv_prog_cc_stdc,$ac_cv_header_varargs_h in
-+no,)
-+	# Non-ANSI compiler, so we must use varargs.h.
-+	for ac_hdr in varargs.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:5671: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5676 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+	;;
-+*,yes)
-+	# Parent package is using varargs.h which is incompatible with 
-+	# stdarg.h, so we do the same (recheck to generate checking...
-+	# message).
-+	for ac_hdr in varargs.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:5716: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5721 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+	;;
-+*)
-+	# If stdarg.h is present define HAVE_STDARG_H.
-+	for ac_hdr in stdarg.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:5759: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5764 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+	;;
-+esac
-+
-+case x$ac_cv_header_stdarg_h$ac_cv_header_varargs_h in
-+x*yes*) ;;
-+*) { echo "configure: error: Could not find stdarg.h or varargs.h" 1>&2; exit 1; } ;;
-+esac
-+# @end variadic
-+
-+echo $ac_n "checking for working const""... $ac_c" 1>&6
-+echo "configure:5805: checking for working const" >&5
-+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5810 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+/* Ultrix mips cc rejects this.  */
-+typedef int charset[2]; const charset x;
-+/* SunOS 4.1.1 cc rejects this.  */
-+char const *const *ccp;
-+char **p;
-+/* NEC SVR4.0.2 mips cc rejects this.  */
-+struct point {int x, y;};
-+static struct point const zero = {0,0};
-+/* AIX XL C 1.02.0.0 rejects this.
-+   It does not let you subtract one const X* pointer from another in an arm
-+   of an if-expression whose if-part is not a constant expression */
-+const char *g = "string";
-+ccp = &g + (g ? g-g : 0);
-+/* HPUX 7.0 cc rejects these. */
-+++ccp;
-+p = (char**) ccp;
-+ccp = (char const *const *) p;
-+{ /* SCO 3.2v4 cc rejects this.  */
-+  char *t;
-+  char const *s = 0 ? (char *) 0 : (char const *) 0;
-+
-+  *t++ = 0;
-+}
-+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-+  int x[] = {25, 17};
-+  const int *foo = &x[0];
-+  ++foo;
-+}
-+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+  typedef const int *iptr;
-+  iptr p = 0;
-+  ++p;
-+}
-+{ /* AIX XL C 1.02.0.0 rejects this saying
-+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+  struct s { int j; const int *ap[3]; };
-+  struct s *b; b->j = 5;
-+}
-+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+  const int foo = 10;
-+}
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:5859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_c_const=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_c_const=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_c_const" 1>&6
-+if test $ac_cv_c_const = no; then
-+  cat >> confdefs.h <<\EOF
-+#define const 
-+EOF
-+
-+fi
-+
-+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-+echo "configure:5880: checking for ANSI C header files" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5885 "configure"
-+#include "confdefs.h"
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  ac_cv_header_stdc=yes
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+cat > conftest.$ac_ext <<EOF
-+#line 5910 "configure"
-+#include "confdefs.h"
-+#include <string.h>
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "memchr" >/dev/null 2>&1; then
-+  :
-+else
-+  rm -rf conftest*
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+cat > conftest.$ac_ext <<EOF
-+#line 5928 "configure"
-+#include "confdefs.h"
-+#include <stdlib.h>
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "free" >/dev/null 2>&1; then
-+  :
-+else
-+  rm -rf conftest*
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+if test "$cross_compiling" = yes; then
-+  :
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5949 "configure"
-+#include "confdefs.h"
-+#include <ctype.h>
-+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int main () { int i; for (i = 0; i < 256; i++)
-+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-+exit (0); }
-+
-+EOF
-+if { (eval echo configure:5960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+  :
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  ac_cv_header_stdc=no
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+fi
-+
-+echo "$ac_t""$ac_cv_header_stdc" 1>&6
-+if test $ac_cv_header_stdc = yes; then
-+  cat >> confdefs.h <<\EOF
-+#define STDC_HEADERS 1
-+EOF
-+
-+fi
-+
-+echo $ac_n "checking for size_t""... $ac_c" 1>&6
-+echo "configure:5984: checking for size_t" >&5
-+if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 5989 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+  rm -rf conftest*
-+  ac_cv_type_size_t=yes
-+else
-+  rm -rf conftest*
-+  ac_cv_type_size_t=no
-+fi
-+rm -f conftest*
-+
-+fi
-+echo "$ac_t""$ac_cv_type_size_t" 1>&6
-+if test $ac_cv_type_size_t = no; then
-+  cat >> confdefs.h <<\EOF
-+#define size_t unsigned
-+EOF
-+
-+fi
-+
-+echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-+echo "configure:6017: checking whether time.h and sys/time.h may both be included" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6022 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <time.h>
-+int main() {
-+struct tm *tp;
-+; return 0; }
-+EOF
-+if { (eval echo configure:6031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_header_time=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_header_time=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_header_time" 1>&6
-+if test $ac_cv_header_time = yes; then
-+  cat >> confdefs.h <<\EOF
-+#define TIME_WITH_SYS_TIME 1
-+EOF
-+
-+fi
-+
-+
-+for ac_func in killpg kill
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6055: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6060 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in bcopy memcpy
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6110: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6115 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in bzero memset
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6165: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6170 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ break
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in bcmp memcmp
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6220: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6225 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in index strchr
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6275: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6280 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in rindex strrchr
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6330: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6335 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in initstate srand
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6385: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6390 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in random rand
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6440: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6445 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+
-+for ac_func in calloc
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6496: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6501 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+for ac_func in basename strerror vfprintf
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6551: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6556 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
-+fi
-+done
-+
-+
-+for ac_func in putenv
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:6608: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 6613 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:6636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
-+fi
-+done
-+
-+
-+
-+
-+# @end 5
-+# @start 1
-+
-+
-+Xsed="sed -e s/^X//"
-+LTLIBOBJS=`echo X"$LIBOBJS"|$Xsed -e "s,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,"`
-+
-+
-+
-+
-+
-+
-+trap '' 1 2 15
-+cat > confcache <<\EOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs.  It is not useful on other systems.
-+# If it contains results you don't want to keep, you may remove or edit it.
-+#
-+# By default, configure uses ./config.cache as the cache file,
-+# creating it if it does not exist already.  You can give configure
-+# the --cache-file=FILE option to use a different cache file; that is
-+# what configure does when it calls configure scripts in
-+# subdirectories, so they share the cache.
-+# Giving --cache-file=/dev/null disables caching, for debugging configure.
-+# config.status only pays attention to the cache file if you give it the
-+# --recheck option to rerun configure.
-+#
-+EOF
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, don't put newlines in cache variables' values.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(set) 2>&1 |
-+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-+  *ac_space=\ *)
-+    # `set' does not quote correctly, so add quotes (double-quote substitution
-+    # turns \\\\ into \\, and sed turns \\ into \).
-+    sed -n \
-+      -e "s/'/'\\\\''/g" \
-+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-+    ;;
-+  *)
-+    # `set' quotes correctly as required by POSIX, so do not add quotes.
-+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-+    ;;
-+  esac >> confcache
-+if cmp -s $cache_file confcache; then
-+  :
-+else
-+  if test -w $cache_file; then
-+    echo "updating cache $cache_file"
-+    cat confcache > $cache_file
-+  else
-+    echo "not updating unwritable cache $cache_file"
-+  fi
-+fi
-+rm -f confcache
-+
-+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+# Any assignment to VPATH causes Sun make to only execute
-+# the first set of double-colon rules, so remove it if not needed.
-+# If there is a colon in the path, we need to keep it.
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-+fi
-+
-+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+# Without the "./", some shells look in PATH for config.status.
-+: ${CONFIG_STATUS=./config.status}
-+
-+echo creating $CONFIG_STATUS
-+rm -f $CONFIG_STATUS
-+cat > $CONFIG_STATUS <<EOF
-+#! /bin/sh
-+# Generated automatically by configure.
-+# Run this file to recreate the current configuration.
-+# This directory was configured as follows,
-+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+#
-+# $0 $ac_configure_args
-+#
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in ./config.log if it exists.
-+
-+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-+for ac_option
-+do
-+  case "\$ac_option" in
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-+    exit 0 ;;
-+  -help | --help | --hel | --he | --h)
-+    echo "\$ac_cs_usage"; exit 0 ;;
-+  *) echo "\$ac_cs_usage"; exit 1 ;;
-+  esac
-+done
-+
-+ac_given_srcdir=$srcdir
-+ac_given_INSTALL="$INSTALL"
-+
-+trap 'rm -fr `echo "Makefile replace/Makefile metamail/Makefile src/Makefile \
-+	   src/metamail/Makefile src/richmail/Makefile bin/Makefile metamail/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
-+
-+# Protect against being on the right side of a sed subst in config.status.
-+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
-+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-+$ac_vpsub
-+$extrasub
-+s%@SHELL@%$SHELL%g
-+s%@CFLAGS@%$CFLAGS%g
-+s%@CPPFLAGS@%$CPPFLAGS%g
-+s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
-+s%@DEFS@%$DEFS%g
-+s%@LDFLAGS@%$LDFLAGS%g
-+s%@LIBS@%$LIBS%g
-+s%@exec_prefix@%$exec_prefix%g
-+s%@prefix@%$prefix%g
-+s%@program_transform_name@%$program_transform_name%g
-+s%@bindir@%$bindir%g
-+s%@sbindir@%$sbindir%g
-+s%@libexecdir@%$libexecdir%g
-+s%@datadir@%$datadir%g
-+s%@sysconfdir@%$sysconfdir%g
-+s%@sharedstatedir@%$sharedstatedir%g
-+s%@localstatedir@%$localstatedir%g
-+s%@libdir@%$libdir%g
-+s%@includedir@%$includedir%g
-+s%@oldincludedir@%$oldincludedir%g
-+s%@infodir@%$infodir%g
-+s%@mandir@%$mandir%g
-+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-+s%@INSTALL_DATA@%$INSTALL_DATA%g
-+s%@PACKAGE@%$PACKAGE%g
-+s%@VERSION@%$VERSION%g
-+s%@ACLOCAL@%$ACLOCAL%g
-+s%@AUTOCONF@%$AUTOCONF%g
-+s%@AUTOMAKE@%$AUTOMAKE%g
-+s%@AUTOHEADER@%$AUTOHEADER%g
-+s%@MAKEINFO@%$MAKEINFO%g
-+s%@SET_MAKE@%$SET_MAKE%g
-+s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-+s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-+s%@MAINT@%$MAINT%g
-+s%@host@%$host%g
-+s%@host_alias@%$host_alias%g
-+s%@host_cpu@%$host_cpu%g
-+s%@host_vendor@%$host_vendor%g
-+s%@host_os@%$host_os%g
-+s%@CC@%$CC%g
-+s%@build@%$build%g
-+s%@build_alias@%$build_alias%g
-+s%@build_cpu@%$build_cpu%g
-+s%@build_vendor@%$build_vendor%g
-+s%@build_os@%$build_os%g
-+s%@LN_S@%$LN_S%g
-+s%@OBJEXT@%$OBJEXT%g
-+s%@EXEEXT@%$EXEEXT%g
-+s%@ECHO@%$ECHO%g
-+s%@RANLIB@%$RANLIB%g
-+s%@STRIP@%$STRIP%g
-+s%@CPP@%$CPP%g
-+s%@LIBTOOL@%$LIBTOOL%g
-+s%@LIBTOOL_DEPS@%$LIBTOOL_DEPS%g
-+s%@LPRCOMMAND@%$LPRCOMMAND%g
-+s%@CATCOMMAND@%$CATCOMMAND%g
-+s%@LIBOBJS@%$LIBOBJS%g
-+s%@LTLIBOBJS@%$LTLIBOBJS%g
-+s%@ac_aux_dir@%$ac_aux_dir%g
-+
-+CEOF
-+EOF
-+
-+cat >> $CONFIG_STATUS <<\EOF
-+
-+# Split the substitutions into bite-sized pieces for seds with
-+# small command number limits, like on Digital OSF/1 and HP-UX.
-+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-+ac_file=1 # Number of current file.
-+ac_beg=1 # First line for current file.
-+ac_end=$ac_max_sed_cmds # Line after last line for current file.
-+ac_more_lines=:
-+ac_sed_cmds=""
-+while $ac_more_lines; do
-+  if test $ac_beg -gt 1; then
-+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-+  else
-+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-+  fi
-+  if test ! -s conftest.s$ac_file; then
-+    ac_more_lines=false
-+    rm -f conftest.s$ac_file
-+  else
-+    if test -z "$ac_sed_cmds"; then
-+      ac_sed_cmds="sed -f conftest.s$ac_file"
-+    else
-+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-+    fi
-+    ac_file=`expr $ac_file + 1`
-+    ac_beg=$ac_end
-+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-+  fi
-+done
-+if test -z "$ac_sed_cmds"; then
-+  ac_sed_cmds=cat
-+fi
-+EOF
-+
-+cat >> $CONFIG_STATUS <<EOF
-+
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile replace/Makefile metamail/Makefile src/Makefile \
-+	   src/metamail/Makefile src/richmail/Makefile bin/Makefile"}
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
-+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+  case "$ac_file" in
-+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-+  *) ac_file_in="${ac_file}.in" ;;
-+  esac
-+
-+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-+
-+  # Remove last slash and all that follows it.  Not all systems have dirname.
-+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-+    # The file is in a subdirectory.
-+    test ! -d "$ac_dir" && mkdir "$ac_dir"
-+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-+    # A "../" for each directory in $ac_dir_suffix.
-+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-+  else
-+    ac_dir_suffix= ac_dots=
-+  fi
-+
-+  case "$ac_given_srcdir" in
-+  .)  srcdir=.
-+      if test -z "$ac_dots"; then top_srcdir=.
-+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-+  *) # Relative path.
-+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+  esac
-+
-+  case "$ac_given_INSTALL" in
-+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+  esac
-+
-+  echo creating "$ac_file"
-+  rm -f "$ac_file"
-+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-+  case "$ac_file" in
-+  *Makefile*) ac_comsub="1i\\
-+# $configure_input" ;;
-+  *) ac_comsub= ;;
-+  esac
-+
-+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-+  sed -e "$ac_comsub
-+s%@configure_input@%$configure_input%g
-+s%@srcdir@%$srcdir%g
-+s%@top_srcdir@%$top_srcdir%g
-+s%@INSTALL@%$INSTALL%g
-+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-+fi; done
-+rm -f conftest.s*
-+
-+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-+# NAME is the cpp macro being defined and VALUE is the value it is being given.
-+#
-+# ac_d sets the value in "#define NAME VALUE" lines.
-+ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-+ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-+ac_dC='\3'
-+ac_dD='%g'
-+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-+ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-+ac_uB='\([ 	]\)%\1#\2define\3'
-+ac_uC=' '
-+ac_uD='\4%g'
-+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-+ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-+ac_eB='$%\1#\2define\3'
-+ac_eC=' '
-+ac_eD='%g'
-+
-+if test "${CONFIG_HEADERS+set}" != set; then
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
-+  CONFIG_HEADERS="metamail/config.h"
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
-+fi
-+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+  case "$ac_file" in
-+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-+  *) ac_file_in="${ac_file}.in" ;;
-+  esac
-+
-+  echo creating $ac_file
-+
-+  rm -f conftest.frag conftest.in conftest.out
-+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-+  cat $ac_file_inputs > conftest.in
-+
-+EOF
-+
-+# Transform confdefs.h into a sed script conftest.vals that substitutes
-+# the proper values into config.h.in to produce config.h.  And first:
-+# Protect against being on the right side of a sed subst in config.status.
-+# Protect against being in an unquoted here document in config.status.
-+rm -f conftest.vals
-+cat > conftest.hdr <<\EOF
-+s/[\\&%]/\\&/g
-+s%[\\$`]%\\&%g
-+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-+s%ac_d%ac_u%gp
-+s%ac_u%ac_e%gp
-+EOF
-+sed -n -f conftest.hdr confdefs.h > conftest.vals
-+rm -f conftest.hdr
-+
-+# This sed command replaces #undef with comments.  This is necessary, for
-+# example, in the case of _POSIX_SOURCE, which is predefined and required
-+# on some systems where configure will not decide to define it.
-+cat >> conftest.vals <<\EOF
-+s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-+EOF
-+
-+# Break up conftest.vals because some shells have a limit on
-+# the size of here documents, and old seds have small limits too.
-+
-+rm -f conftest.tail
-+while :
-+do
-+  ac_lines=`grep -c . conftest.vals`
-+  # grep -c gives empty output for an empty file on some AIX systems.
-+  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-+  # Write a limited-size here document to conftest.frag.
-+  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-+  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-+  echo 'CEOF
-+  sed -f conftest.frag conftest.in > conftest.out
-+  rm -f conftest.in
-+  mv conftest.out conftest.in
-+' >> $CONFIG_STATUS
-+  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-+  rm -f conftest.vals
-+  mv conftest.tail conftest.vals
-+done
-+rm -f conftest.vals
-+
-+cat >> $CONFIG_STATUS <<\EOF
-+  rm -f conftest.frag conftest.h
-+  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-+  cat conftest.in >> conftest.h
-+  rm -f conftest.in
-+  if cmp -s $ac_file conftest.h 2>/dev/null; then
-+    echo "$ac_file is unchanged"
-+    rm -f conftest.h
-+  else
-+    # Remove last slash and all that follows it.  Not all systems have dirname.
-+      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-+      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-+      # The file is in a subdirectory.
-+      test ! -d "$ac_dir" && mkdir "$ac_dir"
-+    fi
-+    rm -f $ac_file
-+    mv conftest.h $ac_file
-+  fi
-+fi; done
-+
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
-+
-+
-+  srcdir=$srcdir
-+  ac_cv_func_bzero=$ac_cv_func_bzero
-+  ac_cv_func_memset=$ac_cv_func_memset
-+  ac_cv_func_strchr=$ac_cv_func_strchr
-+  ac_cv_func_strrchr=$ac_cv_func_strrchr
-+# @end 5
-+  ac_cv_func_basename=$ac_cv_func_basename
-+  ac_cv_func_strcspn=$ac_cv_func_strcspn
-+  ac_cv_func_strerror=$ac_cv_func_strerror
-+  ac_cv_func_strsignal=$ac_cv_func_strsignal
-+  ac_cv_func_strspn=$ac_cv_func_strspn
-+  ac_cv_func_vfprintf=$ac_cv_func_vfprintf
-+  ac_cv_func_waitpid=$ac_cv_func_waitpid
-+  ac_cv_header_assert_h=$ac_cv_header_assert_h
-+  ac_cv_header_errno_h=$ac_cv_header_errno_h
-+  ac_cv_header_stdlib_h=$ac_cv_header_stdlib_h
-+  ac_cv_header_stdarg_h=$ac_cv_header_stdarg_h
-+  ac_cv_header_string_h=$ac_cv_header_string_h
-+  ac_cv_header_strings_h=$ac_cv_header_strings_h
-+  ac_cv_header_sys_wait_h=$ac_cv_header_sys_wait_h
-+  ac_cv_header_unistd_h=$ac_cv_header_unistd_h
-+  ac_cv_header_varargs_h=$ac_cv_header_varargs_h
-+  LPRCOMMAND=$LPRCOMMAND
-+  CATCOMMAND=$CATCOMMAND
-+  host=$host
-+# @start 5
-+
-+
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
-+test -z "$CONFIG_HEADERS" || echo timestamp > metamail/stamp-h
-+
-+  if test -n "$CONFIG_FILES" && test -n "$CONFIG_HEADERS"; then
-+    # If both these vars are non-empty, then config.status wasn't run by
-+    # automake rules (which always set one or the other to empty).
-+    CONFIG_OTHER=${CONFIG_OTHER-METAMAIL/common.h}
-+  fi
-+  case "$CONFIG_OTHER" in
-+  *metamail/common.h*)
-+    outfile=metamail/common.h
-+    stampfile=metamail/stamp-common
-+    tmpfile=${outfile}T
-+    dirname="sed s,^.*/,,g"
-+
-+    echo creating $outfile
-+    cat > $tmpfile << _EOF_
-+/*  -*- Mode: C -*-
-+ * --------------------------------------------------------------------
-+ * DO NOT EDIT THIS FILE!  It has been automatically generated
-+ * from:    configure.in and `echo $outfile|$dirname`.in
-+ * on host: `(hostname || uname -n) 2>/dev/null | sed 1q`
-+ * --------------------------------------------------------------------
-+ */
-+
-+#ifndef METAMAIL_COMMON_H
-+#define METAMAIL_COMMON_H 1
-+
-+#include <stdio.h>
-+#include <ctype.h>        // ??? ok here
-+#include <sys/types.h>
-+#include <sys/stat.h>     // ??? ok here
-+
-+// ??? following ok here without check?
-+#include <pwd.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/file.h>
-+#include <signal.h>
-+
-+#include <termio.h>
-+#include <fcntl.h>
-+#include <sys/utsname.h>
-+_EOF_
-+
-+    case "${host}" in
-+      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
-+
-+#include <linux/limits.h>
-+
-+_EOF_
-+;;
-+    esac
-+
-+# @end 5
-+# @start 4
-+    # Add the code to include these headers only if autoconf has
-+    # shown them to be present.
-+    if test x$ac_cv_header_stdlib_h = xyes; then
-+      echo '#include <stdlib.h>' >> $tmpfile
-+    fi
-+    if test x$ac_cv_header_unistd_h = xyes; then
-+      echo '#include <unistd.h>' >> $tmpfile
-+    fi
-+    if test x$ac_cv_header_sys_wait_h = xyes; then
-+      echo '#include <sys/wait.h>' >> $tmpfile
-+    fi
-+    if test x$ac_cv_header_errno_h = xyes; then
-+      echo '#include <errno.h>' >> $tmpfile
-+    fi
-+    cat >> $tmpfile << '_EOF_'
-+
-+#ifndef errno
-+/* Some sytems #define this! */
-+extern int errno;
-+#endif
-+
-+_EOF_
-+    if test x$ac_cv_header_string_h = xyes; then
-+      echo '#include <string.h>' >> $tmpfile
-+    elif test x$ac_cv_header_strings_h = xyes; then
-+      echo '#include <strings.h>' >> $tmpfile
-+    fi
-+
-+# *******************
-+# start variadic parameters 
-+#
-+    if test x$ac_cv_header_stdarg_h = xyes \
-+	&& test x$ac_cv_header_varargs_h != xyes
-+    then
-+      cat >> $tmpfile << '_EOF_'
-+
-+#include <stdarg.h>
-+#ifndef VA_START
-+#  define VA_START(a, f) va_start(a, f)
-+#endif /* VA_START */
-+
-+_EOF_
-+    else
-+      cat >> $tmpfile << '_EOF_'
-+	
-+#include <varargs.h>
-+#ifndef VA_START
-+#  define VA_START(a, f) va_start(a)
-+#endif /* VA_START */
-+       
-+_EOF_
-+    fi
-+#
-+# end variadic parameters
-+# ***********************
-+
-+    if test x$ac_cv_header_assert_h = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+
-+#include <assert.h>
-+#define METAMAIL_ASSERT assert
-+
-+_EOF_
-+else
-+        echo '#define METAMAIL_ASSERT(expr)  ((void) 0)' >> $tmpfile
-+    fi
-+# @end 4
-+# @start 5
-+    if test x$ac_cv_func_killpg = xno && \
-+       test x$ac_cv_func_kill = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+#define killbg(pid, sig) ((int) kill (-(pid), sig))
-+_EOF_
-+    fi 
-+    if test x$ac_cv_func_bcopy = xno && \
-+       test x$ac_cv_func_memcpy = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+#define bcopy(src, dest, n) ((void) memcpy (dest, src, n))
-+_EOF_
-+    fi
-+    if test x$ac_cv_func_bzero = xno && \
-+       test x$ac_cv_func_memset = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+#define bzero(buf, bytes) ((void) memset (buf, 0, bytes))
-+_EOF_
-+    fi
-+    if test x$ac_cv_func_bcmp = xno && \
-+       test x$ac_cv_func_memcmp = xyes; then
-+      echo '#define bcmp memcmp' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_index = xno && \
-+       test x$ac_cv_func_strchr = xyes; then
-+      echo '#define index strchr' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_rindex = xno && \
-+       test x$ac_cv_func_strrchr = xyes; then
-+      echo '#define rindex strrchr' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_initstate = xno && \
-+       test x$ac_cv_func_srand = xyes; then
-+      echo '#define initstate srand' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_random = xno && \
-+       test x$ac_cv_func_rand = xyes; then
-+      echo '#define random rand' >> $tmpfile
-+    fi
-+
-+    # The ugly but portable cpp stuff comes from here
-+    infile=$srcdir/metamail/`echo $outfile | sed 's,.*/,,g;s,\..*$,,g'`-h.in
-+    sed '/^##.*$/d' $infile >> $tmpfile 
-+
-+# @end 5
-+    ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
-+    if test x$ac_cv_func_basename = xno; then
-+      echo 'extern char *basename PARAMS((const char *path));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_strerror = xno; then
-+      echo 'extern char *strerror PARAMS((int err));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_strsignal = xno; then
-+      echo 'extern char *strsignal PARAMS((int signo));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_vfprintf = xno; then
-+      echo 'extern int vfprintf PARAMS((FILE *file, const char* format, va_list ap));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_waitpid = xno; then 
-+	echo 'extern pid_t waitpid PARAMS((pid_t pid, int *pstatus, int options));' >> ${tmpfile}2
-+    fi
-+
-+    if test -f ${tmpfile}2; then
-+      cat >> $tmpfile << '_EOF_'
-+
-+BEGIN_C_DECLS
-+_EOF_
-+      cat ${tmpfile}2 >> $tmpfile
-+      echo 'END_C_DECLS' >> $tmpfile
-+      ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
-+    fi
-+
-+    if test -n ${LPRCOMMAND}; then
-+      echo '#define LPRCOMMAND "'${LPRCOMMAND}'"' >> $tmpfile
-+      echo '#define LPRTEMPLATE "'${LPRCOMMAND}' %s"' >> $tmpfile
-+    fi
-+    if test -n ${CATCOMMAND}; then
-+      echo '#define CATCOMMAND "'${CATCOMMAND}'"' >> $tmpfile
-+      echo '#define CATTEMPLATE "'${CATCOMMAND}' %s"' >> $tmpfile
-+    fi
-+
-+    case "${host}" in
-+      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
-+#define TMPNAME_MAX NAME_MAX
-+static struct termio MyTtyStateIn, MyTtyStateOut;
-+
-+_EOF_
-+;;
-+      *) cat >> $tmpfile << '_EOF_'
-+
-+#define TMPNAME_MAX	1000
-+#define NAME_MAX	1000
-+static struct sgttyb MyTtyStateIn, MyTtyStateOut;
-+
-+_EOF_
-+;;
-+    esac
-+
-+    cat >> $tmpfile << '_EOF_'
-+
-+
-+#endif /* !METAMAIL_COMMON_H */
-+_EOF_
-+
-+    if cmp -s $tmpfile $outfile; then
-+      echo $outfile is unchanged
-+      rm -f $tmpfile
-+    else
-+      mv $tmpfile $outfile
-+      touch $stampfile
-+    fi
-+    ;;
-+  esac
-+# @start 5
-+
-+test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h.in
-+exit 0
-+EOF
-+chmod +x $CONFIG_STATUS
-+rm -fr confdefs* $ac_clean_files
-+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-+
---- metamail-2.7.orig/configure.in
-+++ metamail-2.7/configure.in
-@@ -0,0 +1,361 @@
-+dnl Process this file with autoconf to produce a configure script.
-+dnl AC_REVISION($Revision: 1.4 $)dnl
-+AC_INIT(src/metamail/metamail.c)
-+AC_CONFIG_AUX_DIR(config)
-+AM_CONFIG_HEADER(metamail/config.h)
-+AM_INIT_AUTOMAKE(metamail, 0.0.1)
-+AM_MAINTAINER_MODE
-+
-+AC_CANONICAL_HOST
-+
-+dnl Checks for programs.
-+AC_PROG_CC
-+AM_PROG_LIBTOOL
-+AC_SUBST(LIBTOOL_DEPS)
-+
-+AC_CHECK_PROG(LPRCOMMAND, lp, lp)
-+AC_CHECK_PROG(LPRCOMMAND, lpr, lpr)
-+
-+AC_CHECK_PROG(CATCOMMAND, cat, cat)
-+AC_CHECK_PROG(CATCOMMAND, type, type)
-+
-+
-+dnl Checks for libraries.
-+
-+dnl Checks for header files.
-+dnl varargscheck ?
-+dnl AC_HEADER_STDC
-+AC_CHECK_HEADERS(stdlib.h unistd.h errno.h assert.h)
-+AC_CHECK_HEADERS(sys/time.h time.h signal.h)
-+AC_CHECK_HEADERS(string.h strings.h, break)
-+
-+# @start variadic
-+case $am_cv_prog_cc_stdc,$ac_cv_header_varargs_h in
-+no,)
-+	# Non-ANSI compiler, so we must use varargs.h.
-+	AC_CHECK_HEADERS(varargs.h)
-+	;;
-+*,yes)
-+	# Parent package is using varargs.h which is incompatible with 
-+	# stdarg.h, so we do the same (recheck to generate checking...
-+	# message).
-+	AC_CHECK_HEADERS(varargs.h)
-+	;;
-+*)
-+	# If stdarg.h is present define HAVE_STDARG_H.
-+	AC_CHECK_HEADERS(stdarg.h)
-+	;;
-+esac
-+
-+case x$ac_cv_header_stdarg_h$ac_cv_header_varargs_h in
-+x*yes*) ;;
-+*) AC_MSG_ERROR(Could not find stdarg.h or varargs.h, one of which is \
-+required for the build process.) ;;
-+esac
-+# @end variadic
-+
-+dnl Checks for typedefs, structures, and compiler characteristics.
-+AC_C_CONST
-+AC_TYPE_SIZE_T
-+AC_HEADER_TIME
-+
-+dnl Checks for library functions.
-+dnl bzero is ok, 
-+AC_CHECK_FUNCS(killpg kill)
-+AC_CHECK_FUNCS(bcopy memcpy)
-+AC_CHECK_FUNCS(bzero memset, break)
-+AC_CHECK_FUNCS(bcmp memcmp)
-+AC_CHECK_FUNCS(index strchr)
-+AC_CHECK_FUNCS(rindex strrchr)
-+AC_CHECK_FUNCS(initstate srand)
-+AC_CHECK_FUNCS(random rand)
-+
-+AC_CHECK_FUNCS(calloc)
-+AC_REPLACE_FUNCS(basename strerror vfprintf)
-+AC_REPLACE_FUNCS(putenv)
-+
-+dnl *****************************************
-+dnl create a metamail common header file, holding all needed definitions
-+dnl for copatiblity
-+AC_OUTPUT_COMMANDS([
-+  if test -n "$CONFIG_FILES" && test -n "$CONFIG_HEADERS"; then
-+    # If both these vars are non-empty, then config.status wasn't run by
-+    # automake rules (which always set one or the other to empty).
-+    CONFIG_OTHER=${CONFIG_OTHER-METAMAIL/common.h}
-+  fi
-+  case "$CONFIG_OTHER" in
-+  *metamail/common.h*)
-+    outfile=metamail/common.h
-+    stampfile=metamail/stamp-common
-+    tmpfile=${outfile}T
-+    dirname="sed s,^.*/,,g"
-+
-+    echo creating $outfile
-+    cat > $tmpfile << _EOF_
-+/*  -*- Mode: C -*-
-+ * --------------------------------------------------------------------
-+ * DO NOT EDIT THIS FILE!  It has been automatically generated
-+ * from:    configure.in and `echo $outfile|$dirname`.in
-+ * on host: `(hostname || uname -n) 2>/dev/null | sed 1q`
-+ * --------------------------------------------------------------------
-+ */
-+
-+#ifndef METAMAIL_COMMON_H
-+#define METAMAIL_COMMON_H 1
-+
-+#include <stdio.h>
-+#include <ctype.h>        // ??? ok here
-+#include <sys/types.h>
-+#include <sys/stat.h>     // ??? ok here
-+
-+// ??? following ok here without check?
-+#include <pwd.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/file.h>
-+#include <signal.h>
-+
-+#include <termio.h>
-+#include <fcntl.h>
-+#include <sys/utsname.h>
-+_EOF_
-+
-+    case "${host}" in
-+      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
-+
-+#include <linux/limits.h>
-+
-+_EOF_
-+;;
-+    esac
-+
-+# @end 5
-+# @start 4
-+    # Add the code to include these headers only if autoconf has
-+    # shown them to be present.
-+    if test x$ac_cv_header_stdlib_h = xyes; then
-+      echo '#include <stdlib.h>' >> $tmpfile
-+    fi
-+    if test x$ac_cv_header_unistd_h = xyes; then
-+      echo '#include <unistd.h>' >> $tmpfile
-+    fi
-+    if test x$ac_cv_header_sys_wait_h = xyes; then
-+      echo '#include <sys/wait.h>' >> $tmpfile
-+    fi
-+    if test x$ac_cv_header_errno_h = xyes; then
-+      echo '#include <errno.h>' >> $tmpfile
-+    fi
-+    cat >> $tmpfile << '_EOF_'
-+
-+#ifndef errno
-+/* Some sytems #define this! */
-+extern int errno;
-+#endif
-+
-+_EOF_
-+    if test x$ac_cv_header_string_h = xyes; then
-+      echo '#include <string.h>' >> $tmpfile
-+    elif test x$ac_cv_header_strings_h = xyes; then
-+      echo '#include <strings.h>' >> $tmpfile
-+    fi
-+
-+# *******************
-+# start variadic parameters 
-+#
-+    if test x$ac_cv_header_stdarg_h = xyes \
-+	&& test x$ac_cv_header_varargs_h != xyes
-+    then
-+      cat >> $tmpfile << '_EOF_'
-+
-+#include <stdarg.h>
-+#ifndef VA_START
-+#  define VA_START(a, f) va_start(a, f)
-+#endif /* VA_START */
-+
-+_EOF_
-+    else
-+      cat >> $tmpfile << '_EOF_'
-+	
-+#include <varargs.h>
-+#ifndef VA_START
-+#  define VA_START(a, f) va_start(a)
-+#endif /* VA_START */
-+       
-+_EOF_
-+    fi
-+#
-+# end variadic parameters
-+# ***********************
-+
-+    if test x$ac_cv_header_assert_h = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+
-+#include <assert.h>
-+#define METAMAIL_ASSERT assert
-+
-+_EOF_
-+else
-+        echo '#define METAMAIL_ASSERT(expr)  ((void) 0)' >> $tmpfile
-+    fi
-+# @end 4
-+# @start 5
-+    if test x$ac_cv_func_killpg = xno && \
-+       test x$ac_cv_func_kill = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+#define killbg(pid, sig) ((int) kill (-(pid), sig))
-+_EOF_
-+    fi 
-+    if test x$ac_cv_func_bcopy = xno && \
-+       test x$ac_cv_func_memcpy = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+#define bcopy(src, dest, n) ((void) memcpy (dest, src, n))
-+_EOF_
-+    fi
-+    if test x$ac_cv_func_bzero = xno && \
-+       test x$ac_cv_func_memset = xyes; then
-+      cat >> $tmpfile << '_EOF_'
-+#define bzero(buf, bytes) ((void) memset (buf, 0, bytes))
-+_EOF_
-+    fi
-+    if test x$ac_cv_func_bcmp = xno && \
-+       test x$ac_cv_func_memcmp = xyes; then
-+      echo '#define bcmp memcmp' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_index = xno && \
-+       test x$ac_cv_func_strchr = xyes; then
-+      echo '#define index strchr' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_rindex = xno && \
-+       test x$ac_cv_func_strrchr = xyes; then
-+      echo '#define rindex strrchr' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_initstate = xno && \
-+       test x$ac_cv_func_srand = xyes; then
-+      echo '#define initstate srand' >> $tmpfile
-+    fi
-+    if test x$ac_cv_func_random = xno && \
-+       test x$ac_cv_func_rand = xyes; then
-+      echo '#define random rand' >> $tmpfile
-+    fi
-+
-+    # The ugly but portable cpp stuff comes from here
-+    infile=$srcdir/metamail/`echo $outfile | sed 's,.*/,,g;s,\..*$,,g'`-h.in
-+    sed '/^##.*$/d' $infile >> $tmpfile 
-+
-+# @end 5
-+    ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
-+    if test x$ac_cv_func_basename = xno; then
-+      echo 'extern char *basename PARAMS((const char *path));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_strerror = xno; then
-+      echo 'extern char *strerror PARAMS((int err));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_strsignal = xno; then
-+      echo 'extern char *strsignal PARAMS((int signo));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_vfprintf = xno; then
-+      echo 'extern int vfprintf PARAMS((FILE *file, const char* format, va_list ap));' >> ${tmpfile}2
-+    fi
-+    if test x$ac_cv_func_waitpid = xno; then 
-+	echo 'extern pid_t waitpid PARAMS((pid_t pid, int *pstatus, int options));' >> ${tmpfile}2
-+    fi
-+
-+    if test -f ${tmpfile}2; then
-+      cat >> $tmpfile << '_EOF_'
-+
-+BEGIN_C_DECLS
-+_EOF_
-+      cat ${tmpfile}2 >> $tmpfile
-+      echo 'END_C_DECLS' >> $tmpfile
-+      ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
-+    fi
-+
-+    if test -n ${LPRCOMMAND}; then
-+      echo '#define LPRCOMMAND "'${LPRCOMMAND}'"' >> $tmpfile
-+      echo '#define LPRTEMPLATE "'${LPRCOMMAND}' %s"' >> $tmpfile
-+    fi
-+    if test -n ${CATCOMMAND}; then
-+      echo '#define CATCOMMAND "'${CATCOMMAND}'"' >> $tmpfile
-+      echo '#define CATTEMPLATE "'${CATCOMMAND}' %s"' >> $tmpfile
-+    fi
-+
-+    case "${host}" in
-+      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
-+#define TMPNAME_MAX NAME_MAX
-+static struct termio MyTtyStateIn, MyTtyStateOut;
-+
-+_EOF_
-+;;
-+      *) cat >> $tmpfile << '_EOF_'
-+
-+#define TMPNAME_MAX	1000
-+#define NAME_MAX	1000
-+static struct sgttyb MyTtyStateIn, MyTtyStateOut;
-+
-+_EOF_
-+;;
-+    esac
-+
-+    cat >> $tmpfile << '_EOF_'
-+
-+
-+#endif /* !METAMAIL_COMMON_H */
-+_EOF_
-+
-+    if cmp -s $tmpfile $outfile; then
-+      echo $outfile is unchanged
-+      rm -f $tmpfile
-+    else
-+      mv $tmpfile $outfile
-+      touch $stampfile
-+    fi
-+    ;;
-+  esac
-+# @start 5
-+],[
-+  srcdir=$srcdir
-+  ac_cv_func_bzero=$ac_cv_func_bzero
-+  ac_cv_func_memset=$ac_cv_func_memset
-+  ac_cv_func_strchr=$ac_cv_func_strchr
-+  ac_cv_func_strrchr=$ac_cv_func_strrchr
-+# @end 5
-+  ac_cv_func_basename=$ac_cv_func_basename
-+  ac_cv_func_strcspn=$ac_cv_func_strcspn
-+  ac_cv_func_strerror=$ac_cv_func_strerror
-+  ac_cv_func_strsignal=$ac_cv_func_strsignal
-+  ac_cv_func_strspn=$ac_cv_func_strspn
-+  ac_cv_func_vfprintf=$ac_cv_func_vfprintf
-+  ac_cv_func_waitpid=$ac_cv_func_waitpid
-+  ac_cv_header_assert_h=$ac_cv_header_assert_h
-+  ac_cv_header_errno_h=$ac_cv_header_errno_h
-+  ac_cv_header_stdlib_h=$ac_cv_header_stdlib_h
-+  ac_cv_header_stdarg_h=$ac_cv_header_stdarg_h
-+  ac_cv_header_string_h=$ac_cv_header_string_h
-+  ac_cv_header_strings_h=$ac_cv_header_strings_h
-+  ac_cv_header_sys_wait_h=$ac_cv_header_sys_wait_h
-+  ac_cv_header_unistd_h=$ac_cv_header_unistd_h
-+  ac_cv_header_varargs_h=$ac_cv_header_varargs_h
-+  LPRCOMMAND=$LPRCOMMAND
-+  CATCOMMAND=$CATCOMMAND
-+  host=$host
-+# @start 5
-+])
-+# @end 5
-+# @start 1
-+
-+dnl *****************************************
-+dnl export of variable settings for Makefiles
-+
-+dnl for libtool to work LTLIBOJS is needed (currently bug of autoconf)
-+Xsed="sed -e s/^X//"
-+LTLIBOBJS=`echo X"$LIBOBJS"|[$Xsed -e "s,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,"]`
-+AC_SUBST(LTLIBOBJS)
-+
-+dnl the aux dir (for holding config & autodenerated stuff)
-+AC_SUBST(ac_aux_dir)
-+AC_SUBST(LPRCOMMAND)
-+AC_SUBST(CATCOMMAND)
-+
-+AC_OUTPUT([Makefile replace/Makefile metamail/Makefile src/Makefile \
-+	   src/metamail/Makefile src/richmail/Makefile bin/Makefile],
-+[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h.in])
---- metamail-2.7.orig/debian/mimeit.1
-+++ metamail-2.7/debian/mimeit.1
-@@ -0,0 +1,28 @@
-+.TH MIMEIT 1 "1998 March 1st" "METAMAIL" "Debian Linux Manual"
-+.SH NAME
-+mimeit \- base64-encode stdin and mail it
-+.SH SYNOPSIS
-+.B mimeit
-+.I content-type recipient subject
-+.RI [ splitmail-options ]
-+.SH "DESCRIPTION"
-+This manual page documents briefly the
-+.B mimeit
-+command.
-+This manual page was written for the
-+.B Debian GNU/Linux
-+distribution (but may be used by others), because the original
-+program does not have a manual page.
-+.PP
-+.B mimeit
-+base64-encodes the message read from stdin and sends it off
-+using
-+.BR splitmail (1).
-+It will pass all but the first three parameters to \fBsplitmail\fR(1).
-+.SH AUTHOR
-+.B mimeit
-+is part of metamail package.  Manual page added by Herbert Xu
-+and fixed by Michael Moerz <e9625136@stud3.tuwien.ac.at>.
-+.SH SEE ALSO
-+.PP
-+\fBMIME\fR(1), \fBsplitmail\fR(1), \fBmunpack\fR(1), \fBmetamail\fR(1)
---- metamail-2.7.orig/debian/mime
-+++ metamail-2.7/debian/mime
-@@ -0,0 +1,7 @@
-+text/plain; shownonascii iso-8859-1 %s; description="Plain ASCII Text"; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
-+text/richtext; richtext %s; description="Richtext"; copiousoutput; priority=4
-+text/richtext; shownonascii iso-8859-1 -e richtext -p %s; description="Richtext"; copiousoutput; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
-+text/enriched; richtext -e %s; description="Enriched Text"; copiousoutput; priority=4
-+text/enriched; shownonascii iso-8859-1 -e richtext -e -p %s; description="Enriched Text"; copiousoutput; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
-+message/partial; showpartial %s %{id} %{number} %{total}; description="An incomplete message"
-+message/external-body; showexternal %s %{access-type} %{name} %{site} %{directory} %{mode} %{server}; needsterminal; description="A reference to data stored in an external location"; composetyped="extcompose %s"
---- metamail-2.7.orig/debian/changelog
-+++ metamail-2.7/debian/changelog
-@@ -0,0 +1,435 @@
-+metamail (2.7-52) unstable; urgency=low
-+
-+  * QA Group upload.
-+  * Set Standards-Version to 3.7.2.
-+  * Set DH_COMPAT to 5.
-+  * Fixed "Does not provide filenames for attachments", closes:
-+    #321968. Patch by Immanuel Halupczok <debian-bugs@karimmi.de>.
-+  * Fixed "dumps core with -w option", closes: #357163.
-+    Patch by Justin Pryzby <justinpryzby@users.sourceforge.net>.
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org>  Wed, 19 Jul 2006 12:53:40 +1000
-+
-+metamail (2.7-51) unstable; urgency=high
-+
-+  * QA upload.
-+  * Fixed "[CVE-2006-0709] crashes with very long boundaries in
-+    messages", closes: #352482, #353539. Patch thanks to
-+    Ulf Harnhammar <metaur@telia.com>.
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org>  Thu, 23 Feb 2006 09:17:36 +1100
-+
-+metamail (2.7-50) unstable; urgency=low
-+
-+  * QA upload.
-+  * Automatically update config.sub and config.guess from autotools-dev.
-+    Closes: #338566.
-+  * man/metamail.1: Fix search path formatting.
-+
-+ -- Matej Vela <vela@debian.org>  Fri, 11 Nov 2005 07:42:03 +0100
-+
-+metamail (2.7-49) unstable; urgency=low
-+
-+  * QA upload.
-+  * bin/uuenpipe, bin/uudepipe: Properly handle unreadable files,
-+    filenames beginning with "-", and filenames containing whitespace.
-+    (These scripts were not meant to take options.)  Closes: #273195.
-+  * src/metamail/mailto.c (GetLineMalloced): Fix segfault caused by
-+    freeing static storage.  Closes: #300756.
-+  * man/metamail.1: Document the -E option.  Closes: #177823.
-+  * man/richtext.1: Document the -e option.  Closes: #296120.
-+  * Conforms to Standards version 3.6.2.
-+
-+ -- Matej Vela <vela@debian.org>  Fri, 19 Aug 2005 11:25:02 +0200
-+
-+metamail (2.7-48) unstable; urgency=low
-+
-+  * QA Group upload by Javier Fernandez-Sanguino
-+  * Fix typos in manpages with patches provided by A Costa (Closes: #311450,
-+    #311451, #311452, #311453)
-+  * Fix use of temporary files in showpartial so that uses cannot introduce
-+    a DOS through the use of hard links. Temporary files are created with
-+    mktemp and their filename is stored in ~/.metamail_treeroot (Closes:
-+    #321473)
-+
-+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Wed, 17 Aug 2005 00:17:20 +0200
-+
-+metamail (2.7-47) unstable; urgency=low
-+
-+  * QA Group upload by Anibal Monsalve Salazar.
-+  * Fixed "Add/Improve SEE ALSO section for splitmail/mimeit" (Closes:
-+    #245647). Patch by Helge Kreutzmann <kreutzm@itp.uni-hannover.de>.
-+  * Fixed "8-bit encoding is supported by metamail but not by metasend script"
-+    (Closes: #285914). Patch by Sergey Kogan <kogan@sklad.bacon.ru>.
-+  * Fixed "additional option when handling unrecognized content types"
-+    (Closes: #249823). Patch by Daniel Kraft <da_kraft@web.de>.
-+  * Fixed "debug message 'pre access' left in released version
-+    (Closes: #184410). Patch by <pmaydell@chiark.greenend.org.uk>.
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org>  Sun, 13 Feb 2005 10:43:55 +1100
-+
-+metamail (2.7-46) unstable; urgency=low
-+
-+  * QA Group upload orphaning this package
-+  * Incorporates previous NMUs (closes: #164074, #185005, #233935)
-+  * debian/control: make build-dependency on debhelper versioned
-+
-+ -- Andrew Pollock <apollock@debian.org>  Tue,  9 Nov 2004 22:14:08 +1100
-+
-+metamail (2.7-45.3) unstable; urgency=medium
-+
-+  * Non-maintainer upload by the Security Team
-+  * Adjust the patch since Christian 'Naddy' Weisgerber discovered an
-+    overzealous use of sizeof().
-+
-+ -- Martin Schulze <joey@infodrom.org>  Tue,  2 Mar 2004 20:08:51 +0100
-+
-+metamail (2.7-45.2) unstable; urgency=high
-+
-+  * NMU
-+  * [src/metamail/metamail.c, src/metamail/splitmail.c] Address CAN-2004-0104
-+    and CAN-2004-0105 (format string vulnerabilities and buffer overflows).
-+    (Addresses #233640 for sid)
-+  * [bin/audiocompose] Quote file reference.
-+  * [metamail/splitmail.c] Use /usr/sbin/sendmail rather than
-+    /usr/lib/sendmail.
-+
-+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Fri, 20 Feb 2004 21:22:16 +0100
-+
-+metamail (2.7-45.1) unstable; urgency=low
-+
-+  * NMU
-+  * Fixed FTBFS: (Closes: #164074)
-+    * [configure.in] Added AM_MAINTAINER_MODE.
-+    * [debian/rules] Introduced "source-updates" target.
-+    * [debian/control] Dropped "libtool" and "automake" build dependencies.
-+    * Regenerated auto* files.
-+  * [bin/audiosend] Fixed shell syntax by adding a 'then'.
-+  * [debian/control] Removed full stop from the one line description.
-+
-+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 16 Mar 2003 13:38:42 +0100
-+
-+metamail (2.7-45) unstable; urgency=low
-+
-+  * eliminated nasty tmpfile bug that caused removal of temporary files
-+    though they were in use by processes that have been backgrounded by
-+    metamail. (Closes: #141966)
-+
-+ -- Michael Moerz <mikem@debian.org>  Mon, 15 Apr 2002 11:07:17 +0200
-+
-+metamail (2.7-44) unstable; urgency=low
-+
-+  * renamed mmencode reference from metamail manpage to mimencode
-+    (Closes: #137347)
-+  * removed mailcap manpage from metamail package so that can go into
-+    the mime-support package (Closes:  #139989)
-+
-+ -- Michael Moerz <mikem@debian.org>  Wed,  3 Apr 2002 02:24:53 +0200
-+
-+metamail (2.7-43) unstable; urgency=low
-+
-+  * fixed 64bit architecture problems caused by missing prototypes of
-+    functions. The actual pactch was developed by 
-+    John R.Daily" <jdaily@progeny.com> (Closes: #126109)
-+  * fixed usage message of mimencode by using a patch supplied by
-+    David Fries <dfries@mail.win.org> (Closes: #119075)
-+
-+ -- Michael Moerz <mikem@debian.org>  Sat, 22 Dec 2001 00:35:19 +0100
-+
-+metamail (2.7-42) unstable; urgency=low
-+
-+  * fixed bug that caused mailto to honour newlines incorrectly when
-+    mimetypes are asked for and checked.
-+
-+ -- Michael Moerz <mikem@debian.org>  Mon, 15 Oct 2001 22:11:35 +0200
-+
-+metamail (2.7-41) unstable; urgency=low
-+
-+  * fixed a minor bug regarding the man page of metamail saying /usr/ucb/reset
-+    and not /usr/bin/reset (Closes: #110889)
-+  * fixed broken showpartial (Closes: #107538)
-+
-+ -- Michael Moerz <mikem@debian.org>  Sat,  1 Sep 2001 20:32:01 +0200
-+
-+metamail (2.7-40) unstable; urgency=low
-+
-+  * Removed non functional downwards compatiblity code for older
-+    mime-support which called install-mime when the previous metamail
-+    version was less than 2-7.34. (Closes: #100993)
-+  * hardened dependency to mime-support (version 3.11-1 or higher has
-+    to be installed now)
-+
-+ -- Michael Moerz <mikem@debian.org>  Sat, 16 Jun 2001 13:48:12 +0200
-+
-+metamail (2.7-39) unstable; urgency=low
-+
-+  * fixed a bug that created a segfault when saving an attachment.
-+    (Closes: #88766)
-+
-+ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Tue, 20 Mar 2001 20:52:20 +0100
-+
-+metamail (2.7-38) unstable; urgency=low
-+
-+  * stupid me has again missed a build depends for libncurses-dev.
-+    This is fixed now. (Closes: #86559)
-+
-+ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Sun, 25 Feb 2001 17:05:45 +0100
-+
-+metamail (2.7-37) unstable; urgency=low
-+
-+  * Fixed broken build caused by not using a shell for interpreting
-+    the bootstrap script (Closes: #85764).
-+  * changed rules file so that not only the existence of Makefile
-+    is checked, but of Makefile.in too and the decision is made
-+    to use make clean or make destclean (Makefile.in present).
-+  * fixed build depends to enlist libtool & automake too.
-+    (Closes: #86128)
-+  * fixed disappearing of mimencode (Closes: #86083)
-+
-+ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Tue, 13 Feb 2001 14:08:20 +0100
-+
-+metamail (2.7-36) unstable; urgency=low
-+
-+  * Fixed broken showpartial where a variable was not set correctly
-+    (nullified) and that caused that showpartial didn't work.
-+    (Closes: #58614)
-+  * Fixed mimeit manpage refering to mm package instead of metamail
-+    (Closes: #63033)
-+  * added a README.Debian pointing out the debian specific
-+    modifications to the package
-+  * Fixed the leaving tmp-files behind bug. So now metamail removes
-+    all files it generates in /tmp before it terminates.
-+    (Closes: #39011)
-+  * DH_COMPAT=2 is now in place and functional
-+  * converted build-process and .c and .h files to use autoconf and
-+    automake. (Now the package will build under woody again.) 
-+
-+ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Thu, 18 Jan 2001 04:26:05 +0100
-+
-+metamail (2.7-35) unstable; urgency=low
-+
-+  * Fixed a typo in metasend that resulted in Content-Description
-+    being blank when -n wasn't set. (Closes: #70761)
-+
-+ -- Teemu Hukkanen <tjhukkan@iki.fi>  Sun, 10 Sep 2000 21:58:00 +0300
-+
-+metamail (2.7-34) frozen unstable; urgency=low
-+
-+  * The install-all target tried to strip shell scripts, plus several
-+    additional flaws, which prevented building, closes: #55260.
-+  * Updated for newer mime-support, closes: #47097. Downgraded
-+    mime-support dependency to a recommendation, and removed useless
-+    version (as the new scheme is used, and 2.02-1 is too old for it).
-+  * Updated for Policy 3.1.1.
-+
-+ -- Josip Rodin <jrodin@jagor.srce.hr>  Tue,  8 Feb 2000 21:15:19 +0100
-+
-+metamail (2.7-33) unstable; urgency=low
-+
-+  * Orphaning metamail.
-+
-+ -- Herbert Xu <herbert@debian.org>  Sat, 20 Nov 1999 20:33:36 -0600
-+
-+metamail (2.7-32) unstable; urgency=low
-+
-+  * Fixed postinst script where it didn't add mailcap entries for an initial
-+    install.
-+  * Don't warn about wild cards in mailcap (fixes #30910).
-+  * Use $() instead of `` for command substitution (fixes #33487).
-+    Note that metamail does %{} substitutions with the correct quoting.
-+    Indeed, it filters out characters like ` so there is no problem even if
-+    this fix were not there.  But other applications that currently do not do
-+    the required quoting should do so.
-+    Also, all packages that add entries to mailcap should check their entries
-+    and replace all `` with % substitutions inside with $() so as to avoid
-+    the obscure shell rule that `` is terminated by a un-backslashed back-
-+    quote.  Indeed, if this back-quote occurs within single or double quotes,
-+    the result is undefined.
-+
-+ -- Herbert Xu <herbert@debian.org>  Sun, 14 Mar 1999 12:58:05 +1100
-+
-+metamail (2.7-31) frozen unstable; urgency=low
-+
-+  * Uploaded to slink.
-+
-+ -- Herbert Xu <herbert@debian.org>  Sun, 15 Nov 1998 15:11:52 +1100
-+
-+metamail (2.7-30) unstable; urgency=low
-+
-+  * Use lpr instead of lp for linux (fixes #27259).
-+  * Removed all traces of mmencode (fixes #28746).
-+  * Rebuilt with libncruses4.
-+
-+ -- Herbert Xu <herbert@debian.org>  Sat, 31 Oct 1998 15:16:13 +1100
-+
-+metamail (2.7-29) unstable; urgency=medium
-+
-+  * Applied security patch from Topi Miettinen (fixes #26877).
-+
-+ -- Herbert Xu <herbert@debian.org>  Tue, 22 Sep 1998 14:29:27 +1000
-+
-+metamail (2.7-28) frozen unstable; urgency=high
-+
-+  * Fixed showpartial (fixes #23595).
-+
-+ -- Herbert Xu <herbert@debian.org>  Thu, 18 Jun 1998 09:41:50 +1000
-+
-+metamail (2.7-27) unstable; urgency=low
-+
-+  * Fixed shownonascii (fixes #19862).
-+  * Manually add mimencode.1.
-+
-+ -- Herbert Xu <herbert@debian.org>  Wed, 18 Mar 1998 21:06:39 +1100
-+
-+metamail (2.7-26) unstable; urgency=low
-+
-+  * Added -e to all shell scripts (fixes #19802).
-+  * Removed #!/bin/sh header from mime.noinstall.
-+
-+ -- Herbert Xu <herbert@debian.org>  Tue, 17 Mar 1998 21:22:25 +1100
-+
-+metamail (2.7-25) unstable; urgency=low
-+
-+  * Use sensible-pager instead of pager.
-+  * Upgraded to Standard Version 2.4.0.0.
-+  * Removed
-+    . mailserver
-+    . mailto-hebrew
-+    . rcvAppSingle
-+    . richtoatk
-+    . sndAppSingle
-+    . sun-audio-file
-+    . sun-message
-+    . sun-to-mime
-+    . sun2mime
-+    as they were either not functional or useless and without a manpage.
-+  * Added manpages to mimeit, uuencode and uudecode (fixes #6332).
-+  * Converted to debhelper.
-+  * Moved mailcap from section 4 to section 5.
-+
-+ -- Herbert Xu <herbert@debian.org>  Mon,  2 Mar 1998 15:46:44 +1100
-+
-+metamail (2.7-24) unstable; urgency=high
-+
-+  * Use tempfile for temporary files.
-+  * Removed sun-message.csh.
-+
-+ -- Herbert Xu <herbert@debian.org>  Wed, 15 Oct 1997 10:29:16 +1000
-+
-+metamail (2.7-23) unstable; urgency=low
-+
-+  * Fixed uudepipe (#12371).
-+
-+ -- Herbert Xu <herbert@debian.org>  Tue,  2 Sep 1997 21:37:01 +1000
-+
-+metamail (2.7-22) unstable; urgency=low
-+
-+  * Recompiled with libc6.
-+  * Removed recommendation of xv | xloadimage (#9706).
-+
-+ -- Herbert Xu <herbert@debian.org>  Sat, 21 Jun 1997 16:17:29 +1000
-+
-+metamail (2.7-21) stable frozen unstable; urgency=high
-+
-+  * Recompiled with gcc-2.7.2.1-8.
-+
-+ -- Herbert Xu <herbert@debian.org>  Sun, 4 May 1997 23:16:22 +1000
-+
-+metamail (2.7-20) stable frozen unstable; urgency=high
-+
-+  * Applyed Olaf Kirch's patch for a possible security hole.
-+  * Changed all /usr/lib/sendmail to /usr/sbin/sendmail.
-+
-+ -- Herbert Xu <herbert@debian.org>  Wed, 30 Apr 1997 16:30:51 +1000
-+
-+metamail (2.7-19) unstable; urgency=low
-+
-+  * Be smarter about running install-mime when upgrading (#7859).
-+  * Changed links to undocumented.7 to undocumented.7.gz.
-+
-+ -- Herbert Xu <herbert@debian.org>  Mon, 10 Mar 1997 19:44:54 +1100
-+
-+metamail (2.7-18) unstable; urgency=low
-+
-+  * Substitued which for whence (#7233).
-+
-+ -- Herbert Xu <herbert@debian.org>  Tue, 11 Feb 1997 17:34:39 +1100
-+
-+metamail (2.7-17) unstable; urgency=low
-+
-+  * New maintainer.
-+  * Changed all "RM=/bin/rm" to "RM=rm" in Makefiles.
-+  * Modified debian/rules and Makefiles to use debstd.
-+  * Adding undocumented links.
-+  * Adding #!/bin/sh to shell scripts to help identification.
-+  * Fixed bug #6104 and removed extraneous blanks in mailcap.4.
-+
-+ -- Herbert Xu <herbert@debian.org>  Wed, 15 Jan 1997 20:45:07 +1100
-+
-+metamail (2.7-16) unstable; urgency=LOW
-+
-+  * Fixed postinst (Bug#5606)
-+
-+ -- Michael Meskes <meskes@debian.org>  Thu, 5 Dec 1996 14:55:23 +0100
-+
-+metamail (2.7-15) frozen unstable; urgency=MEDIUM
-+
-+  * sun2mime now calls /usr/bin/nawk (Bug#5488)
-+
-+ -- Michael Meskes <meskes@debian.org>  Tue, 19 Nov 1996 09:37:17 +0100
-+
-+metamail (2.7-14) frozen unstable; urgency=MEDIUM
-+
-+  * Corrected metasend (and other scripts) to not call echo-n (Bug#5397).
-+  * remove echo-n from distribution
-+
-+ -- Michael Meskes <meskes@debian.org>  Wed, 13 Nov 1996 17:25:19 +0100
-+
-+metamail (2.7-13) unstable; urgency=LOW
-+
-+  * Cleaned up postinst (Bug#4720). Other install-mime calls are now
-+  * installed just as a doc file.
-+
-+ -- Michael Meskes <meskes@debian.org>  Sat, 12 Oct 1996 15:15:50 +0200
-+
-+metamail (2.7-12) unstable; urgency=LOW
-+
-+  * Added 'Recommends: sharutils' (Bug#4616)
-+
-+ -- Michael Meskes <meskes@debian.org>  Mon, 30 Sep 1996 14:01:30 +0200
-+
-+metamail (2.7-11) unstable; urgency=LOW
-+
-+  * Moved Bourne shell scripts into bin directory, so dpkg-source works.
-+  * Fixed showpicture to not use a geometry
-+
-+ -- Michael Meskes <meskes@debian.org>  Sun, 29 Sep 1996 13:52:41 +0200
-+
-+metamail (2.7-10) unstable; urgency=LOW
-+
-+  * Fixed that silly naming bug that caused postinst to be installed as
-+  * binary in /usr/bin (bug#4425)
-+
-+ -- Michael Meskes <meskes@debian.org>  Sat, 7 Sep 1996 12:59:13 +0200
-+
-+metamail (2.7-9) unstable; urgency=LOW
-+
-+  * Corrected some minor bugs in debian/ directory and adjusted debian/rules
-+  * accordingly. Conversion to new packaging scheme is now completed.
-+
-+ -- Michael Meskes <meskes@debian.org>  Sun, 1 Sep 1996 11:39:03 +0200
-+
-+metamail (2.7-8) unstable; urgency=LOW
-+
-+  * Corrected font name in postinst
-+  * Corrected rules file to not install /usr/doc/copyright/README
-+
-+ -- Michael Meskes <meskes@debian.org>  Thu, 29 Aug 1996 17:11:43 +0200
-+
-+metamail (2.7-7) unstable; urgency=LOW
-+
-+  * Corrected dependency (Bug#4305)
-+  * New packaging scheme
-+
-+ -- Michael Meskes <meskes@debian.org>  Wed, 28 Aug 1996 14:05:10 +0200
-+
---- metamail-2.7.orig/debian/control
-+++ metamail-2.7/debian/control
-@@ -0,0 +1,23 @@
-+Source: metamail
-+Section: mail
-+Priority: optional
-+Maintainer: Debian QA Group <packages@qa.debian.org>
-+Build-Depends: debhelper (>= 5), autotools-dev, libncurses-dev
-+Standards-Version: 3.7.2
-+
-+Package: metamail
-+Section: mail
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}
-+Recommends: sharutils, mime-support (>=3.11-1)
-+Description: implementation of MIME
-+ Metamail is an implementation of Multi-purpose Internet Mail
-+ Extensions (MIME), a proposed standard for multimedia electronic
-+ mail on the Internet.
-+ .
-+ Metamail is configurable and extensible via the "mailcap" mechanism
-+ described in an informational RFC that is a companion to the MIME
-+ document.  Metamail can be used to turn virtually any mail reader
-+ program into a multimedia mail reader.  For information about how
-+ to change mail readers so that they can use Metamail, please read
-+ the file `/usr/share/doc/metamail/mailers.txt.gz'.
---- metamail-2.7.orig/debian/mimencode.1
-+++ metamail-2.7/debian/mimencode.1
-@@ -0,0 +1,52 @@
-+.TH MIMENCODE 1 "Release 1" "Bellcore Prototype"
-+.SH NAME
-+mimencode - Translate to and from mail-oriented encoding formats
-+.SH SYNOPSIS
-+.ta 8n
-+\fBmimencode\fP	[-u] [-b] [-q] [-p] [file name] [-o outputfile]
-+.br
-+.SH DESCRIPTION
-+The
-+.I mimencode
-+program simply converts a byte stream into (or out of) one of the standard mail encoding formats defined by MIME, the proposed standard for internet multimedia mail formats.  Such an encoding is necessary because binary data cannot be sent through the mail.  The encodings understood by mimencode are preferable to the use of the uuencode/uudecode programs, for use in mail, in several respects that were important to the authors of MIME.
-+
-+By default, mimencode reads standard input, and sends a "base64" encoded version of the input to standard output.
-+
-+The (really not necessary) "-b" option tells mimencode to use the "base64" encoding.
-+
-+The "-q" option tells mimencode to use the "quoted-printable" encoding instead of base64.
-+
-+The "-u" option tells mimencode to 
-+.I
-+decode
-+the standard input rather than encode it.  
-+
-+The "-p" option tells mimencode to translate decoded CRLF sequences into the local newline convention during decoding and to do the reverse during encoding.  This option is only meaningful when  -b (base64 encoding) is in effect.
-+
-+If a file name argument is given, input is read from that file rather than from standard input.
-+
-+The "-o" option, which must be followed by a file name, sends output to the named file rather than to standard output.
-+.SH RATIONALE
-+.I
-+Mimencode
-+is intended to be a replacement for 
-+.I
-+uuencode
-+for mail and news use.  The reason is simple:  uuencode doesn't work very well in a number of circumstances and ways.  In particular, uuencode uses characters that don't translate well across all mail gateways (particularly ASCII <-> EBCDIC gateways).  Also, uuencode is not standard -- there are several variants floating around, encoding and decoding things in different and incompatible ways, with no "standard" on which to base an implementation.  Finally, uuencode does not generally work well in a pipe, although some variants have been modified to do so.  Mimencode implements the encodings which were defined for MIME as uuencode replacements, and should be considerably more robust for email use.
-+.SH SEE ALSO
-+metamail(1), mailto(1)
-+.SH COPYRIGHT
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+.SH AUTHOR
-+Nathaniel S. Borenstein
---- metamail-2.7.orig/debian/rules
-+++ metamail-2.7/debian/rules
-@@ -0,0 +1,115 @@
-+#!/usr/bin/make -f
-+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-+
-+# Uncomment this to turn on verbose mode.
-+export DH_VERBOSE=1
-+
-+# the debhelper compatiblity version
-+export DH_COMPAT=5
-+
-+export INTERNAL_DESTDIR=debian/tmp
-+
-+MAJOR=0
-+MINOR=0.0
-+
-+source-updates:
-+	dh_testdir
-+	sh bootstrap
-+
-+build: build-stamp
-+build-stamp:
-+	dh_testdir
-+	ln -sf /usr/share/misc/config.sub /usr/share/misc/config.guess config
-+	chmod +x ./configure
-+	./configure --prefix=/usr
-+	$(MAKE)
-+	touch $@
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	-if test -e Makefile; then \
-+	  if test -e Makefile.in; then \
-+		$(MAKE) distclean; \
-+	  else \
-+		$(MAKE) clean; \
-+	  fi \
-+	 fi
-+	rm -f config/config.sub config/config.guess
-+	dh_clean build-stamp install-stamp mimencode.1
-+
-+install: install-stamp
-+install-stamp: build
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+
-+	-$(MAKE) install DESTDIR=`pwd`/$(INTERNAL_DESTDIR)
-+
-+	cd $(INTERNAL_DESTDIR)/usr/bin && rm sun-message.csh mailserver \
-+	  rcvAppleSingle richtoatk sndAppleSingle sun-audio-file \
-+          sun-message sun-to-mime sun2mime mailto-hebrew
-+
-+	touch $@
-+
-+binary-indep:
-+# No arch-indep packages to be built here.
-+
-+binary-arch: build install metamail
-+
-+
-+metamail: build install
-+	dh_testdir -pmetamail
-+	dh_testroot -pmetamail
-+
-+	dh_installdirs -pmetamail
-+	dh_movefiles -pmetamail
-+	cp man/mmencode.1 debian/mimencode.1
-+
-+	dh_link -pmetamail usr/lib/libmetamail.so.$(MAJOR).$(MINOR) \
-+	  usr/lib/libmetamail.so.$(MAJOR)
-+
-+	dh_installdocs -pmetamail CREDITS README mailers.txt \
-+	  debian/mime.noinstall
-+	dh_installchangelogs -pmetamail
-+	dh_installmime -pmetamail
-+	dh_installmanpages -pmetamail mmencode.1 mailto-hebrew.1 mailcap.4 \
-+	    mailcap.5
-+	dh_strip -pmetamail
-+	dh_compress -pmetamail
-+	dh_fixperms -pmetamail
-+	dh_makeshlibs -pmetamail
-+	dh_installdeb -pmetamail
-+	dh_shlibdeps -pmetamail -l$(shell pwd)/debian/metamail/usr/lib
-+	dh_gencontrol -pmetamail -- -isp
-+	dh_md5sums -pmetamail
-+	dh_builddeb -pmetamail
-+
-+#libmetamail0: build install
-+#	dh_testdir -plibmetamail0
-+#	dh_testroot -plibmetamail0
-+
-+#	dh_installdirs -plibmetamail0
-+#	dh_movefiles -plibmetamail0
-+
-+#	dh_link -plibmetamail0 usr/lib/libmetamail.so.$(MAJOR).$(MINOR) \
-+#	  usr/lib/libmetamail.so.$(MAJOR)
-+
-+#	dh_installdocs -plibmetamail0
-+#	dh_installchangelogs -plibmetamail0
-+#	dh_strip -plibmetamail0
-+#	dh_compress -plibmetamail0
-+#	dh_fixperms -plibmetamail0
-+#	dh_installdeb -plibmetamail0
-+#	dh_shlibdeps -plibmetamail0
-+#	dh_gencontrol -plibmetamail0
-+#	dh_makeshlibs -plibmetamail0 -V
-+#	dh_md5sums -plibmetamail0
-+#	dh_builddeb -plibmetamail0
-+
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary
-+
-+
---- metamail-2.7.orig/debian/metamail.files
-+++ metamail-2.7/debian/metamail.files
-@@ -0,0 +1,3 @@
-+usr/bin
-+usr/lib/libmetamail.so.*
-+
---- metamail-2.7.orig/debian/shlibs.local
-+++ metamail-2.7/debian/shlibs.local
-@@ -0,0 +1 @@
-+libmetamail 0 
---- metamail-2.7.orig/debian/mime.noinstall
-+++ metamail-2.7/debian/mime.noinstall
-@@ -0,0 +1,5 @@
-+image/*; showpicture -viewer xv %s; description="All Graphic Images"
-+image/*; showpicture -viewer "xloadimage -view -quiet" %s; description="All Graphic Images"
-+audio/*; showaudio %s; description="All Audio Subtypes"
-+audio/basic; showaudio %s; compose="audiocompose %s"; edit="audiocompose %s"; description="An Audio Fragment"
-+audio-file; sun-audio-file %s; description="Sun Audio Message"
---- metamail-2.7.orig/debian/README.Debian
-+++ metamail-2.7/debian/README.Debian
-@@ -0,0 +1,12 @@
-+This is the Debian GNU/Linux prepackaged version of the metamail package.
-+
-+It installs only a basis of the scripts included in the original metamail
-+package. Excluded are Apple specifics (rcvAppleSingle, sndAppleSingle),
-+sun specifics (sun-message.csh, sun-audio-file, sun-message, sun-to-mime,
-+sun2mime), hebrew specifics (mailto-hebrew), mailserver extensions 
-+(mailserver), binary wrapper extensions for mimeencode (mmencode) and richtoak.
-+
-+I had to fix the source by adding a doublinked list that stores all opened
-+tmp files. This list is used at before the program terminates so that all
-+tmp files get properly removed.
-+
---- metamail-2.7.orig/debian/copyright
-+++ metamail-2.7/debian/copyright
-@@ -0,0 +1,37 @@
-+This is the Debian GNU/Linux prepackaged version of Metamail.
-+
-+This package was put together by Michael Meskes <meskes@debian.org>,
-+from sources obtained from:
-+ ftp.bellcore.com:/pub/nsb/mm2.7.tar.Z and /pub/nsb/contrib2.7.tar.Z
-+
-+This package was then worked on by Herbert Xu <herbert@debian.org>.
-+
-+****************************************************************
-+Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-+
-+Permission to use, copy, modify, and distribute this material 
-+for any purpose and without fee is hereby granted, provided 
-+that the above copyright notice and this permission notice 
-+appear in all copies, and that the name of Bellcore not be 
-+used in advertising or publicity pertaining to this 
-+material without the specific, prior written permission 
-+of an authorized representative of Bellcore.  BELLCORE 
-+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-+WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-+****************************************************************
-+
-+Most scripts are:
-+
-+# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-+# Conversion Copyright (c) 1992 Z-Code Software Corp.
-+# Permission to use, copy, modify, and distribute this material
-+# for any purpose and without fee is hereby granted, provided
-+# that the above copyright notice and this permission notice
-+# appear in all copies, and that the name of Z-Code Software not
-+# be used in advertising or publicity pertaining to this
-+# material without the specific, prior written permission
-+# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
-+# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-+# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-+# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
---- metamail-2.7.orig/config/depcomp
-+++ metamail-2.7/config/depcomp
-@@ -0,0 +1,411 @@
-+#! /bin/sh
-+
-+# depcomp - compile a program generating dependencies as side-effects
-+# Copyright 1999, 2000 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-+
-+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-+  exit 1
-+fi
-+# `libtool' can also be set to `yes' or `no'.
-+
-+depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
-+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-+
-+rm -f "$tmpdepfile"
-+
-+# Some modes work just like other modes, but use different flags.  We
-+# parameterize here, but still list the modes in the big case below,
-+# to make depend.m4 easier to write.  Note that we *cannot* use a case
-+# here, because this file can only contain one case statement.
-+if test "$depmode" = hp; then
-+  # HP compiler uses -M and no extra arg.
-+  gccflag=-M
-+  depmode=gcc
-+fi
-+
-+if test "$depmode" = dashXmstdout; then
-+   # This is just like dashmstdout with a different argument.
-+   dashmflag=-xM
-+   depmode=dashmstdout
-+fi
-+
-+case "$depmode" in
-+gcc3)
-+## gcc 3 implements dependency tracking that does exactly what
-+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-+## it if -MD -MP comes after the -MF stuff.  Hmm.
-+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  mv "$tmpdepfile" "$depfile"
-+  ;;
-+
-+gcc)
-+## There are various ways to get dependency output from gcc.  Here's
-+## why we pick this rather obscure method:
-+## - Don't want to use -MD because we'd like the dependencies to end
-+##   up in a subdir.  Having to rename by hand is ugly.
-+##   (We might end up doing this anyway to support other compilers.)
-+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-+##   -MM, not -M (despite what the docs say).
-+## - Using -M directly means running the compiler twice (even worse
-+##   than renaming).
-+  if test -z "$gccflag"; then
-+    gccflag=-MD,
-+  fi
-+  "$@" -Wp,"$gccflag$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-+## The second -e expression handles DOS-style file names with drive letters.
-+  sed -e 's/^[^:]*: / /' \
-+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-+## This next piece of magic avoids the `deleted header file' problem.
-+## The problem is that when a header file which appears in a .P file
-+## is deleted, the dependency causes make to die (because there is
-+## typically no way to rebuild the header).  We avoid this by adding
-+## dummy dependencies for each header file.  Too bad gcc doesn't do
-+## this for us directly.
-+  tr ' ' '
-+' < "$tmpdepfile" |
-+## Some versions of gcc put a space before the `:'.  On the theory
-+## that the space means something, we add a space to the output as
-+## well.
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+hp)
-+  # This case exists only to let depend.m4 do its work.  It works by
-+  # looking at the text of this script.  This case will never be run,
-+  # since it is checked for above.
-+  exit 1
-+  ;;
-+
-+sgi)
-+  if test "$libtool" = yes; then
-+    "$@" "-Wp,-MDupdate,$tmpdepfile"
-+  else
-+    "$@" -MDupdate "$tmpdepfile"
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+
-+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-+    echo "$object : \\" > "$depfile"
-+
-+    # Clip off the initial element (the dependent).  Don't try to be
-+    # clever and replace this with sed code, as IRIX sed won't handle
-+    # lines with more than a fixed number of characters (4096 in
-+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-+    # the IRIX cc adds comments like `#:fec' to the end of the
-+    # dependency line.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-+    tr '
-+' ' ' >> $depfile
-+    echo >> $depfile
-+
-+    # The second pass generates a dummy entry for each header file.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-+   >> $depfile
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+aix)
-+  # The C for AIX Compiler uses -M and outputs the dependencies
-+  # in a .u file.  This file always lives in the current directory.
-+  # Also, the AIX compiler puts `$object:' at the start of each line;
-+  # $object doesn't have directory information.
-+  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-+  tmpdepfile="$stripped.u"
-+  outname="$stripped.o"
-+  if test "$libtool" = yes; then
-+    "$@" -Wc,-M
-+  else
-+    "$@" -M
-+  fi
-+
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+
-+  if test -f "$tmpdepfile"; then
-+    # Each line is of the form `foo.o: dependent.h'.
-+    # Do two passes, one to just change these to
-+    # `$object: dependent.h' and one to simply `dependent.h:'.
-+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+tru64)
-+   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
-+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
-+   # dependencies in `foo.d' instead, so we check for that too.
-+   # Subdirectories are respected.
-+
-+   tmpdepfile1="$object.d"
-+   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
-+   if test "$libtool" = yes; then
-+      "$@" -Wc,-MD
-+   else
-+      "$@" -MD
-+   fi
-+
-+   stat=$?
-+   if test $stat -eq 0; then :
-+   else
-+      rm -f "$tmpdepfile1" "$tmpdepfile2"
-+      exit $stat
-+   fi
-+
-+   if test -f "$tmpdepfile1"; then
-+      tmpdepfile="$tmpdepfile1"
-+   else
-+      tmpdepfile="$tmpdepfile2"
-+   fi
-+   if test -f "$tmpdepfile"; then
-+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+      # That's a space and a tab in the [].
-+      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+   else
-+      echo "#dummy" > "$depfile"
-+   fi
-+   rm -f "$tmpdepfile"
-+   ;;
-+
-+#nosideeffect)
-+  # This comment above is used by automake to tell side-effect
-+  # dependency tracking mechanisms from slower ones.
-+
-+dashmstdout)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the proprocessed file to stdout, regardless of -o,
-+  # because we must use -o when running libtool.
-+  test -z "$dashmflag" && dashmflag=-M
-+  ( IFS=" "
-+    case " $* " in
-+    *" --mode=compile "*) # this is libtool, let us make it quiet
-+      for arg
-+      do # cycle over the arguments
-+        case "$arg" in
-+	"--mode=compile")
-+	  # insert --quiet before "--mode=compile"
-+	  set fnord "$@" --quiet
-+	  shift # fnord
-+	  ;;
-+	esac
-+	set fnord "$@" "$arg"
-+	shift # fnord
-+	shift # "$arg"
-+      done
-+      ;;
-+    esac
-+    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-+  ) &
-+  proc=$!
-+  "$@"
-+  stat=$?
-+  wait "$proc"
-+  if test "$stat" != 0; then exit $stat; fi
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  tr ' ' '
-+' < "$tmpdepfile" | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+dashXmstdout)
-+  # This case only exists to satisfy depend.m4.  It is never actually
-+  # run, as this mode is specially recognized in the preamble.
-+  exit 1
-+  ;;
-+
-+makedepend)
-+  # X makedepend
-+  (
-+    shift
-+    cleared=no
-+    for arg in "$@"; do
-+      case $cleared in no)
-+        set ""; shift
-+	cleared=yes
-+      esac
-+      case "$arg" in
-+        -D*|-I*)
-+	  set fnord "$@" "$arg"; shift;;
-+	-*)
-+	  ;;
-+	*)
-+	  set fnord "$@" "$arg"; shift;;
-+      esac
-+    done
-+    obj_suffix="`echo $object | sed 's/^.*\././'`"
-+    touch "$tmpdepfile"
-+    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-+  ) &
-+  proc=$!
-+  "$@"
-+  stat=$?
-+  wait "$proc"
-+  if test "$stat" != 0; then exit $stat; fi
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  tail +3 "$tmpdepfile" | tr ' ' '
-+' | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile" "$tmpdepfile".bak
-+  ;;
-+
-+cpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the proprocessed file to stdout, regardless of -o,
-+  # because we must use -o when running libtool.
-+  ( IFS=" "
-+    case " $* " in
-+    *" --mode=compile "*)
-+      for arg
-+      do # cycle over the arguments
-+        case $arg in
-+	"--mode=compile")
-+	  # insert --quiet before "--mode=compile"
-+	  set fnord "$@" --quiet
-+	  shift # fnord
-+	  ;;
-+	esac
-+	set fnord "$@" "$arg"
-+	shift # fnord
-+	shift # "$arg"
-+      done
-+      ;;
-+    esac
-+    "$@" -E |
-+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+    sed '$ s: \\$::' > "$tmpdepfile"
-+  ) &
-+  proc=$!
-+  "$@"
-+  stat=$?
-+  wait "$proc"
-+  if test "$stat" != 0; then exit $stat; fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  cat < "$tmpdepfile" >> "$depfile"
-+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+msvisualcpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the proprocessed file to stdout, regardless of -o,
-+  # because we must use -o when running libtool.
-+  ( IFS=" "
-+    case " $* " in
-+    *" --mode=compile "*)
-+      for arg
-+      do # cycle over the arguments
-+        case $arg in
-+	"--mode=compile")
-+	  # insert --quiet before "--mode=compile"
-+	  set fnord "$@" --quiet
-+	  shift # fnord
-+	  ;;
-+	esac
-+	set fnord "$@" "$arg"
-+	shift # fnord
-+	shift # "$arg"
-+      done
-+      ;;
-+    esac
-+    "$@" -E |
-+    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-+  ) &
-+  proc=$!
-+  "$@"
-+  stat=$?
-+  wait "$proc"
-+  if test "$stat" != 0; then exit $stat; fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-+  echo "	" >> "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+none)
-+  exec "$@"
-+  ;;
-+
-+*)
-+  echo "Unknown depmode $depmode" 1>&2
-+  exit 1
-+  ;;
-+esac
-+
-+exit 0
---- metamail-2.7.orig/config/ltmain.sh
-+++ metamail-2.7/config/ltmain.sh
-@@ -0,0 +1,5107 @@
-+# ltmain.sh - Provide generalized library-building support services.
-+# NOTE: Changing this file will not affect anything until you rerun configure.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# 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.
-+
-+# Check that we have a working $echo.
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell, and then maybe $echo will work.
-+  exec $SHELL "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit 0
-+fi
-+
-+# The name of this program.
-+progname=`$echo "$0" | ${SED} 's%^.*/%%'`
-+modename="$progname"
-+
-+# Constants.
-+PROGRAM=ltmain.sh
-+PACKAGE=libtool
-+VERSION=1.4.3
-+TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)"
-+
-+default_mode=
-+help="Try \`$progname --help' for more information."
-+magic="%%%MAGIC variable%%%"
-+mkdir="mkdir"
-+mv="mv -f"
-+rm="rm -f"
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed="${SED}"' -e 1s/^X//'
-+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-+# test EBCDIC or ASCII                                                         
-+case `echo A|od -x` in                                                         
-+ *[Cc]1*) # EBCDIC based system                                                
-+  SP2NL="tr '\100' '\n'"                                                       
-+  NL2SP="tr '\r\n' '\100\100'"                                                 
-+  ;;                                                                           
-+ *) # Assume ASCII based system                                                
-+  SP2NL="tr '\040' '\012'"                                                     
-+  NL2SP="tr '\015\012' '\040\040'"                                             
-+  ;;                                                                           
-+esac                                                                           
-+
-+# NLS nuisances.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
-+# We save the old values to restore during execute mode.
-+if test "${LC_ALL+set}" = set; then
-+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-+fi
-+if test "${LANG+set}" = set; then
-+  save_LANG="$LANG"; LANG=C; export LANG
-+fi
-+
-+# Make sure IFS has a sensible default
-+: ${IFS=" 	"}
-+
-+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+  echo "$modename: not configured to build any kind of library" 1>&2
-+  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-+  exit 1
-+fi
-+
-+# Global variables.
-+mode=$default_mode
-+nonopt=
-+prev=
-+prevopt=
-+run=
-+show="$echo"
-+show_help=
-+execute_dlfiles=
-+lo2o="s/\\.lo\$/.${objext}/"
-+o2lo="s/\\.${objext}\$/.lo/"
-+
-+# Parse our command line options once, thoroughly.
-+while test $# -gt 0
-+do
-+  arg="$1"
-+  shift
-+
-+  case $arg in
-+  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) optarg= ;;
-+  esac
-+
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$prev"; then
-+    case $prev in
-+    execute_dlfiles)
-+      execute_dlfiles="$execute_dlfiles $arg"
-+      ;;
-+    *)
-+      eval "$prev=\$arg"
-+      ;;
-+    esac
-+
-+    prev=
-+    prevopt=
-+    continue
-+  fi
-+
-+  # Have we seen a non-optional argument yet?
-+  case $arg in
-+  --help)
-+    show_help=yes
-+    ;;
-+
-+  --version)
-+    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-+    exit 0
-+    ;;
-+
-+  --config)
-+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
-+    exit 0
-+    ;;
-+
-+  --debug)
-+    echo "$progname: enabling shell trace mode"
-+    set -x
-+    ;;
-+
-+  --dry-run | -n)
-+    run=:
-+    ;;
-+
-+  --features)
-+    echo "host: $host"
-+    if test "$build_libtool_libs" = yes; then
-+      echo "enable shared libraries"
-+    else
-+      echo "disable shared libraries"
-+    fi
-+    if test "$build_old_libs" = yes; then
-+      echo "enable static libraries"
-+    else
-+      echo "disable static libraries"
-+    fi
-+    exit 0
-+    ;;
-+
-+  --finish) mode="finish" ;;
-+
-+  --mode) prevopt="--mode" prev=mode ;;
-+  --mode=*) mode="$optarg" ;;
-+
-+  --preserve-dup-deps) duplicate_deps="yes" ;;
-+
-+  --quiet | --silent)
-+    show=:
-+    ;;
-+
-+  -dlopen)
-+    prevopt="-dlopen"
-+    prev=execute_dlfiles
-+    ;;
-+
-+  -*)
-+    $echo "$modename: unrecognized option \`$arg'" 1>&2
-+    $echo "$help" 1>&2
-+    exit 1
-+    ;;
-+
-+  *)
-+    nonopt="$arg"
-+    break
-+    ;;
-+  esac
-+done
-+
-+if test -n "$prevopt"; then
-+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-+  $echo "$help" 1>&2
-+  exit 1
-+fi
-+
-+# If this variable is set in any of the actions, the command in it
-+# will be execed at the end.  This prevents here-documents from being
-+# left over by shells.
-+exec_cmd=
-+
-+if test -z "$show_help"; then
-+
-+  # Infer the operation mode.
-+  if test -z "$mode"; then
-+    case $nonopt in
-+    *cc | *++ | gcc* | *-gcc* | g++* | xlc*)
-+      mode=link
-+      for arg
-+      do
-+	case $arg in
-+	-c)
-+	   mode=compile
-+	   break
-+	   ;;
-+	esac
-+      done
-+      ;;
-+    *db | *dbx | *strace | *truss)
-+      mode=execute
-+      ;;
-+    *install*|cp|mv)
-+      mode=install
-+      ;;
-+    *rm)
-+      mode=uninstall
-+      ;;
-+    *)
-+      # If we have no mode, but dlfiles were specified, then do execute mode.
-+      test -n "$execute_dlfiles" && mode=execute
-+
-+      # Just use the default operation mode.
-+      if test -z "$mode"; then
-+	if test -n "$nonopt"; then
-+	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-+	else
-+	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-+	fi
-+      fi
-+      ;;
-+    esac
-+  fi
-+
-+  # Only execute mode is allowed to have -dlopen flags.
-+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-+    $echo "$help" 1>&2
-+    exit 1
-+  fi
-+
-+  # Change the help message to a mode-specific one.
-+  generic_help="$help"
-+  help="Try \`$modename --help --mode=$mode' for more information."
-+
-+  # These modes are in order of execution frequency so that they run quickly.
-+  case $mode in
-+  # libtool compile mode
-+  compile)
-+    modename="$modename: compile"
-+    # Get the compilation command and the source file.
-+    base_compile=
-+    prev=
-+    lastarg=
-+    srcfile="$nonopt"
-+    suppress_output=
-+
-+    user_target=no
-+    for arg
-+    do
-+      case $prev in
-+      "") ;;
-+      xcompiler)
-+	# Aesthetically quote the previous argument.
-+	prev=
-+	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+
-+	case $arg in
-+	# Double-quote args containing other shell metacharacters.
-+	# Many Bourne shells cannot handle close brackets correctly
-+	# in scan sets, so we specify it separately.
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+
-+	# Add the previous argument to base_compile.
-+	if test -z "$base_compile"; then
-+	  base_compile="$lastarg"
-+	else
-+	  base_compile="$base_compile $lastarg"
-+	fi
-+	continue
-+	;;
-+      esac
-+
-+      # Accept any command-line options.
-+      case $arg in
-+      -o)
-+	if test "$user_target" != "no"; then
-+	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-+	  exit 1
-+	fi
-+	user_target=next
-+	;;
-+
-+      -static)
-+	build_old_libs=yes
-+	continue
-+	;;
-+
-+      -prefer-pic)
-+	pic_mode=yes
-+	continue
-+	;;
-+
-+      -prefer-non-pic)
-+	pic_mode=no
-+	continue
-+	;;
-+
-+      -Xcompiler)
-+	prev=xcompiler
-+	continue
-+	;;
-+
-+      -Wc,*)
-+	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-+	lastarg=
-+	save_ifs="$IFS"; IFS=','
-+	for arg in $args; do
-+	  IFS="$save_ifs"
-+
-+	  # Double-quote args containing other shell metacharacters.
-+	  # Many Bourne shells cannot handle close brackets correctly
-+	  # in scan sets, so we specify it separately.
-+	  case $arg in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    arg="\"$arg\""
-+	    ;;
-+	  esac
-+	  lastarg="$lastarg $arg"
-+	done
-+	IFS="$save_ifs"
-+	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-+
-+	# Add the arguments to base_compile.
-+	if test -z "$base_compile"; then
-+	  base_compile="$lastarg"
-+	else
-+	  base_compile="$base_compile $lastarg"
-+	fi
-+	continue
-+	;;
-+      esac
-+
-+      case $user_target in
-+      next)
-+	# The next one is the -o target name
-+	user_target=yes
-+	continue
-+	;;
-+      yes)
-+	# We got the output file
-+	user_target=set
-+	libobj="$arg"
-+	continue
-+	;;
-+      esac
-+
-+      # Accept the current argument as the source file.
-+      lastarg="$srcfile"
-+      srcfile="$arg"
-+
-+      # Aesthetically quote the previous argument.
-+
-+      # Backslashify any backslashes, double quotes, and dollar signs.
-+      # These are the only characters that are still specially
-+      # interpreted inside of double-quoted scrings.
-+      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-+
-+      # Double-quote args containing other shell metacharacters.
-+      # Many Bourne shells cannot handle close brackets correctly
-+      # in scan sets, so we specify it separately.
-+      case $lastarg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	lastarg="\"$lastarg\""
-+	;;
-+      esac
-+
-+      # Add the previous argument to base_compile.
-+      if test -z "$base_compile"; then
-+	base_compile="$lastarg"
-+      else
-+	base_compile="$base_compile $lastarg"
-+      fi
-+    done
-+
-+    case $user_target in
-+    set)
-+      ;;
-+    no)
-+      # Get the name of the library object.
-+      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-+      ;;
-+    *)
-+      $echo "$modename: you must specify a target with \`-o'" 1>&2
-+      exit 1
-+      ;;
-+    esac
-+
-+    # Recognize several different file suffixes.
-+    # If the user specifies -o file.o, it is replaced with file.lo
-+    xform='[cCFSfmso]'
-+    case $libobj in
-+    *.ada) xform=ada ;;
-+    *.adb) xform=adb ;;
-+    *.ads) xform=ads ;;
-+    *.asm) xform=asm ;;
-+    *.c++) xform=c++ ;;
-+    *.cc) xform=cc ;;
-+    *.cpp) xform=cpp ;;
-+    *.cxx) xform=cxx ;;
-+    *.f90) xform=f90 ;;
-+    *.for) xform=for ;;
-+    esac
-+
-+    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-+
-+    case $libobj in
-+    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-+    *)
-+      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-+      exit 1
-+      ;;
-+    esac
-+
-+    if test -z "$base_compile"; then
-+      $echo "$modename: you must specify a compilation command" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    # Delete any leftover library objects.
-+    if test "$build_old_libs" = yes; then
-+      removelist="$obj $libobj"
-+    else
-+      removelist="$libobj"
-+    fi
-+
-+    $run $rm $removelist
-+    trap "$run $rm $removelist; exit 1" 1 2 15
-+
-+    # On Cygwin there's no "real" PIC flag so we must build both object types
-+    case $host_os in
-+    cygwin* | mingw* | pw32* | os2*)
-+      pic_mode=default
-+      ;;
-+    esac
-+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-+      # non-PIC code in shared libraries is not supported
-+      pic_mode=default
-+    fi
-+
-+    # Calculate the filename of the output object if compiler does
-+    # not support -o with -c
-+    if test "$compiler_c_o" = no; then
-+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-+      lockfile="$output_obj.lock"
-+      removelist="$removelist $output_obj $lockfile"
-+      trap "$run $rm $removelist; exit 1" 1 2 15
-+    else
-+      need_locks=no
-+      lockfile=
-+    fi
-+
-+    # Lock this critical section if it is needed
-+    # We use this script file to make the link, it avoids creating a new file
-+    if test "$need_locks" = yes; then
-+      until $run ln "$0" "$lockfile" 2>/dev/null; do
-+	$show "Waiting for $lockfile to be removed"
-+	sleep 2
-+      done
-+    elif test "$need_locks" = warn; then
-+      if test -f "$lockfile"; then
-+	echo "\
-+*** ERROR, $lockfile exists and contains:
-+`cat $lockfile 2>/dev/null`
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+      echo $srcfile > "$lockfile"
-+    fi
-+
-+    if test -n "$fix_srcfile_path"; then
-+      eval srcfile=\"$fix_srcfile_path\"
-+    fi
-+
-+    # Only build a PIC object if we are building libtool libraries.
-+    if test "$build_libtool_libs" = yes; then
-+      # Without this assignment, base_compile gets emptied.
-+      fbsd_hideous_sh_bug=$base_compile
-+
-+      if test "$pic_mode" != no; then
-+	# All platforms use -DPIC, to notify preprocessed assembler code.
-+	command="$base_compile $srcfile $pic_flag -DPIC"
-+      else
-+	# Don't build PIC code
-+	command="$base_compile $srcfile"
-+      fi
-+      if test "$build_old_libs" = yes; then
-+	lo_libobj="$libobj"
-+	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-+	if test "X$dir" = "X$libobj"; then
-+	  dir="$objdir"
-+	else
-+	  dir="$dir/$objdir"
-+	fi
-+	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-+
-+	if test -d "$dir"; then
-+	  $show "$rm $libobj"
-+	  $run $rm $libobj
-+	else
-+	  $show "$mkdir $dir"
-+	  $run $mkdir $dir
-+	  status=$?
-+	  if test $status -ne 0 && test ! -d $dir; then
-+	    exit $status
-+	  fi
-+	fi
-+      fi
-+      if test "$compiler_o_lo" = yes; then
-+	output_obj="$libobj"
-+	command="$command -o $output_obj"
-+      elif test "$compiler_c_o" = yes; then
-+	output_obj="$obj"
-+	command="$command -o $output_obj"
-+      fi
-+
-+      $run $rm "$output_obj"
-+      $show "$command"
-+      if $run eval "$command"; then :
-+      else
-+	test -n "$output_obj" && $run $rm $removelist
-+	exit 1
-+      fi
-+
-+      if test "$need_locks" = warn &&
-+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-+	echo "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
-+
-+but it should contain:
-+$srcfile
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+
-+      # Just move the object if needed, then go on to compile the next one
-+      if test x"$output_obj" != x"$libobj"; then
-+	$show "$mv $output_obj $libobj"
-+	if $run $mv $output_obj $libobj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+
-+      # If we have no pic_flag, then copy the object into place and finish.
-+      if (test -z "$pic_flag" || test "$pic_mode" != default) &&
-+	 test "$build_old_libs" = yes; then
-+	# Rename the .lo from within objdir to obj
-+	if test -f $obj; then
-+	  $show $rm $obj
-+	  $run $rm $obj
-+	fi
-+
-+	$show "$mv $libobj $obj"
-+	if $run $mv $libobj $obj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+
-+	xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-+	if test "X$xdir" = "X$obj"; then
-+	  xdir="."
-+	else
-+	  xdir="$xdir"
-+	fi
-+	baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
-+	libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-+	# Now arrange that obj and lo_libobj become the same file
-+	$show "(cd $xdir && $LN_S $baseobj $libobj)"
-+	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
-+	  # Unlock the critical section if it was locked
-+	  if test "$need_locks" != no; then
-+	    $run $rm "$lockfile"
-+	  fi
-+	  exit 0
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+
-+      # Allow error messages only from the first compilation.
-+      suppress_output=' >/dev/null 2>&1'
-+    fi
-+
-+    # Only build a position-dependent object if we build old libraries.
-+    if test "$build_old_libs" = yes; then
-+      if test "$pic_mode" != yes; then
-+	# Don't build PIC code
-+	command="$base_compile $srcfile"
-+      else
-+	# All platforms use -DPIC, to notify preprocessed assembler code.
-+	command="$base_compile $srcfile $pic_flag -DPIC"
-+      fi
-+      if test "$compiler_c_o" = yes; then
-+	command="$command -o $obj"
-+	output_obj="$obj"
-+      fi
-+
-+      # Suppress compiler output if we already did a PIC compilation.
-+      command="$command$suppress_output"
-+      $run $rm "$output_obj"
-+      $show "$command"
-+      if $run eval "$command"; then :
-+      else
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+
-+      if test "$need_locks" = warn &&
-+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-+	echo "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
-+
-+but it should contain:
-+$srcfile
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+
-+      # Just move the object if needed
-+      if test x"$output_obj" != x"$obj"; then
-+	$show "$mv $output_obj $obj"
-+	if $run $mv $output_obj $obj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+
-+      # Create an invalid libtool object if no PIC, so that we do not
-+      # accidentally link it into a program.
-+      if test "$build_libtool_libs" != yes; then
-+	$show "echo timestamp > $libobj"
-+	$run eval "echo timestamp > \$libobj" || exit $?
-+      else
-+	# Move the .lo from within objdir
-+	$show "$mv $libobj $lo_libobj"
-+	if $run $mv $libobj $lo_libobj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+    fi
-+
-+    # Unlock the critical section if it was locked
-+    if test "$need_locks" != no; then
-+      $run $rm "$lockfile"
-+    fi
-+
-+    exit 0
-+    ;;
-+
-+  # libtool link mode
-+  link | relink)
-+    modename="$modename: link"
-+    case $host in
-+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+      # It is impossible to link a dll without this setting, and
-+      # we shouldn't force the makefile maintainer to figure out
-+      # which system we are compiling for in order to pass an extra
-+      # flag for every libtool invokation.
-+      # allow_undefined=no
-+
-+      # FIXME: Unfortunately, there are problems with the above when trying
-+      # to make a dll which has undefined symbols, in which case not
-+      # even a static library is built.  For now, we need to specify
-+      # -no-undefined on the libtool link line when we can be certain
-+      # that all symbols are satisfied, otherwise we get a static library.
-+      allow_undefined=yes
-+      ;;
-+    *)
-+      allow_undefined=yes
-+      ;;
-+    esac
-+    libtool_args="$nonopt"
-+    compile_command="$nonopt"
-+    finalize_command="$nonopt"
-+
-+    compile_rpath=
-+    finalize_rpath=
-+    compile_shlibpath=
-+    finalize_shlibpath=
-+    convenience=
-+    old_convenience=
-+    deplibs=
-+    old_deplibs=
-+    compiler_flags=
-+    linker_flags=
-+    dllsearchpath=
-+    lib_search_path=`pwd`
-+    inst_prefix_dir=
-+
-+    avoid_version=no
-+    dlfiles=
-+    dlprefiles=
-+    dlself=no
-+    export_dynamic=no
-+    export_symbols=
-+    export_symbols_regex=
-+    generated=
-+    libobjs=
-+    ltlibs=
-+    module=no
-+    no_install=no
-+    objs=
-+    prefer_static_libs=no
-+    preload=no
-+    prev=
-+    prevarg=
-+    release=
-+    rpath=
-+    xrpath=
-+    perm_rpath=
-+    temp_rpath=
-+    thread_safe=no
-+    vinfo=
-+
-+    # We need to know -static, to get the right output filenames.
-+    for arg
-+    do
-+      case $arg in
-+      -all-static | -static)
-+	if test "X$arg" = "X-all-static"; then
-+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-+	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-+	  fi
-+	  if test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
-+	  fi
-+	else
-+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
-+	  fi
-+	fi
-+	build_libtool_libs=no
-+	build_old_libs=yes
-+	prefer_static_libs=yes
-+	break
-+	;;
-+      esac
-+    done
-+
-+    # See if our shared archives depend on static archives.
-+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-+
-+    # Go through the arguments, transforming them on the way.
-+    while test $# -gt 0; do
-+      arg="$1"
-+      shift
-+      case $arg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-+	;;
-+      *) qarg=$arg ;;
-+      esac
-+      libtool_args="$libtool_args $qarg"
-+
-+      # If the previous option needs an argument, assign it.
-+      if test -n "$prev"; then
-+	case $prev in
-+	output)
-+	  compile_command="$compile_command @OUTPUT@"
-+	  finalize_command="$finalize_command @OUTPUT@"
-+	  ;;
-+	esac
-+
-+	case $prev in
-+	dlfiles|dlprefiles)
-+	  if test "$preload" = no; then
-+	    # Add the symbol object into the linking commands.
-+	    compile_command="$compile_command @SYMFILE@"
-+	    finalize_command="$finalize_command @SYMFILE@"
-+	    preload=yes
-+	  fi
-+	  case $arg in
-+	  *.la | *.lo) ;;  # We handle these cases below.
-+	  force)
-+	    if test "$dlself" = no; then
-+	      dlself=needless
-+	      export_dynamic=yes
-+	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  self)
-+	    if test "$prev" = dlprefiles; then
-+	      dlself=yes
-+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-+	      dlself=yes
-+	    else
-+	      dlself=needless
-+	      export_dynamic=yes
-+	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  *)
-+	    if test "$prev" = dlfiles; then
-+	      dlfiles="$dlfiles $arg"
-+	    else
-+	      dlprefiles="$dlprefiles $arg"
-+	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  esac
-+	  ;;
-+	expsyms)
-+	  export_symbols="$arg"
-+	  if test ! -f "$arg"; then
-+	    $echo "$modename: symbol file \`$arg' does not exist"
-+	    exit 1
-+	  fi
-+	  prev=
-+	  continue
-+	  ;;
-+	expsyms_regex)
-+	  export_symbols_regex="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	inst_prefix)
-+	  inst_prefix_dir="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	release)
-+	  release="-$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	rpath | xrpath)
-+	  # We need an absolute path.
-+	  case $arg in
-+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-+	  *)
-+	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-+	    exit 1
-+	    ;;
-+	  esac
-+	  if test "$prev" = rpath; then
-+	    case "$rpath " in
-+	    *" $arg "*) ;;
-+	    *) rpath="$rpath $arg" ;;
-+	    esac
-+	  else
-+	    case "$xrpath " in
-+	    *" $arg "*) ;;
-+	    *) xrpath="$xrpath $arg" ;;
-+	    esac
-+	  fi
-+	  prev=
-+	  continue
-+	  ;;
-+	xcompiler)
-+	  compiler_flags="$compiler_flags $qarg"
-+	  prev=
-+	  compile_command="$compile_command $qarg"
-+	  finalize_command="$finalize_command $qarg"
-+	  continue
-+	  ;;
-+	xlinker)
-+	  linker_flags="$linker_flags $qarg"
-+	  compiler_flags="$compiler_flags $wl$qarg"
-+	  prev=
-+	  compile_command="$compile_command $wl$qarg"
-+	  finalize_command="$finalize_command $wl$qarg"
-+	  continue
-+	  ;;
-+	*)
-+	  eval "$prev=\"\$arg\""
-+	  prev=
-+	  continue
-+	  ;;
-+	esac
-+      fi # test -n $prev
-+
-+      prevarg="$arg"
-+
-+      case $arg in
-+      -all-static)
-+	if test -n "$link_static_flag"; then
-+	  compile_command="$compile_command $link_static_flag"
-+	  finalize_command="$finalize_command $link_static_flag"
-+	fi
-+	continue
-+	;;
-+
-+      -allow-undefined)
-+	# FIXME: remove this flag sometime in the future.
-+	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-+	continue
-+	;;
-+
-+      -avoid-version)
-+	avoid_version=yes
-+	continue
-+	;;
-+
-+      -dlopen)
-+	prev=dlfiles
-+	continue
-+	;;
-+
-+      -dlpreopen)
-+	prev=dlprefiles
-+	continue
-+	;;
-+
-+      -export-dynamic)
-+	export_dynamic=yes
-+	continue
-+	;;
-+
-+      -export-symbols | -export-symbols-regex)
-+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-+	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-+	  exit 1
-+	fi
-+	if test "X$arg" = "X-export-symbols"; then
-+	  prev=expsyms
-+	else
-+	  prev=expsyms_regex
-+	fi
-+	continue
-+	;;
-+
-+      -inst-prefix-dir)
-+       prev=inst_prefix
-+       continue
-+       ;;
-+
-+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-+      # so, if we see these flags be careful not to treat them like -L
-+      -L[A-Z][A-Z]*:*)
-+	case $with_gcc/$host in
-+	no/*-*-irix* | no/*-*-nonstopux*)
-+	  compile_command="$compile_command $arg"
-+	  finalize_command="$finalize_command $arg"
-+	  ;;
-+	esac
-+	continue
-+	;;
-+
-+      -L*)
-+	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-+	# We need an absolute path.
-+	case $dir in
-+	[\\/]* | [A-Za-z]:[\\/]*) ;;
-+	*)
-+	  absdir=`cd "$dir" && pwd`
-+	  if test -z "$absdir"; then
-+	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-+	    exit 1
-+	  fi
-+	  dir="$absdir"
-+	  ;;
-+	esac
-+	case "$deplibs " in
-+	*" -L$dir "*) ;;
-+	*)
-+	  deplibs="$deplibs -L$dir"
-+	  lib_search_path="$lib_search_path $dir"
-+	  ;;
-+	esac
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  case :$dllsearchpath: in
-+	  *":$dir:"*) ;;
-+	  *) dllsearchpath="$dllsearchpath:$dir";;
-+	  esac
-+	  ;;
-+	esac
-+	continue
-+	;;
-+
-+      -l*)
-+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-+	  case $host in
-+	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-+	    # These systems don't actually have a C or math library (as such)
-+	    continue
-+	    ;;
-+	  *-*-mingw* | *-*-os2*)
-+	    # These systems don't actually have a C library (as such)
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  *-*-openbsd* | *-*-freebsd*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  esac
-+	 elif test "X$arg" = "X-lc_r"; then
-+	  case $host in
-+	 *-*-openbsd* | *-*-freebsd*)
-+	    # Do not include libc_r directly, use -pthread flag.
-+	    continue
-+	    ;;
-+	  esac
-+	fi
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-+      -module)
-+	module=yes
-+	continue
-+	;;
-+
-+      -no-fast-install)
-+	fast_install=no
-+	continue
-+	;;
-+
-+      -no-install)
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  # The PATH hackery in wrapper scripts is required on Windows
-+	  # in order for the loader to find any dlls it needs.
-+	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-+	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-+	  fast_install=no
-+	  ;;
-+	*) no_install=yes ;;
-+	esac
-+	continue
-+	;;
-+
-+      -no-undefined)
-+	allow_undefined=no
-+	continue
-+	;;
-+
-+      -o) prev=output ;;
-+
-+      -release)
-+	prev=release
-+	continue
-+	;;
-+
-+      -rpath)
-+	prev=rpath
-+	continue
-+	;;
-+
-+      -R)
-+	prev=xrpath
-+	continue
-+	;;
-+
-+      -R*)
-+	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-+	# We need an absolute path.
-+	case $dir in
-+	[\\/]* | [A-Za-z]:[\\/]*) ;;
-+	*)
-+	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+	case "$xrpath " in
-+	*" $dir "*) ;;
-+	*) xrpath="$xrpath $dir" ;;
-+	esac
-+	continue
-+	;;
-+
-+      -static)
-+	# The effects of -static are defined in a previous loop.
-+	# We used to do the same as -all-static on platforms that
-+	# didn't have a PIC flag, but the assumption that the effects
-+	# would be equivalent was wrong.  It would break on at least
-+	# Digital Unix and AIX.
-+	continue
-+	;;
-+
-+      -thread-safe)
-+	thread_safe=yes
-+	continue
-+	;;
-+
-+      -version-info)
-+	prev=vinfo
-+	continue
-+	;;
-+
-+      -Wc,*)
-+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-+	arg=
-+	save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+	  case $flag in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    flag="\"$flag\""
-+	    ;;
-+	  esac
-+	  arg="$arg $wl$flag"
-+	  compiler_flags="$compiler_flags $flag"
-+	done
-+	IFS="$save_ifs"
-+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+	;;
-+
-+      -Wl,*)
-+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-+	arg=
-+	save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+	  case $flag in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    flag="\"$flag\""
-+	    ;;
-+	  esac
-+	  arg="$arg $wl$flag"
-+	  compiler_flags="$compiler_flags $wl$flag"
-+	  linker_flags="$linker_flags $flag"
-+	done
-+	IFS="$save_ifs"
-+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+	;;
-+
-+      -Xcompiler)
-+	prev=xcompiler
-+	continue
-+	;;
-+
-+      -Xlinker)
-+	prev=xlinker
-+	continue
-+	;;
-+
-+      # Some other compiler flag.
-+      -* | +*)
-+	# Unknown arguments in both finalize_command and compile_command need
-+	# to be aesthetically quoted because they are evaled later.
-+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+	case $arg in
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+	;;
-+
-+      *.lo | *.$objext)
-+	# A library or standard object.
-+	if test "$prev" = dlfiles; then
-+	  # This file was specified with -dlopen.
-+	  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+	    dlfiles="$dlfiles $arg"
-+	    prev=
-+	    continue
-+	  else
-+	    # If libtool objects are unsupported, then we need to preload.
-+	    prev=dlprefiles
-+	  fi
-+	fi
-+
-+	if test "$prev" = dlprefiles; then
-+	  # Preload the old-style object.
-+	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
-+	  prev=
-+	else
-+	  case $arg in
-+	  *.lo) libobjs="$libobjs $arg" ;;
-+	  *) objs="$objs $arg" ;;
-+	  esac
-+	fi
-+	;;
-+
-+      *.$libext)
-+	# An archive.
-+	deplibs="$deplibs $arg"
-+	old_deplibs="$old_deplibs $arg"
-+	continue
-+	;;
-+
-+      *.la)
-+	# A libtool-controlled library.
-+
-+	if test "$prev" = dlfiles; then
-+	  # This library was specified with -dlopen.
-+	  dlfiles="$dlfiles $arg"
-+	  prev=
-+	elif test "$prev" = dlprefiles; then
-+	  # The library was specified with -dlpreopen.
-+	  dlprefiles="$dlprefiles $arg"
-+	  prev=
-+	else
-+	  deplibs="$deplibs $arg"
-+	fi
-+	continue
-+	;;
-+
-+      # Some other compiler argument.
-+      *)
-+	# Unknown arguments in both finalize_command and compile_command need
-+	# to be aesthetically quoted because they are evaled later.
-+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+	case $arg in
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+	;;
-+      esac # arg
-+
-+      # Now actually substitute the argument into the commands.
-+      if test -n "$arg"; then
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
-+      fi
-+    done # argument parsing loop
-+
-+    if test -n "$prev"; then
-+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-+      eval arg=\"$export_dynamic_flag_spec\"
-+      compile_command="$compile_command $arg"
-+      finalize_command="$finalize_command $arg"
-+    fi
-+
-+    # calculate the name of the file, without its directory
-+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-+    libobjs_save="$libobjs"
-+
-+    if test -n "$shlibpath_var"; then
-+      # get the directories listed in $shlibpath_var
-+      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+    else
-+      shlib_search_path=
-+    fi
-+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-+
-+    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-+    if test "X$output_objdir" = "X$output"; then
-+      output_objdir="$objdir"
-+    else
-+      output_objdir="$output_objdir/$objdir"
-+    fi
-+    # Create the object directory.
-+    if test ! -d $output_objdir; then
-+      $show "$mkdir $output_objdir"
-+      $run $mkdir $output_objdir
-+      status=$?
-+      if test $status -ne 0 && test ! -d $output_objdir; then
-+	exit $status
-+      fi
-+    fi
-+
-+    # Determine the type of output
-+    case $output in
-+    "")
-+      $echo "$modename: you must specify an output file" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+      ;;
-+    *.$libext) linkmode=oldlib ;;
-+    *.lo | *.$objext) linkmode=obj ;;
-+    *.la) linkmode=lib ;;
-+    *) linkmode=prog ;; # Anything else should be a program.
-+    esac
-+
-+    specialdeplibs=
-+    libs=
-+    # Find all interdependent deplibs by searching for libraries
-+    # that are linked more than once (e.g. -la -lb -la)
-+    for deplib in $deplibs; do
-+      if test "X$duplicate_deps" = "Xyes" ; then
-+	case "$libs " in
-+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	esac
-+      fi
-+      libs="$libs $deplib"
-+    done
-+    deplibs=
-+    newdependency_libs=
-+    newlib_search_path=
-+    need_relink=no # whether we're linking any uninstalled libtool libraries
-+    notinst_deplibs= # not-installed libtool libraries
-+    notinst_path= # paths that contain not-installed libtool libraries
-+    case $linkmode in
-+    lib)
-+	passes="conv link"
-+	for file in $dlfiles $dlprefiles; do
-+	  case $file in
-+	  *.la) ;;
-+	  *)
-+	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-+	    exit 1
-+	    ;;
-+	  esac
-+	done
-+	;;
-+    prog)
-+	compile_deplibs=
-+	finalize_deplibs=
-+	alldeplibs=no
-+	newdlfiles=
-+	newdlprefiles=
-+	passes="conv scan dlopen dlpreopen link"
-+	;;
-+    *)  passes="conv"
-+	;;
-+    esac
-+    for pass in $passes; do
-+      if test $linkmode = prog; then
-+	# Determine which files to process
-+	case $pass in
-+	dlopen)
-+	  libs="$dlfiles"
-+	  save_deplibs="$deplibs" # Collect dlpreopened libraries
-+	  deplibs=
-+	  ;;
-+	dlpreopen) libs="$dlprefiles" ;;
-+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+	esac
-+      fi
-+      for deplib in $libs; do
-+	lib=
-+	found=no
-+	case $deplib in
-+	-l*)
-+	  if test $linkmode = oldlib && test $linkmode = obj; then
-+	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
-+	    continue
-+	  fi
-+	  if test $pass = conv; then
-+	    deplibs="$deplib $deplibs"
-+	    continue
-+	  fi
-+	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-+	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+	    # Search the libtool library
-+	    lib="$searchdir/lib${name}.la"
-+	    if test -f "$lib"; then
-+	      found=yes
-+	      break
-+	    fi
-+	  done
-+	  if test "$found" != yes; then
-+	    # deplib doesn't seem to be a libtool library
-+	    if test "$linkmode,$pass" = "prog,link"; then
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    else
-+	      deplibs="$deplib $deplibs"
-+	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
-+	    fi
-+	    continue
-+	  fi
-+	  ;; # -l
-+	-L*)
-+	  case $linkmode in
-+	  lib)
-+	    deplibs="$deplib $deplibs"
-+	    test $pass = conv && continue
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-+	    ;;
-+	  prog)
-+	    if test $pass = conv; then
-+	      deplibs="$deplib $deplibs"
-+	      continue
-+	    fi
-+	    if test $pass = scan; then
-+	      deplibs="$deplib $deplibs"
-+	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    ;;
-+	  *)
-+	    $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
-+	    ;;
-+	  esac # linkmode
-+	  continue
-+	  ;; # -L
-+	-R*)
-+	  if test $pass = link; then
-+	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-+	    # Make sure the xrpath contains only unique directories.
-+	    case "$xrpath " in
-+	    *" $dir "*) ;;
-+	    *) xrpath="$xrpath $dir" ;;
-+	    esac
-+	  fi
-+	  deplibs="$deplib $deplibs"
-+	  continue
-+	  ;;
-+	*.la) lib="$deplib" ;;
-+	*.$libext)
-+	  if test $pass = conv; then
-+	    deplibs="$deplib $deplibs"
-+	    continue
-+	  fi
-+	  case $linkmode in
-+	  lib)
-+	    if test "$deplibs_check_method" != pass_all; then
-+	      echo
-+	      echo "*** Warning: Trying to link with static lib archive $deplib."
-+	      echo "*** I have the capability to make that library automatically link in when"
-+	      echo "*** you link to this library.  But I can only do this if you have a"
-+	      echo "*** shared version of the library, which you do not appear to have"
-+	      echo "*** because the file extensions .$libext of this argument makes me believe"
-+	      echo "*** that it is just a static archive that I should not used here."
-+	    else
-+	      echo
-+	      echo "*** Warning: Linking the shared library $output against the"
-+	      echo "*** static library $deplib is not portable!"
-+	      deplibs="$deplib $deplibs"
-+	    fi
-+	    continue
-+	    ;;
-+	  prog)
-+	    if test $pass != link; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    continue
-+	    ;;
-+	  esac # linkmode
-+	  ;; # *.$libext
-+	*.lo | *.$objext)
-+	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	    # If there is no dlopen support or we're linking statically,
-+	    # we need to preload.
-+	    newdlprefiles="$newdlprefiles $deplib"
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    newdlfiles="$newdlfiles $deplib"
-+	  fi
-+	  continue
-+	  ;;
-+	%DEPLIBS%)
-+	  alldeplibs=yes
-+	  continue
-+	  ;;
-+	esac # case $deplib
-+	if test $found = yes || test -f "$lib"; then :
-+	else
-+	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-+	  exit 1
-+	fi
-+
-+	# Check to see that this really is a libtool archive.
-+	if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	else
-+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+	  exit 1
-+	fi
-+
-+	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-+	test "X$ladir" = "X$lib" && ladir="."
-+
-+	dlname=
-+	dlopen=
-+	dlpreopen=
-+	libdir=
-+	library_names=
-+	old_library=
-+	# If the library was installed with an old release of libtool,
-+	# it will not redefine variable installed.
-+	installed=yes
-+
-+	# Read the .la file
-+	case $lib in
-+	*/* | *\\*) . $lib ;;
-+	*) . ./$lib ;;
-+	esac
-+
-+	if test "$linkmode,$pass" = "lib,link" ||
-+	   test "$linkmode,$pass" = "prog,scan" ||
-+	   { test $linkmode = oldlib && test $linkmode = obj; }; then
-+	   # Add dl[pre]opened files of deplib
-+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-+	fi
-+
-+	if test $pass = conv; then
-+	  # Only check for convenience libraries
-+	  deplibs="$lib $deplibs"
-+	  if test -z "$libdir"; then
-+	    if test -z "$old_library"; then
-+	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-+	      exit 1
-+	    fi
-+	    # It is a libtool convenience library, so add in its objects.
-+	    convenience="$convenience $ladir/$objdir/$old_library"
-+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+	    tmp_libs=
-+	    for deplib in $dependency_libs; do
-+	      deplibs="$deplib $deplibs"
-+              if test "X$duplicate_deps" = "Xyes" ; then
-+	        case "$tmp_libs " in
-+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	        esac
-+              fi
-+	      tmp_libs="$tmp_libs $deplib"
-+	    done
-+	  elif test $linkmode != prog && test $linkmode != lib; then
-+	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-+	    exit 1
-+	  fi
-+	  continue
-+	fi # $pass = conv
-+
-+	# Get the name of the library we link against.
-+	linklib=
-+	for l in $old_library $library_names; do
-+	  linklib="$l"
-+	done
-+	if test -z "$linklib"; then
-+	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-+	  exit 1
-+	fi
-+
-+	# This library was specified with -dlopen.
-+	if test $pass = dlopen; then
-+	  if test -z "$libdir"; then
-+	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-+	    exit 1
-+	  fi
-+	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	    # If there is no dlname, no dlopen support or we're linking
-+	    # statically, we need to preload.
-+	    dlprefiles="$dlprefiles $lib"
-+	  else
-+	    newdlfiles="$newdlfiles $lib"
-+	  fi
-+	  continue
-+	fi # $pass = dlopen
-+
-+	# We need an absolute path.
-+	case $ladir in
-+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-+	*)
-+	  abs_ladir=`cd "$ladir" && pwd`
-+	  if test -z "$abs_ladir"; then
-+	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-+	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-+	    abs_ladir="$ladir"
-+	  fi
-+	  ;;
-+	esac
-+	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+
-+	# Find the relevant object directory and library name.
-+	if test "X$installed" = Xyes; then
-+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	  else
-+	    dir="$libdir"
-+	    absdir="$libdir"
-+	  fi
-+	else
-+	  dir="$ladir/$objdir"
-+	  absdir="$abs_ladir/$objdir"
-+	  # Remove this search path later
-+	  notinst_path="$notinst_path $abs_ladir"
-+	fi # $installed = yes
-+	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-+
-+	# This library was specified with -dlpreopen.
-+	if test $pass = dlpreopen; then
-+	  if test -z "$libdir"; then
-+	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-+	    exit 1
-+	  fi
-+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-+	  # are required to link).
-+	  if test -n "$old_library"; then
-+	    newdlprefiles="$newdlprefiles $dir/$old_library"
-+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-+	  elif test -n "$dlname"; then
-+	    newdlprefiles="$newdlprefiles $dir/$dlname"
-+	  else
-+	    newdlprefiles="$newdlprefiles $dir/$linklib"
-+	  fi
-+	fi # $pass = dlpreopen
-+
-+	if test -z "$libdir"; then
-+	  # Link the convenience library
-+	  if test $linkmode = lib; then
-+	    deplibs="$dir/$old_library $deplibs"
-+	  elif test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$dir/$old_library $compile_deplibs"
-+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-+	  else
-+	    deplibs="$lib $deplibs"
-+	  fi
-+	  continue
-+	fi
-+
-+	if test $linkmode = prog && test $pass != link; then
-+	  newlib_search_path="$newlib_search_path $ladir"
-+	  deplibs="$lib $deplibs"
-+
-+	  linkalldeplibs=no
-+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-+	     test "$build_libtool_libs" = no; then
-+	    linkalldeplibs=yes
-+	  fi
-+
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    case $deplib in
-+	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-+	    esac
-+	    # Need to link against all dependency_libs?
-+	    if test $linkalldeplibs = yes; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      # Need to hardcode shared library paths
-+	      # or/and link against static libraries
-+	      newdependency_libs="$deplib $newdependency_libs"
-+	    fi
-+	    if test "X$duplicate_deps" = "Xyes" ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done # for deplib
-+	  continue
-+	fi # $linkmode = prog...
-+
-+	link_static=no # Whether the deplib will be linked statically
-+	if test -n "$library_names" &&
-+	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+	  # Link against this shared library
-+
-+	  if test "$linkmode,$pass" = "prog,link" ||
-+	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
-+	    # Hardcode the library path.
-+	    # Skip directories that are in the system default run-time
-+	    # search path.
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $absdir "*) ;;
-+	    *)
-+	      case "$compile_rpath " in
-+	      *" $absdir "*) ;;
-+	      *) compile_rpath="$compile_rpath $absdir"
-+	      esac
-+	      ;;
-+	    esac
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $libdir "*) ;;
-+	    *)
-+	      case "$finalize_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      esac
-+	      ;;
-+	    esac
-+	    if test $linkmode = prog; then
-+	      # We need to hardcode the library path
-+	      if test -n "$shlibpath_var"; then
-+		# Make sure the rpath contains only unique directories.
-+		case "$temp_rpath " in
-+		*" $dir "*) ;;
-+		*" $absdir "*) ;;
-+		*) temp_rpath="$temp_rpath $dir" ;;
-+		esac
-+	      fi
-+	    fi
-+	  fi # $linkmode,$pass = prog,link...
-+
-+	  if test "$alldeplibs" = yes &&
-+	     { test "$deplibs_check_method" = pass_all ||
-+	       { test "$build_libtool_libs" = yes &&
-+		 test -n "$library_names"; }; }; then
-+	    # We only need to search for static libraries
-+	    continue
-+	  fi
-+
-+	  if test "$installed" = no; then
-+	    notinst_deplibs="$notinst_deplibs $lib"
-+	    need_relink=yes
-+	  fi
-+
-+	  if test -n "$old_archive_from_expsyms_cmds"; then
-+	    # figure out the soname
-+	    set dummy $library_names
-+	    realname="$2"
-+	    shift; shift
-+	    libname=`eval \\$echo \"$libname_spec\"`
-+	    # use dlname if we got it. it's perfectly good, no?
-+	    if test -n "$dlname"; then
-+	      soname="$dlname"
-+	    elif test -n "$soname_spec"; then
-+	      # bleh windows
-+	      case $host in
-+	      *cygwin*)
-+		major=`expr $current - $age`
-+		versuffix="-$major"
-+		;;
-+	      esac
-+	      eval soname=\"$soname_spec\"
-+	    else
-+	      soname="$realname"
-+	    fi
-+
-+	    # Make a new name for the extract_expsyms_cmds to use
-+	    soroot="$soname"
-+	    soname=`echo $soroot | ${SED} -e 's/^.*\///'`
-+	    newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-+
-+	    # If the library has no export list, then create one now
-+	    if test -f "$output_objdir/$soname-def"; then :
-+	    else
-+	      $show "extracting exported symbol list from \`$soname'"
-+	      save_ifs="$IFS"; IFS='~'
-+	      eval cmds=\"$extract_expsyms_cmds\"
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd" || exit $?
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+
-+	    # Create $newlib
-+	    if test -f "$output_objdir/$newlib"; then :; else
-+	      $show "generating import library for \`$soname'"
-+	      save_ifs="$IFS"; IFS='~'
-+	      eval cmds=\"$old_archive_from_expsyms_cmds\"
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd" || exit $?
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+	    # make sure the library variables are pointing to the new library
-+	    dir=$output_objdir
-+	    linklib=$newlib
-+	  fi # test -n $old_archive_from_expsyms_cmds
-+
-+	  if test $linkmode = prog || test "$mode" != relink; then
-+	    add_shlibpath=
-+	    add_dir=
-+	    add=
-+	    lib_linked=yes
-+	    case $hardcode_action in
-+	    immediate | unsupported)
-+	      if test "$hardcode_direct" = no; then
-+		add="$dir/$linklib"
-+	      elif test "$hardcode_minus_L" = no; then
-+		case $host in
-+		*-*-sunos*) add_shlibpath="$dir" ;;
-+		esac
-+		add_dir="-L$dir"
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = no; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
-+	      else
-+		lib_linked=no
-+	      fi
-+	      ;;
-+	    relink)
-+	      if test "$hardcode_direct" = yes; then
-+		add="$dir/$linklib"
-+	      elif test "$hardcode_minus_L" = yes; then
-+		add_dir="-L$dir"
-+		# Try looking first in the location we're being installed to.
-+		if test -n "$inst_prefix_dir"; then
-+		  case "$libdir" in
-+		  [\/]*)
-+		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
-+		    ;;
-+		  esac
-+		fi
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = yes; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
-+	      else
-+		lib_linked=no
-+	      fi
-+	      ;;
-+	    *) lib_linked=no ;;
-+	    esac
-+
-+	    if test "$lib_linked" != yes; then
-+	      $echo "$modename: configuration error: unsupported hardcode properties"
-+	      exit 1
-+	    fi
-+
-+	    if test -n "$add_shlibpath"; then
-+	      case :$compile_shlibpath: in
-+	      *":$add_shlibpath:"*) ;;
-+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-+	      esac
-+	    fi
-+	    if test $linkmode = prog; then
-+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-+	    else
-+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+	      test -n "$add" && deplibs="$add $deplibs"
-+	      if test "$hardcode_direct" != yes && \
-+		 test "$hardcode_minus_L" != yes && \
-+		 test "$hardcode_shlibpath_var" = yes; then
-+		case :$finalize_shlibpath: in
-+		*":$libdir:"*) ;;
-+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+		esac
-+	      fi
-+	    fi
-+	  fi
-+
-+	  if test $linkmode = prog || test "$mode" = relink; then
-+	    add_shlibpath=
-+	    add_dir=
-+	    add=
-+	    # Finalize command for both is simple: just hardcode it.
-+	    if test "$hardcode_direct" = yes; then
-+	      add="$libdir/$linklib"
-+	    elif test "$hardcode_minus_L" = yes; then
-+	      add_dir="-L$libdir"
-+	      add="-l$name"
-+	    elif test "$hardcode_shlibpath_var" = yes; then
-+	      case :$finalize_shlibpath: in
-+	      *":$libdir:"*) ;;
-+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+	      esac
-+	      add="-l$name"
-+	    else
-+	      # We cannot seem to hardcode it, guess we'll fake it.
-+	      add_dir="-L$libdir"
-+	      # Try looking first in the location we're being installed to.
-+	      if test -n "$inst_prefix_dir"; then
-+		case "$libdir" in
-+		[\/]*)
-+		  add_dir="-L$inst_prefix_dir$libdir $add_dir"
-+		  ;;
-+		esac
-+	      fi
-+	      add="-l$name"
-+	    fi
-+
-+	    if test $linkmode = prog; then
-+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-+	    else
-+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+	      test -n "$add" && deplibs="$add $deplibs"
-+	    fi
-+	  fi
-+	elif test $linkmode = prog; then
-+	  if test "$alldeplibs" = yes &&
-+	     { test "$deplibs_check_method" = pass_all ||
-+	       { test "$build_libtool_libs" = yes &&
-+		 test -n "$library_names"; }; }; then
-+	    # We only need to search for static libraries
-+	    continue
-+	  fi
-+
-+	  # Try to link the static library
-+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-+	  # is not unsupported.  This is valid on all known static and
-+	  # shared platforms.
-+	  if test "$hardcode_direct" != unsupported; then
-+	    test -n "$old_library" && linklib="$old_library"
-+	    compile_deplibs="$dir/$linklib $compile_deplibs"
-+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-+	  else
-+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-+	  fi
-+	elif test "$build_libtool_libs" = yes; then
-+	  # Not a shared library
-+	  if test "$deplibs_check_method" != pass_all; then
-+	    # We're trying link a shared library against a static one
-+	    # but the system doesn't support it.
-+
-+	    # Just print a warning and add the library to dependency_libs so
-+	    # that the program can be linked against the static library.
-+	    echo
-+	    echo "*** Warning: This system can not link to static lib archive $lib."
-+	    echo "*** I have the capability to make that library automatically link in when"
-+	    echo "*** you link to this library.  But I can only do this if you have a"
-+	    echo "*** shared version of the library, which you do not appear to have."
-+	    if test "$module" = yes; then
-+	      echo "*** But as you try to build a module library, libtool will still create "
-+	      echo "*** a static module, that should work as long as the dlopening application"
-+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-+	      if test -z "$global_symbol_pipe"; then
-+		echo
-+		echo "*** However, this would only work if libtool was able to extract symbol"
-+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+		echo "*** not find such a program.  So, this module is probably useless."
-+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+	      fi
-+	      if test "$build_old_libs" = no; then
-+		build_libtool_libs=module
-+		build_old_libs=yes
-+	      else
-+		build_libtool_libs=no
-+	      fi
-+	    fi
-+	  else
-+	    convenience="$convenience $dir/$old_library"
-+	    old_convenience="$old_convenience $dir/$old_library"
-+	    deplibs="$dir/$old_library $deplibs"
-+	    link_static=yes
-+	  fi
-+	fi # link shared/static library?
-+
-+	if test $linkmode = lib; then
-+	  if test -n "$dependency_libs" &&
-+	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
-+	       test $link_static = yes; }; then
-+	    # Extract -R from dependency_libs
-+	    temp_deplibs=
-+	    for libdir in $dependency_libs; do
-+	      case $libdir in
-+	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-+		   case " $xrpath " in
-+		   *" $temp_xrpath "*) ;;
-+		   *) xrpath="$xrpath $temp_xrpath";;
-+		   esac;;
-+	      *) temp_deplibs="$temp_deplibs $libdir";;
-+	      esac
-+	    done
-+	    dependency_libs="$temp_deplibs"
-+	  fi
-+
-+	  newlib_search_path="$newlib_search_path $absdir"
-+	  # Link against this library
-+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-+	  # ... and its dependency_libs
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    if test "X$duplicate_deps" = "Xyes" ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done
-+
-+	  if test $link_all_deplibs != no; then
-+	    # Add the search paths of all dependency libraries
-+	    for deplib in $dependency_libs; do
-+	      case $deplib in
-+	      -L*) path="$deplib" ;;
-+	      *.la)
-+		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-+		test "X$dir" = "X$deplib" && dir="."
-+		# We need an absolute path.
-+		case $dir in
-+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-+		*)
-+		  absdir=`cd "$dir" && pwd`
-+		  if test -z "$absdir"; then
-+		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-+		    absdir="$dir"
-+		  fi
-+		  ;;
-+		esac
-+		if grep "^installed=no" $deplib > /dev/null; then
-+		  path="-L$absdir/$objdir"
-+		else
-+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		  if test -z "$libdir"; then
-+		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+		    exit 1
-+		  fi
-+		  if test "$absdir" != "$libdir"; then
-+		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+		  fi
-+		  path="-L$absdir"
-+		fi
-+		;;
-+	      *) continue ;;
-+	      esac
-+	      case " $deplibs " in
-+	      *" $path "*) ;;
-+	      *) deplibs="$deplibs $path" ;;
-+	      esac
-+	    done
-+	  fi # link_all_deplibs != no
-+	fi # linkmode = lib
-+      done # for deplib in $libs
-+      if test $pass = dlpreopen; then
-+	# Link the dlpreopened libraries before other libraries
-+	for deplib in $save_deplibs; do
-+	  deplibs="$deplib $deplibs"
-+	done
-+      fi
-+      if test $pass != dlopen; then
-+	test $pass != scan && dependency_libs="$newdependency_libs"
-+	if test $pass != conv; then
-+	  # Make sure lib_search_path contains only unique directories.
-+	  lib_search_path=
-+	  for dir in $newlib_search_path; do
-+	    case "$lib_search_path " in
-+	    *" $dir "*) ;;
-+	    *) lib_search_path="$lib_search_path $dir" ;;
-+	    esac
-+	  done
-+	  newlib_search_path=
-+	fi
-+
-+	if test "$linkmode,$pass" != "prog,link"; then
-+	  vars="deplibs"
-+	else
-+	  vars="compile_deplibs finalize_deplibs"
-+	fi
-+	for var in $vars dependency_libs; do
-+	  # Add libraries to $var in reverse order
-+	  eval tmp_libs=\"\$$var\"
-+	  new_libs=
-+	  for deplib in $tmp_libs; do
-+	    case $deplib in
-+	    -L*) new_libs="$deplib $new_libs" ;;
-+	    *)
-+	      case " $specialdeplibs " in
-+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-+	      *)
-+		case " $new_libs " in
-+		*" $deplib "*) ;;
-+		*) new_libs="$deplib $new_libs" ;;
-+		esac
-+		;;
-+	      esac
-+	      ;;
-+	    esac
-+	  done
-+	  tmp_libs=
-+	  for deplib in $new_libs; do
-+	    case $deplib in
-+	    -L*)
-+	      case " $tmp_libs " in
-+	      *" $deplib "*) ;;
-+	      *) tmp_libs="$tmp_libs $deplib" ;;
-+	      esac
-+	      ;;
-+	    *) tmp_libs="$tmp_libs $deplib" ;;
-+	    esac
-+	  done
-+	  eval $var=\"$tmp_libs\"
-+	done # for var
-+      fi
-+      if test "$pass" = "conv" &&
-+       { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
-+	libs="$deplibs" # reset libs
-+	deplibs=
-+      fi
-+    done # for pass
-+    if test $linkmode = prog; then
-+      dlfiles="$newdlfiles"
-+      dlprefiles="$newdlprefiles"
-+    fi
-+
-+    case $linkmode in
-+    oldlib)
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$rpath"; then
-+	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$xrpath"; then
-+	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$vinfo"; then
-+	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$release"; then
-+	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-+	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-+      fi
-+
-+      # Now set the variables for building old libraries.
-+      build_libtool_libs=no
-+      oldlibs="$output"
-+      objs="$objs$old_deplibs"
-+      ;;
-+
-+    lib)
-+      # Make sure we only generate libraries of the form `libNAME.la'.
-+      case $outputname in
-+      lib*)
-+	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-+	eval libname=\"$libname_spec\"
-+	;;
-+      *)
-+	if test "$module" = no; then
-+	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	fi
-+	if test "$need_lib_prefix" != no; then
-+	  # Add the "lib" prefix for modules if required
-+	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-+	  eval libname=\"$libname_spec\"
-+	else
-+	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-+	fi
-+	;;
-+      esac
-+
-+      if test -n "$objs"; then
-+	if test "$deplibs_check_method" != pass_all; then
-+	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-+	  exit 1
-+	else
-+	  echo
-+	  echo "*** Warning: Linking the shared library $output against the non-libtool"
-+	  echo "*** objects $objs is not portable!"
-+	  libobjs="$libobjs $objs"
-+	fi
-+      fi
-+
-+      if test "$dlself" != no; then
-+	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-+      fi
-+
-+      set dummy $rpath
-+      if test $# -gt 2; then
-+	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-+      fi
-+      install_libdir="$2"
-+
-+      oldlibs=
-+      if test -z "$rpath"; then
-+	if test "$build_libtool_libs" = yes; then
-+	  # Building a libtool convenience library.
-+	  libext=al
-+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-+	  build_libtool_libs=convenience
-+	  build_old_libs=yes
-+	fi
-+
-+	if test -n "$vinfo"; then
-+	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
-+	fi
-+
-+	if test -n "$release"; then
-+	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-+	fi
-+      else
-+
-+	# Parse the version information argument.
-+	save_ifs="$IFS"; IFS=':'
-+	set dummy $vinfo 0 0 0
-+	IFS="$save_ifs"
-+
-+	if test -n "$8"; then
-+	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	fi
-+
-+	current="$2"
-+	revision="$3"
-+	age="$4"
-+
-+	# Check that each of the things are valid numbers.
-+	case $current in
-+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	*)
-+	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	case $revision in
-+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	*)
-+	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	case $age in
-+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	*)
-+	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	if test $age -gt $current; then
-+	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+	  exit 1
-+	fi
-+
-+	# Calculate the version variables.
-+	major=
-+	versuffix=
-+	verstring=
-+	case $version_type in
-+	none) ;;
-+
-+	darwin)
-+	  # Like Linux, but with the current version available in
-+	  # verstring for coding it into the library header
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
-+	  # Darwin ld doesn't like 0 for these options...
-+	  minor_current=`expr $current + 1`
-+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  ;;
-+
-+	freebsd-aout)
-+	  major=".$current"
-+	  versuffix=".$current.$revision";
-+	  ;;
-+
-+	freebsd-elf)
-+	  major=".$current"
-+	  versuffix=".$current";
-+	  ;;
-+
-+	irix | nonstopux)
-+	  major=`expr $current - $age + 1`
-+
-+	  case $version_type in
-+	    nonstopux) verstring_prefix=nonstopux ;;
-+	    *)         verstring_prefix=sgi ;;
-+	  esac
-+	  verstring="$verstring_prefix$major.$revision"
-+
-+	  # Add in all the interfaces that we are compatible with.
-+	  loop=$revision
-+	  while test $loop != 0; do
-+	    iface=`expr $revision - $loop`
-+	    loop=`expr $loop - 1`
-+	    verstring="$verstring_prefix$major.$iface:$verstring"
-+	  done
-+
-+	  # Before this point, $major must not contain `.'.
-+	  major=.$major
-+	  versuffix="$major.$revision"
-+	  ;;
-+
-+	linux)
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
-+	  ;;
-+
-+	osf)
-+	  major=.`expr $current - $age`
-+	  versuffix=".$current.$age.$revision"
-+	  verstring="$current.$age.$revision"
-+
-+	  # Add in all the interfaces that we are compatible with.
-+	  loop=$age
-+	  while test $loop != 0; do
-+	    iface=`expr $current - $loop`
-+	    loop=`expr $loop - 1`
-+	    verstring="$verstring:${iface}.0"
-+	  done
-+
-+	  # Make executables depend on our current version.
-+	  verstring="$verstring:${current}.0"
-+	  ;;
-+
-+	sunos)
-+	  major=".$current"
-+	  versuffix=".$current.$revision"
-+	  ;;
-+
-+	windows)
-+	  # Use '-' rather than '.', since we only want one
-+	  # extension on DOS 8.3 filesystems.
-+	  major=`expr $current - $age`
-+	  versuffix="-$major"
-+	  ;;
-+
-+	*)
-+	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-+	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	# Clear the version info if we defaulted, and they specified a release.
-+	if test -z "$vinfo" && test -n "$release"; then
-+	  major=
-+	  verstring="0.0"
-+	  case $version_type in
-+	  darwin)
-+	    # we can't check for "0.0" in archive_cmds due to quoting
-+	    # problems, so we reset it completely
-+	    verstring=""
-+	    ;;
-+	  *)
-+	    verstring="0.0"
-+	    ;;
-+	  esac
-+	  if test "$need_version" = no; then
-+	    versuffix=
-+	  else
-+	    versuffix=".0.0"
-+	  fi
-+	fi
-+
-+	# Remove version info from name if versioning should be avoided
-+	if test "$avoid_version" = yes && test "$need_version" = no; then
-+	  major=
-+	  versuffix=
-+	  verstring=""
-+	fi
-+
-+	# Check to see if the archive will have undefined symbols.
-+	if test "$allow_undefined" = yes; then
-+	  if test "$allow_undefined_flag" = unsupported; then
-+	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-+	    build_libtool_libs=no
-+	    build_old_libs=yes
-+	  fi
-+	else
-+	  # Don't allow undefined symbols.
-+	  allow_undefined_flag="$no_undefined_flag"
-+	fi
-+      fi
-+
-+      if test "$mode" != relink; then
-+	# Remove our outputs.
-+	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-+	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
-+      fi
-+
-+      # Now set the variables for building old libraries.
-+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+
-+	# Transform .lo files to .o files.
-+	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-+      fi
-+
-+      # Eliminate all temporary directories.
-+      for path in $notinst_path; do
-+	lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-+	deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-+	dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-+      done
-+
-+      if test -n "$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	temp_xrpath=
-+	for libdir in $xrpath; do
-+	  temp_xrpath="$temp_xrpath -R$libdir"
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
-+	  dependency_libs="$temp_xrpath $dependency_libs"
-+	fi
-+      fi
-+
-+      # Make sure dlfiles contains only unique files that won't be dlpreopened
-+      old_dlfiles="$dlfiles"
-+      dlfiles=
-+      for lib in $old_dlfiles; do
-+	case " $dlprefiles $dlfiles " in
-+	*" $lib "*) ;;
-+	*) dlfiles="$dlfiles $lib" ;;
-+	esac
-+      done
-+
-+      # Make sure dlprefiles contains only unique files
-+      old_dlprefiles="$dlprefiles"
-+      dlprefiles=
-+      for lib in $old_dlprefiles; do
-+	case "$dlprefiles " in
-+	*" $lib "*) ;;
-+	*) dlprefiles="$dlprefiles $lib" ;;
-+	esac
-+      done
-+
-+      if test "$build_libtool_libs" = yes; then
-+	if test -n "$rpath"; then
-+	  case $host in
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+	    # these systems don't actually have a c library (as such)!
-+	    ;;
-+	  *-*-rhapsody* | *-*-darwin1.[012])
-+	    # Rhapsody C library is in the System framework
-+	    deplibs="$deplibs -framework System"
-+	    ;;
-+	  *-*-netbsd*)
-+	    # Don't link with libc until the a.out ld.so is fixed.
-+	    ;;
-+	  *-*-openbsd* | *-*-freebsd*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    ;;
-+	  *)
-+	    # Add libc to deplibs on all other systems if necessary.
-+	    if test $build_libtool_need_lc = "yes"; then
-+	      deplibs="$deplibs -lc"
-+	    fi
-+	    ;;
-+	  esac
-+	fi
-+
-+	# Transform deplibs into only deplibs that can be linked in shared.
-+	name_save=$name
-+	libname_save=$libname
-+	release_save=$release
-+	versuffix_save=$versuffix
-+	major_save=$major
-+	# I'm not sure if I'm treating the release correctly.  I think
-+	# release should show up in the -l (ie -lgmp5) so we don't want to
-+	# add it in twice.  Is that correct?
-+	release=""
-+	versuffix=""
-+	major=""
-+	newdeplibs=
-+	droppeddeps=no
-+	case $deplibs_check_method in
-+	pass_all)
-+	  # Don't check for shared/static.  Everything works.
-+	  # This might be a little naive.  We might want to check
-+	  # whether the library exists or not.  But this is on
-+	  # osf3 & osf4 and I'm not really sure... Just
-+	  # implementing what was already the behaviour.
-+	  newdeplibs=$deplibs
-+	  ;;
-+	test_compile)
-+	  # This code stresses the "libraries are programs" paradigm to its
-+	  # limits. Maybe even breaks it.  We compile a program, linking it
-+	  # against the deplibs as a proxy for the library.  Then we can check
-+	  # whether they linked in statically or dynamically with ldd.
-+	  $rm conftest.c
-+	  cat > conftest.c <<EOF
-+	  int main() { return 0; }
-+EOF
-+	  $rm conftest
-+	  $CC -o conftest conftest.c $deplibs
-+	  if test $? -eq 0 ; then
-+	    ldd_output=`ldd conftest`
-+	    for i in $deplibs; do
-+	      name="`expr $i : '-l\(.*\)'`"
-+	      # If $name is empty we are operating on a -L argument.
-+	      if test -n "$name" && test "$name" != "0"; then
-+		libname=`eval \\$echo \"$libname_spec\"`
-+		deplib_matches=`eval \\$echo \"$library_names_spec\"`
-+		set dummy $deplib_matches
-+		deplib_match=$2
-+		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		  newdeplibs="$newdeplibs $i"
-+		else
-+		  droppeddeps=yes
-+		  echo
-+		  echo "*** Warning: dynamic linker does not accept needed library $i."
-+		  echo "*** I have the capability to make that library automatically link in when"
-+		  echo "*** you link to this library.  But I can only do this if you have a"
-+		  echo "*** shared version of the library, which I believe you do not have"
-+		  echo "*** because a test_compile did reveal that the linker did not use it for"
-+		  echo "*** its dynamic dependency list that programs get resolved with at runtime."
-+		fi
-+	      else
-+		newdeplibs="$newdeplibs $i"
-+	      fi
-+	    done
-+	  else
-+	    # Error occured in the first compile.  Let's try to salvage
-+	    # the situation: Compile a separate program for each library.
-+	    for i in $deplibs; do
-+	      name="`expr $i : '-l\(.*\)'`"
-+	     # If $name is empty we are operating on a -L argument.
-+	      if test -n "$name" && test "$name" != "0"; then
-+		$rm conftest
-+		$CC -o conftest conftest.c $i
-+		# Did it work?
-+		if test $? -eq 0 ; then
-+		  ldd_output=`ldd conftest`
-+		  libname=`eval \\$echo \"$libname_spec\"`
-+		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-+		  set dummy $deplib_matches
-+		  deplib_match=$2
-+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		    newdeplibs="$newdeplibs $i"
-+		  else
-+		    droppeddeps=yes
-+		    echo
-+		    echo "*** Warning: dynamic linker does not accept needed library $i."
-+		    echo "*** I have the capability to make that library automatically link in when"
-+		    echo "*** you link to this library.  But I can only do this if you have a"
-+		    echo "*** shared version of the library, which you do not appear to have"
-+		    echo "*** because a test_compile did reveal that the linker did not use this one"
-+		    echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-+		  fi
-+		else
-+		  droppeddeps=yes
-+		  echo
-+		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
-+		  echo "***  make it link in!  You will probably need to install it or some"
-+		  echo "*** library that it depends on before this library will be fully"
-+		  echo "*** functional.  Installing it before continuing would be even better."
-+		fi
-+	      else
-+		newdeplibs="$newdeplibs $i"
-+	      fi
-+	    done
-+	  fi
-+	  ;;
-+	file_magic*)
-+	  set dummy $deplibs_check_method
-+	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+	  for a_deplib in $deplibs; do
-+	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    # If $name is empty we are operating on a -L argument.
-+	    if test -n "$name" && test "$name" != "0"; then
-+	      libname=`eval \\$echo \"$libname_spec\"`
-+	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		    for potent_lib in $potential_libs; do
-+		      # Follow soft links.
-+		      if ls -lLd "$potent_lib" 2>/dev/null \
-+			 | grep " -> " >/dev/null; then
-+			continue
-+		      fi
-+		      # The statement above tries to avoid entering an
-+		      # endless loop below, in case of cyclic links.
-+		      # We might still enter an endless loop, since a link
-+		      # loop can be closed while we follow links,
-+		      # but so what?
-+		      potlib="$potent_lib"
-+		      while test -h "$potlib" 2>/dev/null; do
-+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-+			case $potliblink in
-+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-+			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-+			esac
-+		      done
-+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-+			 | ${SED} 10q \
-+			 | egrep "$file_magic_regex" > /dev/null; then
-+			newdeplibs="$newdeplibs $a_deplib"
-+			a_deplib=""
-+			break 2
-+		      fi
-+		    done
-+	      done
-+	      if test -n "$a_deplib" ; then
-+		droppeddeps=yes
-+		echo
-+		echo "*** Warning: linker path does not have real file for library $a_deplib."
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have"
-+		echo "*** because I did check the linker path looking for a file starting"
-+		if test -z "$potlib" ; then
-+		  echo "*** with $libname but no candidates were found. (...for file magic test)"
-+		else
-+		  echo "*** with $libname and none of the candidates passed a file format test"
-+		  echo "*** using a file magic. Last file checked: $potlib"
-+		fi
-+	      fi
-+	    else
-+	      # Add a -L argument.
-+	      newdeplibs="$newdeplibs $a_deplib"
-+	    fi
-+	  done # Gone through all deplibs.
-+	  ;;
-+	match_pattern*)
-+	  set dummy $deplibs_check_method
-+	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+	  for a_deplib in $deplibs; do
-+	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    # If $name is empty we are operating on a -L argument.
-+	    if test -n "$name" && test "$name" != "0"; then
-+	      libname=`eval \\$echo \"$libname_spec\"`
-+	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		for potent_lib in $potential_libs; do
-+		  potlib="$potent_lib" # see symlink-check below in file_magic test
-+		  if eval echo \"$potent_lib\" 2>/dev/null \
-+		      | ${SED} 10q \
-+		      | egrep "$match_pattern_regex" > /dev/null; then
-+		    newdeplibs="$newdeplibs $a_deplib"
-+		    a_deplib=""
-+		    break 2
-+		  fi
-+		done
-+	      done
-+	      if test -n "$a_deplib" ; then
-+		droppeddeps=yes
-+		echo
-+		echo "*** Warning: linker path does not have real file for library $a_deplib."
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have"
-+		echo "*** because I did check the linker path looking for a file starting"
-+		if test -z "$potlib" ; then
-+		  echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-+		else
-+		  echo "*** with $libname and none of the candidates passed a file format test"
-+		  echo "*** using a regex pattern. Last file checked: $potlib"
-+		fi
-+	      fi
-+	    else
-+	      # Add a -L argument.
-+	      newdeplibs="$newdeplibs $a_deplib"
-+	    fi
-+	  done # Gone through all deplibs.
-+	  ;;
-+	none | unknown | *)
-+	  newdeplibs=""
-+	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-+	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
-+	     grep . >/dev/null; then
-+	    echo
-+	    if test "X$deplibs_check_method" = "Xnone"; then
-+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-+	    else
-+	      echo "*** Warning: inter-library dependencies are not known to be supported."
-+	    fi
-+	    echo "*** All declared inter-library dependencies are being dropped."
-+	    droppeddeps=yes
-+	  fi
-+	  ;;
-+	esac
-+	versuffix=$versuffix_save
-+	major=$major_save
-+	release=$release_save
-+	libname=$libname_save
-+	name=$name_save
-+
-+	case $host in
-+	*-*-rhapsody* | *-*-darwin1.[012])
-+	  # On Rhapsody replace the C library is the System framework
-+	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	  ;;
-+	esac
-+
-+	if test "$droppeddeps" = yes; then
-+	  if test "$module" = yes; then
-+	    echo
-+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-+	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
-+	    echo "*** a static module, that should work as long as the dlopening"
-+	    echo "*** application is linked with the -dlopen flag."
-+	    if test -z "$global_symbol_pipe"; then
-+	      echo
-+	      echo "*** However, this would only work if libtool was able to extract symbol"
-+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+	      echo "*** not find such a program.  So, this module is probably useless."
-+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+	    fi
-+	    if test "$build_old_libs" = no; then
-+	      oldlibs="$output_objdir/$libname.$libext"
-+	      build_libtool_libs=module
-+	      build_old_libs=yes
-+	    else
-+	      build_libtool_libs=no
-+	    fi
-+	  else
-+	    echo "*** The inter-library dependencies that have been dropped here will be"
-+	    echo "*** automatically added whenever a program is linked with this library"
-+	    echo "*** or is declared to -dlopen it."
-+
-+	    if test $allow_undefined = no; then
-+	      echo
-+	      echo "*** Since this library must not contain undefined symbols,"
-+	      echo "*** because either the platform does not support them or"
-+	      echo "*** it was explicitly requested with -no-undefined,"
-+	      echo "*** libtool will only create a static version of it."
-+	      if test "$build_old_libs" = no; then
-+		oldlibs="$output_objdir/$libname.$libext"
-+		build_libtool_libs=module
-+		build_old_libs=yes
-+	      else
-+		build_libtool_libs=no
-+	      fi
-+	    fi
-+	  fi
-+	fi
-+	# Done checking deplibs!
-+	deplibs=$newdeplibs
-+      fi
-+
-+      # All the library-specific variables (install_libdir is set above).
-+      library_names=
-+      old_library=
-+      dlname=
-+
-+      # Test again, we may have decided not to build it any more
-+      if test "$build_libtool_libs" = yes; then
-+	if test $hardcode_into_libs = yes; then
-+	  # Hardcode the library paths
-+	  hardcode_libdirs=
-+	  dep_rpath=
-+	  rpath="$finalize_rpath"
-+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-+	  for libdir in $rpath; do
-+	    if test -n "$hardcode_libdir_flag_spec"; then
-+	      if test -n "$hardcode_libdir_separator"; then
-+		if test -z "$hardcode_libdirs"; then
-+		  hardcode_libdirs="$libdir"
-+		else
-+		  # Just accumulate the unique libdirs.
-+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		    ;;
-+		  *)
-+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		    ;;
-+		  esac
-+		fi
-+	      else
-+		eval flag=\"$hardcode_libdir_flag_spec\"
-+		dep_rpath="$dep_rpath $flag"
-+	      fi
-+	    elif test -n "$runpath_var"; then
-+	      case "$perm_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) perm_rpath="$perm_rpath $libdir" ;;
-+	      esac
-+	    fi
-+	  done
-+	  # Substitute the hardcoded libdirs into the rpath.
-+	  if test -n "$hardcode_libdir_separator" &&
-+	     test -n "$hardcode_libdirs"; then
-+	    libdir="$hardcode_libdirs"
-+	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-+	  fi
-+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-+	    # We should set the runpath_var.
-+	    rpath=
-+	    for dir in $perm_rpath; do
-+	      rpath="$rpath$dir:"
-+	    done
-+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-+	  fi
-+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-+	fi
-+
-+	shlibpath="$finalize_shlibpath"
-+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-+	if test -n "$shlibpath"; then
-+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-+	fi
-+
-+	# Get the real and link names of the library.
-+	eval library_names=\"$library_names_spec\"
-+	set dummy $library_names
-+	realname="$2"
-+	shift; shift
-+
-+	if test -n "$soname_spec"; then
-+	  eval soname=\"$soname_spec\"
-+	else
-+	  soname="$realname"
-+	fi
-+	test -z "$dlname" && dlname=$soname
-+
-+	lib="$output_objdir/$realname"
-+	for link
-+	do
-+	  linknames="$linknames $link"
-+	done
-+
-+	# Ensure that we have .o objects for linkers which dislike .lo
-+	# (e.g. aix) in case we are running --disable-static
-+	for obj in $libobjs; do
-+	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-+	  if test "X$xdir" = "X$obj"; then
-+	    xdir="."
-+	  else
-+	    xdir="$xdir"
-+	  fi
-+	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-+	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-+	  if test ! -f $xdir/$oldobj; then
-+	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
-+	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
-+	  fi
-+	done
-+
-+	# Use standard objects if they are pic
-+	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+
-+	# Prepare the list of exported symbols
-+	if test -z "$export_symbols"; then
-+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-+	    $show "generating symbol list for \`$libname.la'"
-+	    export_symbols="$output_objdir/$libname.exp"
-+	    $run $rm $export_symbols
-+	    eval cmds=\"$export_symbols_cmds\"
-+	    save_ifs="$IFS"; IFS='~'
-+	    for cmd in $cmds; do
-+	      IFS="$save_ifs"
-+	      $show "$cmd"
-+	      $run eval "$cmd" || exit $?
-+	    done
-+	    IFS="$save_ifs"
-+	    if test -n "$export_symbols_regex"; then
-+	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-+	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-+	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-+	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-+	    fi
-+	  fi
-+	fi
-+
-+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-+	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-+	fi
-+
-+	if test -n "$convenience"; then
-+	  if test -n "$whole_archive_flag_spec"; then
-+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-+	  else
-+	    gentop="$output_objdir/${outputname}x"
-+	    $show "${rm}r $gentop"
-+	    $run ${rm}r "$gentop"
-+	    $show "mkdir $gentop"
-+	    $run mkdir "$gentop"
-+	    status=$?
-+	    if test $status -ne 0 && test ! -d "$gentop"; then
-+	      exit $status
-+	    fi
-+	    generated="$generated $gentop"
-+
-+	    for xlib in $convenience; do
-+	      # Extract the objects.
-+	      case $xlib in
-+	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-+	      *) xabs=`pwd`"/$xlib" ;;
-+	      esac
-+	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-+	      xdir="$gentop/$xlib"
-+
-+	      $show "${rm}r $xdir"
-+	      $run ${rm}r "$xdir"
-+	      $show "mkdir $xdir"
-+	      $run mkdir "$xdir"
-+	      status=$?
-+	      if test $status -ne 0 && test ! -d "$xdir"; then
-+		exit $status
-+	      fi
-+	      $show "(cd $xdir && $AR x $xabs)"
-+	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-+
-+	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
-+	    done
-+	  fi
-+	fi
-+
-+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-+	  eval flag=\"$thread_safe_flag_spec\"
-+	  linker_flags="$linker_flags $flag"
-+	fi
-+
-+	# Make a backup of the uninstalled library when relinking
-+	if test "$mode" = relink; then
-+	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-+	fi
-+
-+	# Do each of the archive commands.
-+	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-+	  eval cmds=\"$archive_expsym_cmds\"
-+	else
-+	  save_deplibs="$deplibs"
-+	  for conv in $convenience; do
-+	    tmp_deplibs=
-+	    for test_deplib in $deplibs; do
-+	      if test "$test_deplib" != "$conv"; then
-+		tmp_deplibs="$tmp_deplibs $test_deplib"
-+	      fi
-+	    done
-+	    deplibs="$tmp_deplibs"
-+	  done
-+	  eval cmds=\"$archive_cmds\"
-+	  deplibs="$save_deplibs"
-+	fi
-+	save_ifs="$IFS"; IFS='~'
-+	for cmd in $cmds; do
-+	  IFS="$save_ifs"
-+	  $show "$cmd"
-+	  $run eval "$cmd" || exit $?
-+	done
-+	IFS="$save_ifs"
-+
-+	# Restore the uninstalled library and exit
-+	if test "$mode" = relink; then
-+	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-+	  exit 0
-+	fi
-+
-+	# Create links to the real library.
-+	for linkname in $linknames; do
-+	  if test "$realname" != "$linkname"; then
-+	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-+	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-+	  fi
-+	done
-+
-+	# If -module or -export-dynamic was specified, set the dlname.
-+	if test "$module" = yes || test "$export_dynamic" = yes; then
-+	  # On all known operating systems, these are identical.
-+	  dlname="$soname"
-+	fi
-+      fi
-+      ;;
-+
-+    obj)
-+      if test -n "$deplibs"; then
-+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$rpath"; then
-+	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$xrpath"; then
-+	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$vinfo"; then
-+	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$release"; then
-+	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-+      fi
-+
-+      case $output in
-+      *.lo)
-+	if test -n "$objs$old_deplibs"; then
-+	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-+	  exit 1
-+	fi
-+	libobj="$output"
-+	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-+	;;
-+      *)
-+	libobj=
-+	obj="$output"
-+	;;
-+      esac
-+
-+      # Delete the old objects.
-+      $run $rm $obj $libobj
-+
-+      # Objects from convenience libraries.  This assumes
-+      # single-version convenience libraries.  Whenever we create
-+      # different ones for PIC/non-PIC, this we'll have to duplicate
-+      # the extraction.
-+      reload_conv_objs=
-+      gentop=
-+      # reload_cmds runs $LD directly, so let us get rid of
-+      # -Wl from whole_archive_flag_spec
-+      wl=
-+
-+      if test -n "$convenience"; then
-+	if test -n "$whole_archive_flag_spec"; then
-+	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-+	else
-+	  gentop="$output_objdir/${obj}x"
-+	  $show "${rm}r $gentop"
-+	  $run ${rm}r "$gentop"
-+	  $show "mkdir $gentop"
-+	  $run mkdir "$gentop"
-+	  status=$?
-+	  if test $status -ne 0 && test ! -d "$gentop"; then
-+	    exit $status
-+	  fi
-+	  generated="$generated $gentop"
-+
-+	  for xlib in $convenience; do
-+	    # Extract the objects.
-+	    case $xlib in
-+	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-+	    *) xabs=`pwd`"/$xlib" ;;
-+	    esac
-+	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-+	    xdir="$gentop/$xlib"
-+
-+	    $show "${rm}r $xdir"
-+	    $run ${rm}r "$xdir"
-+	    $show "mkdir $xdir"
-+	    $run mkdir "$xdir"
-+	    status=$?
-+	    if test $status -ne 0 && test ! -d "$xdir"; then
-+	      exit $status
-+	    fi
-+	    $show "(cd $xdir && $AR x $xabs)"
-+	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-+
-+	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
-+	  done
-+	fi
-+      fi
-+
-+      # Create the old-style object.
-+      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-+
-+      output="$obj"
-+      eval cmds=\"$reload_cmds\"
-+      save_ifs="$IFS"; IFS='~'
-+      for cmd in $cmds; do
-+	IFS="$save_ifs"
-+	$show "$cmd"
-+	$run eval "$cmd" || exit $?
-+      done
-+      IFS="$save_ifs"
-+
-+      # Exit if we aren't doing a library object file.
-+      if test -z "$libobj"; then
-+	if test -n "$gentop"; then
-+	  $show "${rm}r $gentop"
-+	  $run ${rm}r $gentop
-+	fi
-+
-+	exit 0
-+      fi
-+
-+      if test "$build_libtool_libs" != yes; then
-+	if test -n "$gentop"; then
-+	  $show "${rm}r $gentop"
-+	  $run ${rm}r $gentop
-+	fi
-+
-+	# Create an invalid libtool object if no PIC, so that we don't
-+	# accidentally link it into a program.
-+	$show "echo timestamp > $libobj"
-+	$run eval "echo timestamp > $libobj" || exit $?
-+	exit 0
-+      fi
-+
-+      if test -n "$pic_flag" || test "$pic_mode" != default; then
-+	# Only do commands if we really have different PIC objects.
-+	reload_objs="$libobjs $reload_conv_objs"
-+	output="$libobj"
-+	eval cmds=\"$reload_cmds\"
-+	save_ifs="$IFS"; IFS='~'
-+	for cmd in $cmds; do
-+	  IFS="$save_ifs"
-+	  $show "$cmd"
-+	  $run eval "$cmd" || exit $?
-+	done
-+	IFS="$save_ifs"
-+      else
-+	# Just create a symlink.
-+	$show $rm $libobj
-+	$run $rm $libobj
-+	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-+	if test "X$xdir" = "X$libobj"; then
-+	  xdir="."
-+	else
-+	  xdir="$xdir"
-+	fi
-+	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-+	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-+	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
-+	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
-+      fi
-+
-+      if test -n "$gentop"; then
-+	$show "${rm}r $gentop"
-+	$run ${rm}r $gentop
-+      fi
-+
-+      exit 0
-+      ;;
-+
-+    prog)
-+      case $host in
-+	*cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-+      esac
-+      if test -n "$vinfo"; then
-+	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-+      fi
-+
-+      if test -n "$release"; then
-+	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-+      fi
-+
-+      if test "$preload" = yes; then
-+	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-+	   test "$dlopen_self_static" = unknown; then
-+	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-+	fi
-+      fi
-+
-+      case $host in
-+      *-*-rhapsody* | *-*-darwin1.[012])
-+	# On Rhapsody replace the C library is the System framework
-+	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	case $host in
-+	*darwin*)
-+	  # Don't allow lazy linking, it breaks C++ global constructors
-+	  compile_command="$compile_command ${wl}-bind_at_load"
-+	  finalize_command="$finalize_command ${wl}-bind_at_load"
-+	  ;;
-+	esac
-+	;;
-+      esac
-+
-+      compile_command="$compile_command $compile_deplibs"
-+      finalize_command="$finalize_command $finalize_deplibs"
-+
-+      if test -n "$rpath$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	for libdir in $rpath $xrpath; do
-+	  # This is the magic to use -rpath.
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+      fi
-+
-+      # Now hardcode the library paths
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $compile_rpath $finalize_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) perm_rpath="$perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  case :$dllsearchpath: in
-+	  *":$libdir:"*) ;;
-+	  *) dllsearchpath="$dllsearchpath:$libdir";;
-+	  esac
-+	  ;;
-+	esac
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      compile_rpath="$rpath"
-+
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $finalize_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$finalize_perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      finalize_rpath="$rpath"
-+
-+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-+	# Transform all the library objects into standard objects.
-+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+      fi
-+
-+      dlsyms=
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-+	  dlsyms="${outputname}S.c"
-+	else
-+	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-+	fi
-+      fi
-+
-+      if test -n "$dlsyms"; then
-+	case $dlsyms in
-+	"") ;;
-+	*.c)
-+	  # Discover the nlist of each of the dlfiles.
-+	  nlist="$output_objdir/${outputname}.nm"
-+
-+	  $show "$rm $nlist ${nlist}S ${nlist}T"
-+	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-+
-+	  # Parse the name list into a source file.
-+	  $show "creating $output_objdir/$dlsyms"
-+
-+	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-+
-+#ifdef __cplusplus
-+extern \"C\" {
-+#endif
-+
-+/* Prevent the only kind of declaration conflicts we can make. */
-+#define lt_preloaded_symbols some_other_symbol
-+
-+/* External symbol declarations for the compiler. */\
-+"
-+
-+	  if test "$dlself" = yes; then
-+	    $show "generating symbol list for \`$output'"
-+
-+	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-+
-+	    # Add our own program objects to the symbol list.
-+	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	    for arg in $progfiles; do
-+	      $show "extracting global C symbols from \`$arg'"
-+	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-+	    done
-+
-+	    if test -n "$exclude_expsyms"; then
-+	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-+	      $run eval '$mv "$nlist"T "$nlist"'
-+	    fi
-+
-+	    if test -n "$export_symbols_regex"; then
-+	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-+	      $run eval '$mv "$nlist"T "$nlist"'
-+	    fi
-+
-+	    # Prepare the list of exported symbols
-+	    if test -z "$export_symbols"; then
-+	      export_symbols="$output_objdir/$output.exp"
-+	      $run $rm $export_symbols
-+	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+	    else
-+	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-+	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-+	      $run eval 'mv "$nlist"T "$nlist"'
-+	    fi
-+	  fi
-+
-+	  for arg in $dlprefiles; do
-+	    $show "extracting global C symbols from \`$arg'"
-+	    name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
-+	    $run eval 'echo ": $name " >> "$nlist"'
-+	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-+	  done
-+
-+	  if test -z "$run"; then
-+	    # Make sure we have at least an empty file.
-+	    test -f "$nlist" || : > "$nlist"
-+
-+	    if test -n "$exclude_expsyms"; then
-+	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-+	      $mv "$nlist"T "$nlist"
-+	    fi
-+
-+	    # Try sorting and uniquifying the output.
-+	    if grep -v "^: " < "$nlist" |
-+		if sort -k 3 </dev/null >/dev/null 2>&1; then
-+		  sort -k 3
-+		else
-+		  sort +2
-+		fi |
-+		uniq > "$nlist"S; then
-+	      :
-+	    else
-+	      grep -v "^: " < "$nlist" > "$nlist"S
-+	    fi
-+
-+	    if test -f "$nlist"S; then
-+	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-+	    else
-+	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
-+	    fi
-+
-+	    $echo >> "$output_objdir/$dlsyms" "\
-+
-+#undef lt_preloaded_symbols
-+
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr void *
-+#else
-+# define lt_ptr char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr address;
-+}
-+lt_preloaded_symbols[] =
-+{\
-+"
-+
-+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-+
-+	    $echo >> "$output_objdir/$dlsyms" "\
-+  {0, (lt_ptr) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+  return lt_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif\
-+"
-+	  fi
-+
-+	  pic_flag_for_symtable=
-+	  case $host in
-+	  # compiling the symbol table file with pic_flag works around
-+	  # a FreeBSD bug that causes programs to crash when -lm is
-+	  # linked before any other PIC object.  But we must not use
-+	  # pic_flag when linking with -static.  The problem exists in
-+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-+	    case "$compile_command " in
-+	    *" -static "*) ;;
-+	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
-+	    esac;;
-+	  *-*-hpux*)
-+	    case "$compile_command " in
-+	    *" -static "*) ;;
-+	    *) pic_flag_for_symtable=" $pic_flag -DPIC";;
-+	    esac
-+	  esac
-+
-+	  # Now compile the dynamic symbol file.
-+	  $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-+	  $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-+
-+	  # Clean up the generated files.
-+	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-+	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-+
-+	  # Transform the symbol file into the correct name.
-+	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+	  ;;
-+	*)
-+	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+      else
-+	# We keep going just in case the user didn't refer to
-+	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-+	# really was required.
-+
-+	# Nullify the symbol file.
-+	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+      fi
-+
-+      if test $need_relink = no || test "$build_libtool_libs" != yes; then
-+	# Replace the output file specification.
-+	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	link_command="$compile_command$compile_rpath"
-+
-+	# We have no uninstalled library dependencies, so finalize right now.
-+	$show "$link_command"
-+	$run eval "$link_command"
-+	status=$?
-+
-+	# Delete the generated files.
-+	if test -n "$dlsyms"; then
-+	  $show "$rm $output_objdir/${outputname}S.${objext}"
-+	  $run $rm "$output_objdir/${outputname}S.${objext}"
-+	fi
-+
-+	exit $status
-+      fi
-+
-+      if test -n "$shlibpath_var"; then
-+	# We should set the shlibpath_var
-+	rpath=
-+	for dir in $temp_rpath; do
-+	  case $dir in
-+	  [\\/]* | [A-Za-z]:[\\/]*)
-+	    # Absolute path.
-+	    rpath="$rpath$dir:"
-+	    ;;
-+	  *)
-+	    # Relative path: add a thisdir entry.
-+	    rpath="$rpath\$thisdir/$dir:"
-+	    ;;
-+	  esac
-+	done
-+	temp_rpath="$rpath"
-+      fi
-+
-+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-+      fi
-+      if test -n "$finalize_shlibpath"; then
-+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-+      fi
-+
-+      compile_var=
-+      finalize_var=
-+      if test -n "$runpath_var"; then
-+	if test -n "$perm_rpath"; then
-+	  # We should set the runpath_var.
-+	  rpath=
-+	  for dir in $perm_rpath; do
-+	    rpath="$rpath$dir:"
-+	  done
-+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-+	fi
-+	if test -n "$finalize_perm_rpath"; then
-+	  # We should set the runpath_var.
-+	  rpath=
-+	  for dir in $finalize_perm_rpath; do
-+	    rpath="$rpath$dir:"
-+	  done
-+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-+	fi
-+      fi
-+
-+      if test "$no_install" = yes; then
-+	# We don't need to create a wrapper script.
-+	link_command="$compile_var$compile_command$compile_rpath"
-+	# Replace the output file specification.
-+	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	# Delete the old output file.
-+	$run $rm $output
-+	# Link the executable and exit
-+	$show "$link_command"
-+	$run eval "$link_command" || exit $?
-+	exit 0
-+      fi
-+
-+      if test "$hardcode_action" = relink; then
-+	# Fast installation is not supported
-+	link_command="$compile_var$compile_command$compile_rpath"
-+	relink_command="$finalize_var$finalize_command$finalize_rpath"
-+
-+	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-+	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-+      else
-+	if test "$fast_install" != no; then
-+	  link_command="$finalize_var$compile_command$finalize_rpath"
-+	  if test "$fast_install" = yes; then
-+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+	  else
-+	    # fast_install is set to needless
-+	    relink_command=
-+	  fi
-+	else
-+	  link_command="$compile_var$compile_command$compile_rpath"
-+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-+	fi
-+      fi
-+
-+      # Replace the output file specification.
-+      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+
-+      # Delete the old output files.
-+      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-+
-+      $show "$link_command"
-+      $run eval "$link_command" || exit $?
-+
-+      # Now create the wrapper script.
-+      $show "creating $output"
-+
-+      # Quote the relink command for shipping.
-+      if test -n "$relink_command"; then
-+	# Preserve any variables that may affect compiler behavior
-+	for var in $variables_saved_for_relink; do
-+	  if eval test -z \"\${$var+set}\"; then
-+	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-+	  elif eval var_value=\$$var; test -z "$var_value"; then
-+	    relink_command="$var=; export $var; $relink_command"
-+	  else
-+	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-+	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+	  fi
-+	done
-+	relink_command="(cd `pwd`; $relink_command)"
-+	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+      fi
-+
-+      # Quote $echo for shipping.
-+      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-+	case $0 in
-+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-+	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
-+	esac
-+	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-+      else
-+	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-+      fi
-+
-+      # Only actually do things if our run command is non-null.
-+      if test -z "$run"; then
-+	# win32 will think the script is a binary if it has
-+	# a .exe suffix, so we strip it off here.
-+	case $output in
-+	  *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
-+	esac
-+	# test for cygwin because mv fails w/o .exe extensions
-+	case $host in
-+	  *cygwin*) exeext=.exe ;;
-+	  *) exeext= ;;
-+	esac
-+	$rm $output
-+	trap "$rm $output; exit 1" 1 2 15
-+
-+	$echo > $output "\
-+#! $SHELL
-+
-+# $output - temporary wrapper script for $objdir/$outputname
-+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+#
-+# The $output program cannot be directly executed until all the libtool
-+# libraries that it depends on are installed.
-+#
-+# This wrapper script should never be moved out of the build directory.
-+# If it is, it will not operate correctly.
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed="${SED}"' -e 1s/^X//'
-+sed_quote_subst='$sed_quote_subst'
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-+
-+relink_command=\"$relink_command\"
-+
-+# This environment variable determines our operation mode.
-+if test \"\$libtool_install_magic\" = \"$magic\"; then
-+  # install mode needs the following variable:
-+  notinst_deplibs='$notinst_deplibs'
-+else
-+  # When we are sourced in execute mode, \$file and \$echo are already set.
-+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+    echo=\"$qecho\"
-+    file=\"\$0\"
-+    # Make sure echo works.
-+    if test \"X\$1\" = X--no-reexec; then
-+      # Discard the --no-reexec flag, and continue.
-+      shift
-+    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-+      # Yippee, \$echo works!
-+      :
-+    else
-+      # Restart under the correct shell, and then maybe \$echo will work.
-+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-+    fi
-+  fi\
-+"
-+	$echo >> $output "\
-+
-+  # Find the directory that this script lives in.
-+  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-+
-+  # Follow symbolic links until we get to the real thisdir.
-+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-+  while test -n \"\$file\"; do
-+    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-+
-+    # If there was a directory component, then change thisdir.
-+    if test \"x\$destdir\" != \"x\$file\"; then
-+      case \"\$destdir\" in
-+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-+      *) thisdir=\"\$thisdir/\$destdir\" ;;
-+      esac
-+    fi
-+
-+    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-+  done
-+
-+  # Try to get the absolute directory name.
-+  absdir=\`cd \"\$thisdir\" && pwd\`
-+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-+"
-+
-+	if test "$fast_install" = yes; then
-+	  echo >> $output "\
-+  program=lt-'$outputname'$exeext
-+  progdir=\"\$thisdir/$objdir\"
-+
-+  if test ! -f \"\$progdir/\$program\" || \\
-+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-+
-+    file=\"\$\$-\$program\"
-+
-+    if test ! -d \"\$progdir\"; then
-+      $mkdir \"\$progdir\"
-+    else
-+      $rm \"\$progdir/\$file\"
-+    fi"
-+
-+	  echo >> $output "\
-+
-+    # relink executable if necessary
-+    if test -n \"\$relink_command\"; then
-+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-+      else
-+	$echo \"\$relink_command_output\" >&2
-+	$rm \"\$progdir/\$file\"
-+	exit 1
-+      fi
-+    fi
-+
-+    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-+    { $rm \"\$progdir/\$program\";
-+      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-+    $rm \"\$progdir/\$file\"
-+  fi"
-+	else
-+	  echo >> $output "\
-+  program='$outputname'
-+  progdir=\"\$thisdir/$objdir\"
-+"
-+	fi
-+
-+	echo >> $output "\
-+
-+  if test -f \"\$progdir/\$program\"; then"
-+
-+	# Export our shlibpath_var if we have one.
-+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-+	  $echo >> $output "\
-+    # Add our own library path to $shlibpath_var
-+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-+
-+    # Some systems cannot cope with colon-terminated $shlibpath_var
-+    # The second colon is a workaround for a bug in BeOS R4 ${SED}
-+    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-+
-+    export $shlibpath_var
-+"
-+	fi
-+
-+	# fixup the dll searchpath if we need to.
-+	if test -n "$dllsearchpath"; then
-+	  $echo >> $output "\
-+    # Add the dll search path components to the executable PATH
-+    PATH=$dllsearchpath:\$PATH
-+"
-+	fi
-+
-+	$echo >> $output "\
-+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+      # Run the actual program with our arguments.
-+"
-+	case $host in
-+	# win32 systems need to use the prog path for dll
-+	# lookup to work
-+	*-*-cygwin* | *-*-pw32*)
-+	  $echo >> $output "\
-+      exec \$progdir/\$program \${1+\"\$@\"}
-+"
-+	  ;;
-+
-+	# Backslashes separate directories on plain windows
-+	*-*-mingw | *-*-os2*)
-+	  $echo >> $output "\
-+      exec \$progdir\\\\\$program \${1+\"\$@\"}
-+"
-+	  ;;
-+
-+	*)
-+	  $echo >> $output "\
-+      # Export the path to the program.
-+      PATH=\"\$progdir:\$PATH\"
-+      export PATH
-+
-+      exec \$program \${1+\"\$@\"}
-+"
-+	  ;;
-+	esac
-+	$echo >> $output "\
-+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-+      exit 1
-+    fi
-+  else
-+    # The program doesn't exist.
-+    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-+    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-+    echo \"See the $PACKAGE documentation for more information.\" 1>&2
-+    exit 1
-+  fi
-+fi\
-+"
-+	chmod +x $output
-+      fi
-+      exit 0
-+      ;;
-+    esac
-+
-+    # See if we need to build an old-fashioned archive.
-+    for oldlib in $oldlibs; do
-+
-+      if test "$build_libtool_libs" = convenience; then
-+	oldobjs="$libobjs_save"
-+	addlibs="$convenience"
-+	build_libtool_libs=no
-+      else
-+	if test "$build_libtool_libs" = module; then
-+	  oldobjs="$libobjs_save"
-+	  build_libtool_libs=no
-+	else
-+	  oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
-+	fi
-+	addlibs="$old_convenience"
-+      fi
-+
-+      if test -n "$addlibs"; then
-+	gentop="$output_objdir/${outputname}x"
-+	$show "${rm}r $gentop"
-+	$run ${rm}r "$gentop"
-+	$show "mkdir $gentop"
-+	$run mkdir "$gentop"
-+	status=$?
-+	if test $status -ne 0 && test ! -d "$gentop"; then
-+	  exit $status
-+	fi
-+	generated="$generated $gentop"
-+
-+	# Add in members from convenience archives.
-+	for xlib in $addlibs; do
-+	  # Extract the objects.
-+	  case $xlib in
-+	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-+	  *) xabs=`pwd`"/$xlib" ;;
-+	  esac
-+	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-+	  xdir="$gentop/$xlib"
-+
-+	  $show "${rm}r $xdir"
-+	  $run ${rm}r "$xdir"
-+	  $show "mkdir $xdir"
-+	  $run mkdir "$xdir"
-+	  status=$?
-+	  if test $status -ne 0 && test ! -d "$xdir"; then
-+	    exit $status
-+	  fi
-+	  $show "(cd $xdir && $AR x $xabs)"
-+	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-+
-+	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-+	done
-+      fi
-+
-+      # Do each command in the archive commands.
-+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-+	eval cmds=\"$old_archive_from_new_cmds\"
-+      else
-+	# Ensure that we have .o objects in place in case we decided
-+	# not to build a shared library, and have fallen back to building
-+	# static libs even though --disable-static was passed!
-+	for oldobj in $oldobjs; do
-+	  if test ! -f $oldobj; then
-+	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
-+	    if test "X$xdir" = "X$oldobj"; then
-+	      xdir="."
-+	    else
-+	      xdir="$xdir"
-+	    fi
-+	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
-+	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-+	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
-+	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
-+	  fi
-+	done
-+
-+	eval cmds=\"$old_archive_cmds\"
-+      fi
-+      save_ifs="$IFS"; IFS='~'
-+      for cmd in $cmds; do
-+	IFS="$save_ifs"
-+	$show "$cmd"
-+	$run eval "$cmd" || exit $?
-+      done
-+      IFS="$save_ifs"
-+    done
-+
-+    if test -n "$generated"; then
-+      $show "${rm}r$generated"
-+      $run ${rm}r$generated
-+    fi
-+
-+    # Now create the libtool archive.
-+    case $output in
-+    *.la)
-+      old_library=
-+      test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      $show "creating $output"
-+
-+      # Preserve any variables that may affect compiler behavior
-+      for var in $variables_saved_for_relink; do
-+	if eval test -z \"\${$var+set}\"; then
-+	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-+	elif eval var_value=\$$var; test -z "$var_value"; then
-+	  relink_command="$var=; export $var; $relink_command"
-+	else
-+	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-+	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+	fi
-+      done
-+      # Quote the link command for shipping.
-+      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
-+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+
-+      # Only create the output if not a dry run.
-+      if test -z "$run"; then
-+	for installed in no yes; do
-+	  if test "$installed" = yes; then
-+	    if test -z "$install_libdir"; then
-+	      break
-+	    fi
-+	    output="$output_objdir/$outputname"i
-+	    # Replace all uninstalled libtool libraries with the installed ones
-+	    newdependency_libs=
-+	    for deplib in $dependency_libs; do
-+	      case $deplib in
-+	      *.la)
-+		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		if test -z "$libdir"; then
-+		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+		  exit 1
-+		fi
-+		newdependency_libs="$newdependency_libs $libdir/$name"
-+		;;
-+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-+	      esac
-+	    done
-+	    dependency_libs="$newdependency_libs"
-+	    newdlfiles=
-+	    for lib in $dlfiles; do
-+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+	      if test -z "$libdir"; then
-+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+		exit 1
-+	      fi
-+	      newdlfiles="$newdlfiles $libdir/$name"
-+	    done
-+	    dlfiles="$newdlfiles"
-+	    newdlprefiles=
-+	    for lib in $dlprefiles; do
-+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+	      if test -z "$libdir"; then
-+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+		exit 1
-+	      fi
-+	      newdlprefiles="$newdlprefiles $libdir/$name"
-+	    done
-+	    dlprefiles="$newdlprefiles"
-+	  fi
-+	  $rm $output
-+	  # place dlname in correct position for cygwin
-+	  tdlname=$dlname
-+	  case $host,$output,$installed,$module,$dlname in
-+	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-+	  esac
-+	  $echo > $output "\
-+# $outputname - a libtool library file
-+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# The name that we can dlopen(3).
-+dlname='$tdlname'
-+
-+# Names of this library.
-+library_names='$library_names'
-+
-+# The name of the static archive.
-+old_library='$old_library'
-+
-+# Libraries that this one depends upon.
-+dependency_libs='$dependency_libs'
-+
-+# Version information for $libname.
-+current=$current
-+age=$age
-+revision=$revision
-+
-+# Is this an already installed library?
-+installed=$installed
-+
-+# Files to dlopen/dlpreopen
-+dlopen='$dlfiles'
-+dlpreopen='$dlprefiles'
-+
-+# Directory that this library needs to be installed in:
-+libdir='$install_libdir'"
-+	  if test "$installed" = no && test $need_relink = yes; then
-+	    $echo >> $output "\
-+relink_command=\"$relink_command\""
-+	  fi
-+	done
-+      fi
-+
-+      # Do a symbolic link so that the libtool archive can be found in
-+      # LD_LIBRARY_PATH before the program is installed.
-+      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-+      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-+      ;;
-+    esac
-+    exit 0
-+    ;;
-+
-+  # libtool install mode
-+  install)
-+    modename="$modename: install"
-+
-+    # There may be an optional sh(1) argument at the beginning of
-+    # install_prog (especially on Windows NT).
-+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-+       # Allow the use of GNU shtool's install command.
-+       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-+      # Aesthetically quote it.
-+      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-+      case $arg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+	arg="\"$arg\""
-+	;;
-+      esac
-+      install_prog="$arg "
-+      arg="$1"
-+      shift
-+    else
-+      install_prog=
-+      arg="$nonopt"
-+    fi
-+
-+    # The real first argument should be the name of the installation program.
-+    # Aesthetically quote it.
-+    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+    case $arg in
-+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      arg="\"$arg\""
-+      ;;
-+    esac
-+    install_prog="$install_prog$arg"
-+
-+    # We need to accept at least all the BSD install flags.
-+    dest=
-+    files=
-+    opts=
-+    prev=
-+    install_type=
-+    isdir=no
-+    stripme=
-+    for arg
-+    do
-+      if test -n "$dest"; then
-+	files="$files $dest"
-+	dest="$arg"
-+	continue
-+      fi
-+
-+      case $arg in
-+      -d) isdir=yes ;;
-+      -f) prev="-f" ;;
-+      -g) prev="-g" ;;
-+      -m) prev="-m" ;;
-+      -o) prev="-o" ;;
-+      -s)
-+	stripme=" -s"
-+	continue
-+	;;
-+      -*) ;;
-+
-+      *)
-+	# If the previous option needed an argument, then skip it.
-+	if test -n "$prev"; then
-+	  prev=
-+	else
-+	  dest="$arg"
-+	  continue
-+	fi
-+	;;
-+      esac
-+
-+      # Aesthetically quote the argument.
-+      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+      case $arg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+	arg="\"$arg\""
-+	;;
-+      esac
-+      install_prog="$install_prog $arg"
-+    done
-+
-+    if test -z "$install_prog"; then
-+      $echo "$modename: you must specify an install program" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    if test -n "$prev"; then
-+      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    if test -z "$files"; then
-+      if test -z "$dest"; then
-+	$echo "$modename: no file or destination specified" 1>&2
-+      else
-+	$echo "$modename: you must specify a destination" 1>&2
-+      fi
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    # Strip any trailing slash from the destination.
-+    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-+
-+    # Check to see that the destination is a directory.
-+    test -d "$dest" && isdir=yes
-+    if test "$isdir" = yes; then
-+      destdir="$dest"
-+      destname=
-+    else
-+      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-+      test "X$destdir" = "X$dest" && destdir=.
-+      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-+
-+      # Not a directory, so check to see that there is only one file specified.
-+      set dummy $files
-+      if test $# -gt 2; then
-+	$echo "$modename: \`$dest' is not a directory" 1>&2
-+	$echo "$help" 1>&2
-+	exit 1
-+      fi
-+    fi
-+    case $destdir in
-+    [\\/]* | [A-Za-z]:[\\/]*) ;;
-+    *)
-+      for file in $files; do
-+	case $file in
-+	*.lo) ;;
-+	*)
-+	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+      done
-+      ;;
-+    esac
-+
-+    # This variable tells wrapper scripts just to set variables rather
-+    # than running their programs.
-+    libtool_install_magic="$magic"
-+
-+    staticlibs=
-+    future_libdirs=
-+    current_libdirs=
-+    for file in $files; do
-+
-+      # Do each installation.
-+      case $file in
-+      *.$libext)
-+	# Do the static libraries later.
-+	staticlibs="$staticlibs $file"
-+	;;
-+
-+      *.la)
-+	# Check to see that this really is a libtool archive.
-+	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	else
-+	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	fi
-+
-+	library_names=
-+	old_library=
-+	relink_command=
-+	# If there is no directory component, then add one.
-+	case $file in
-+	*/* | *\\*) . $file ;;
-+	*) . ./$file ;;
-+	esac
-+
-+	# Add the libdir to current_libdirs if it is the destination.
-+	if test "X$destdir" = "X$libdir"; then
-+	  case "$current_libdirs " in
-+	  *" $libdir "*) ;;
-+	  *) current_libdirs="$current_libdirs $libdir" ;;
-+	  esac
-+	else
-+	  # Note the libdir as a future libdir.
-+	  case "$future_libdirs " in
-+	  *" $libdir "*) ;;
-+	  *) future_libdirs="$future_libdirs $libdir" ;;
-+	  esac
-+	fi
-+
-+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-+	test "X$dir" = "X$file/" && dir=
-+	dir="$dir$objdir"
-+
-+	if test -n "$relink_command"; then
-+          # Determine the prefix the user has applied to our future dir.
-+          inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
-+ 
-+          # Don't allow the user to place us outside of our expected
-+          # location b/c this prevents finding dependent libraries that
-+          # are installed to the same prefix.
-+          if test "$inst_prefix_dir" = "$destdir"; then
-+            $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+            exit 1
-+          fi
-+ 
-+          if test -n "$inst_prefix_dir"; then
-+            # Stick the inst_prefix_dir data into the link command.
-+            relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+          else
-+            relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
-+          fi
-+
-+	  $echo "$modename: warning: relinking \`$file'" 1>&2
-+	  $show "$relink_command"
-+	  if $run eval "$relink_command"; then :
-+	  else
-+	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-+	    exit 1
-+	  fi
-+	fi
-+
-+	# See the names of the shared library.
-+	set dummy $library_names
-+	if test -n "$2"; then
-+	  realname="$2"
-+	  shift
-+	  shift
-+
-+	  srcname="$realname"
-+	  test -n "$relink_command" && srcname="$realname"T
-+
-+	  # Install the shared library and build the symlinks.
-+	  $show "$install_prog $dir/$srcname $destdir/$realname"
-+	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-+	  if test -n "$stripme" && test -n "$striplib"; then
-+	    $show "$striplib $destdir/$realname"
-+	    $run eval "$striplib $destdir/$realname" || exit $?
-+	  fi
-+
-+	  if test $# -gt 0; then
-+	    # Delete the old symlinks, and create new ones.
-+	    for linkname
-+	    do
-+	      if test "$linkname" != "$realname"; then
-+		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+	      fi
-+	    done
-+	  fi
-+
-+	  # Do each command in the postinstall commands.
-+	  lib="$destdir/$realname"
-+	  eval cmds=\"$postinstall_cmds\"
-+	  save_ifs="$IFS"; IFS='~'
-+	  for cmd in $cmds; do
-+	    IFS="$save_ifs"
-+	    $show "$cmd"
-+	    $run eval "$cmd" || exit $?
-+	  done
-+	  IFS="$save_ifs"
-+	fi
-+
-+	# Install the pseudo-library for information purposes.
-+	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	instname="$dir/$name"i
-+	$show "$install_prog $instname $destdir/$name"
-+	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+
-+	# Maybe install the static library, too.
-+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-+	;;
-+
-+      *.lo)
-+	# Install (i.e. copy) a libtool object.
-+
-+	# Figure out destination file name, if it wasn't already specified.
-+	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
-+	else
-+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  destfile="$destdir/$destfile"
-+	fi
-+
-+	# Deduce the name of the destination old-style object file.
-+	case $destfile in
-+	*.lo)
-+	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-+	  ;;
-+	*.$objext)
-+	  staticdest="$destfile"
-+	  destfile=
-+	  ;;
-+	*)
-+	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	# Install the libtool object if requested.
-+	if test -n "$destfile"; then
-+	  $show "$install_prog $file $destfile"
-+	  $run eval "$install_prog $file $destfile" || exit $?
-+	fi
-+
-+	# Install the old object if enabled.
-+	if test "$build_old_libs" = yes; then
-+	  # Deduce the name of the old-style object file.
-+	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-+
-+	  $show "$install_prog $staticobj $staticdest"
-+	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-+	fi
-+	exit 0
-+	;;
-+
-+      *)
-+	# Figure out destination file name, if it wasn't already specified.
-+	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
-+	else
-+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  destfile="$destdir/$destfile"
-+	fi
-+
-+	# Do a test to see if this is really a libtool program.
-+	case $host in
-+	*cygwin*|*mingw*)
-+	    wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
-+	    ;;
-+	*)
-+	    wrapper=$file
-+	    ;;
-+	esac
-+	if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-+	  notinst_deplibs=
-+	  relink_command=
-+
-+	  # If there is no directory component, then add one.
-+	  case $file in
-+	  */* | *\\*) . $wrapper ;;
-+	  *) . ./$wrapper ;;
-+	  esac
-+
-+	  # Check the variables that should have been set.
-+	  if test -z "$notinst_deplibs"; then
-+	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-+	    exit 1
-+	  fi
-+
-+	  finalize=yes
-+	  for lib in $notinst_deplibs; do
-+	    # Check to see that each library is installed.
-+	    libdir=
-+	    if test -f "$lib"; then
-+	      # If there is no directory component, then add one.
-+	      case $lib in
-+	      */* | *\\*) . $lib ;;
-+	      *) . ./$lib ;;
-+	      esac
-+	    fi
-+	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-+	    if test -n "$libdir" && test ! -f "$libfile"; then
-+	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-+	      finalize=no
-+	    fi
-+	  done
-+
-+	  relink_command=
-+	  # If there is no directory component, then add one.
-+	  case $file in
-+	  */* | *\\*) . $wrapper ;;
-+	  *) . ./$wrapper ;;
-+	  esac
-+
-+	  outputname=
-+	  if test "$fast_install" = no && test -n "$relink_command"; then
-+	    if test "$finalize" = yes && test -z "$run"; then
-+	      tmpdir="/tmp"
-+	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-+	      tmpdir="$tmpdir/libtool-$$"
-+	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
-+	      else
-+		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-+		continue
-+	      fi
-+	      file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	      outputname="$tmpdir/$file"
-+	      # Replace the output file specification.
-+	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+
-+	      $show "$relink_command"
-+	      if $run eval "$relink_command"; then :
-+	      else
-+		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-+		${rm}r "$tmpdir"
-+		continue
-+	      fi
-+	      file="$outputname"
-+	    else
-+	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-+	    fi
-+	  else
-+	    # Install the binary that we compiled earlier.
-+	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-+	  fi
-+	fi
-+
-+	# remove .exe since cygwin /usr/bin/install will append another
-+	# one anyways
-+	case $install_prog,$host in
-+	/usr/bin/install*,*cygwin*)
-+	  case $file:$destfile in
-+	  *.exe:*.exe)
-+	    # this is ok
-+	    ;;
-+	  *.exe:*)
-+	    destfile=$destfile.exe
-+	    ;;
-+	  *:*.exe)
-+	    destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
-+	$show "$install_prog$stripme $file $destfile"
-+	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-+	test -n "$outputname" && ${rm}r "$tmpdir"
-+	;;
-+      esac
-+    done
-+
-+    for file in $staticlibs; do
-+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+
-+      # Set up the ranlib parameters.
-+      oldlib="$destdir/$name"
-+
-+      $show "$install_prog $file $oldlib"
-+      $run eval "$install_prog \$file \$oldlib" || exit $?
-+
-+      if test -n "$stripme" && test -n "$striplib"; then
-+	$show "$old_striplib $oldlib"
-+	$run eval "$old_striplib $oldlib" || exit $?
-+      fi
-+
-+      # Do each command in the postinstall commands.
-+      eval cmds=\"$old_postinstall_cmds\"
-+      save_ifs="$IFS"; IFS='~'
-+      for cmd in $cmds; do
-+	IFS="$save_ifs"
-+	$show "$cmd"
-+	$run eval "$cmd" || exit $?
-+      done
-+      IFS="$save_ifs"
-+    done
-+
-+    if test -n "$future_libdirs"; then
-+      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-+    fi
-+
-+    if test -n "$current_libdirs"; then
-+      # Maybe just do a dry run.
-+      test -n "$run" && current_libdirs=" -n$current_libdirs"
-+      exec_cmd='$SHELL $0 --finish$current_libdirs'
-+    else
-+      exit 0
-+    fi
-+    ;;
-+
-+  # libtool finish mode
-+  finish)
-+    modename="$modename: finish"
-+    libdirs="$nonopt"
-+    admincmds=
-+
-+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-+      for dir
-+      do
-+	libdirs="$libdirs $dir"
-+      done
-+
-+      for libdir in $libdirs; do
-+	if test -n "$finish_cmds"; then
-+	  # Do each command in the finish commands.
-+	  eval cmds=\"$finish_cmds\"
-+	  save_ifs="$IFS"; IFS='~'
-+	  for cmd in $cmds; do
-+	    IFS="$save_ifs"
-+	    $show "$cmd"
-+	    $run eval "$cmd" || admincmds="$admincmds
-+       $cmd"
-+	  done
-+	  IFS="$save_ifs"
-+	fi
-+	if test -n "$finish_eval"; then
-+	  # Do the single finish_eval.
-+	  eval cmds=\"$finish_eval\"
-+	  $run eval "$cmds" || admincmds="$admincmds
-+       $cmds"
-+	fi
-+      done
-+    fi
-+
-+    # Exit here if they wanted silent mode.
-+    test "$show" = ":" && exit 0
-+
-+    echo "----------------------------------------------------------------------"
-+    echo "Libraries have been installed in:"
-+    for libdir in $libdirs; do
-+      echo "   $libdir"
-+    done
-+    echo
-+    echo "If you ever happen to want to link against installed libraries"
-+    echo "in a given directory, LIBDIR, you must either use libtool, and"
-+    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+    echo "flag during linking and do at least one of the following:"
-+    if test -n "$shlibpath_var"; then
-+      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-+      echo "     during execution"
-+    fi
-+    if test -n "$runpath_var"; then
-+      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-+      echo "     during linking"
-+    fi
-+    if test -n "$hardcode_libdir_flag_spec"; then
-+      libdir=LIBDIR
-+      eval flag=\"$hardcode_libdir_flag_spec\"
-+
-+      echo "   - use the \`$flag' linker flag"
-+    fi
-+    if test -n "$admincmds"; then
-+      echo "   - have your system administrator run these commands:$admincmds"
-+    fi
-+    if test -f /etc/ld.so.conf; then
-+      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+    fi
-+    echo
-+    echo "See any operating system documentation about shared libraries for"
-+    echo "more information, such as the ld(1) and ld.so(8) manual pages."
-+    echo "----------------------------------------------------------------------"
-+    exit 0
-+    ;;
-+
-+  # libtool execute mode
-+  execute)
-+    modename="$modename: execute"
-+
-+    # The first argument is the command name.
-+    cmd="$nonopt"
-+    if test -z "$cmd"; then
-+      $echo "$modename: you must specify a COMMAND" 1>&2
-+      $echo "$help"
-+      exit 1
-+    fi
-+
-+    # Handle -dlopen flags immediately.
-+    for file in $execute_dlfiles; do
-+      if test ! -f "$file"; then
-+	$echo "$modename: \`$file' is not a file" 1>&2
-+	$echo "$help" 1>&2
-+	exit 1
-+      fi
-+
-+      dir=
-+      case $file in
-+      *.la)
-+	# Check to see that this really is a libtool archive.
-+	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	else
-+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	fi
-+
-+	# Read the libtool library.
-+	dlname=
-+	library_names=
-+
-+	# If there is no directory component, then add one.
-+	case $file in
-+	*/* | *\\*) . $file ;;
-+	*) . ./$file ;;
-+	esac
-+
-+	# Skip this library if it cannot be dlopened.
-+	if test -z "$dlname"; then
-+	  # Warn if it was a shared library.
-+	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-+	  continue
-+	fi
-+
-+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-+	test "X$dir" = "X$file" && dir=.
-+
-+	if test -f "$dir/$objdir/$dlname"; then
-+	  dir="$dir/$objdir"
-+	else
-+	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-+	  exit 1
-+	fi
-+	;;
-+
-+      *.lo)
-+	# Just add the directory containing the .lo file.
-+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-+	test "X$dir" = "X$file" && dir=.
-+	;;
-+
-+      *)
-+	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-+	continue
-+	;;
-+      esac
-+
-+      # Get the absolute pathname.
-+      absdir=`cd "$dir" && pwd`
-+      test -n "$absdir" && dir="$absdir"
-+
-+      # Now add the directory to shlibpath_var.
-+      if eval "test -z \"\$$shlibpath_var\""; then
-+	eval "$shlibpath_var=\"\$dir\""
-+      else
-+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-+      fi
-+    done
-+
-+    # This variable tells wrapper scripts just to set shlibpath_var
-+    # rather than running their programs.
-+    libtool_execute_magic="$magic"
-+
-+    # Check if any of the arguments is a wrapper script.
-+    args=
-+    for file
-+    do
-+      case $file in
-+      -*) ;;
-+      *)
-+	# Do a test to see if this is really a libtool program.
-+	if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	  # If there is no directory component, then add one.
-+	  case $file in
-+	  */* | *\\*) . $file ;;
-+	  *) . ./$file ;;
-+	  esac
-+
-+	  # Transform arg to wrapped name.
-+	  file="$progdir/$program"
-+	fi
-+	;;
-+      esac
-+      # Quote arguments (to preserve shell metacharacters).
-+      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-+      args="$args \"$file\""
-+    done
-+
-+    if test -z "$run"; then
-+      if test -n "$shlibpath_var"; then
-+	# Export the shlibpath_var.
-+	eval "export $shlibpath_var"
-+      fi
-+
-+      # Restore saved enviroment variables
-+      if test "${save_LC_ALL+set}" = set; then
-+	LC_ALL="$save_LC_ALL"; export LC_ALL
-+      fi
-+      if test "${save_LANG+set}" = set; then
-+	LANG="$save_LANG"; export LANG
-+      fi
-+
-+      # Now prepare to actually exec the command.
-+      exec_cmd="\$cmd$args"
-+    else
-+      # Display what would be done.
-+      if test -n "$shlibpath_var"; then
-+	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-+	$echo "export $shlibpath_var"
-+      fi
-+      $echo "$cmd$args"
-+      exit 0
-+    fi
-+    ;;
-+
-+  # libtool clean and uninstall mode
-+  clean | uninstall)
-+    modename="$modename: $mode"
-+    rm="$nonopt"
-+    files=
-+    rmforce=
-+    exit_status=0
-+
-+    # This variable tells wrapper scripts just to set variables rather
-+    # than running their programs.
-+    libtool_install_magic="$magic"
-+
-+    for arg
-+    do
-+      case $arg in
-+      -f) rm="$rm $arg"; rmforce=yes ;;
-+      -*) rm="$rm $arg" ;;
-+      *) files="$files $arg" ;;
-+      esac
-+    done
-+
-+    if test -z "$rm"; then
-+      $echo "$modename: you must specify an RM program" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    rmdirs=
-+
-+    for file in $files; do
-+      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-+      if test "X$dir" = "X$file"; then
-+	dir=.
-+	objdir="$objdir"
-+      else
-+	objdir="$dir/$objdir"
-+      fi
-+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+      test $mode = uninstall && objdir="$dir"
-+
-+      # Remember objdir for removal later, being careful to avoid duplicates
-+      if test $mode = clean; then
-+	case " $rmdirs " in
-+	  *" $objdir "*) ;;
-+	  *) rmdirs="$rmdirs $objdir" ;;
-+	esac
-+      fi
-+
-+      # Don't error if the file doesn't exist and rm -f was used.
-+      if (test -L "$file") >/dev/null 2>&1 \
-+	|| (test -h "$file") >/dev/null 2>&1 \
-+	|| test -f "$file"; then
-+	:
-+      elif test -d "$file"; then
-+	exit_status=1
-+	continue
-+      elif test "$rmforce" = yes; then
-+	continue
-+      fi
-+
-+      rmfiles="$file"
-+
-+      case $name in
-+      *.la)
-+	# Possibly a libtool archive, so verify it.
-+	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	  . $dir/$name
-+
-+	  # Delete the libtool libraries and symlinks.
-+	  for n in $library_names; do
-+	    rmfiles="$rmfiles $objdir/$n"
-+	  done
-+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-+	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+
-+	  if test $mode = uninstall; then
-+	    if test -n "$library_names"; then
-+	      # Do each command in the postuninstall commands.
-+	      eval cmds=\"$postuninstall_cmds\"
-+	      save_ifs="$IFS"; IFS='~'
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd"
-+		if test $? != 0 && test "$rmforce" != yes; then
-+		  exit_status=1
-+		fi
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+
-+	    if test -n "$old_library"; then
-+	      # Do each command in the old_postuninstall commands.
-+	      eval cmds=\"$old_postuninstall_cmds\"
-+	      save_ifs="$IFS"; IFS='~'
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd"
-+		if test $? != 0 && test "$rmforce" != yes; then
-+		  exit_status=1
-+		fi
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+	    # FIXME: should reinstall the best remaining shared library.
-+	  fi
-+	fi
-+	;;
-+
-+      *.lo)
-+	if test "$build_old_libs" = yes; then
-+	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
-+	  rmfiles="$rmfiles $dir/$oldobj"
-+	fi
-+	;;
-+
-+      *)
-+	# Do a test to see if this is a libtool program.
-+	if test $mode = clean &&
-+	   (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	  relink_command=
-+	  . $dir/$file
-+
-+	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-+	  if test "$fast_install" = yes && test -n "$relink_command"; then
-+	    rmfiles="$rmfiles $objdir/lt-$name"
-+	  fi
-+	fi
-+	;;
-+      esac
-+      $show "$rm $rmfiles"
-+      $run $rm $rmfiles || exit_status=1
-+    done
-+
-+    # Try to remove the ${objdir}s in the directories where we deleted files
-+    for dir in $rmdirs; do
-+      if test -d "$dir"; then
-+	$show "rmdir $dir"
-+	$run rmdir $dir >/dev/null 2>&1
-+      fi
-+    done
-+
-+    exit $exit_status
-+    ;;
-+
-+  "")
-+    $echo "$modename: you must specify a MODE" 1>&2
-+    $echo "$generic_help" 1>&2
-+    exit 1
-+    ;;
-+  esac
-+
-+  if test -z "$exec_cmd"; then
-+    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-+    $echo "$generic_help" 1>&2
-+    exit 1
-+  fi
-+fi # test -z "$show_help"
-+
-+if test -n "$exec_cmd"; then
-+  eval exec $exec_cmd
-+  exit 1
-+fi
-+
-+# We need to display help for each of the modes.
-+case $mode in
-+"") $echo \
-+"Usage: $modename [OPTION]... [MODE-ARG]...
-+
-+Provide generalized library-building support services.
-+
-+    --config          show all configuration variables
-+    --debug           enable verbose shell tracing
-+-n, --dry-run         display commands without modifying any files
-+    --features        display basic configuration information and exit
-+    --finish          same as \`--mode=finish'
-+    --help            display this help message and exit
-+    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-+    --quiet           same as \`--silent'
-+    --silent          don't print informational messages
-+    --version         print version information
-+
-+MODE must be one of the following:
-+
-+      clean           remove files from the build directory
-+      compile         compile a source file into a libtool object
-+      execute         automatically set library path, then run a program
-+      finish          complete the installation of libtool libraries
-+      install         install libraries or executables
-+      link            create a library or an executable
-+      uninstall       remove libraries from an installed directory
-+
-+MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-+a more detailed description of MODE."
-+  exit 0
-+  ;;
-+
-+clean)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-+
-+Remove files from the build directory.
-+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, object or program, all the files associated
-+with it are deleted. Otherwise, only FILE itself is deleted using RM."
-+  ;;
-+
-+compile)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-+
-+Compile a source file into a libtool library object.
-+
-+This mode accepts the following additional options:
-+
-+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-+  -prefer-pic       try to building PIC objects only
-+  -prefer-non-pic   try to building non-PIC objects only
-+  -static           always build a \`.o' file suitable for static linking
-+
-+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-+from the given SOURCEFILE.
-+
-+The output file name is determined by removing the directory component from
-+SOURCEFILE, then substituting the C source code suffix \`.c' with the
-+library object suffix, \`.lo'."
-+  ;;
-+
-+execute)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-+
-+Automatically set library path, then run a program.
-+
-+This mode accepts the following additional options:
-+
-+  -dlopen FILE      add the directory containing FILE to the library path
-+
-+This mode sets the library path environment variable according to \`-dlopen'
-+flags.
-+
-+If any of the ARGS are libtool executable wrappers, then they are translated
-+into their corresponding uninstalled binary, and any of their required library
-+directories are added to the library path.
-+
-+Then, COMMAND is executed, with ARGS as arguments."
-+  ;;
-+
-+finish)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-+
-+Complete the installation of libtool libraries.
-+
-+Each LIBDIR is a directory that contains libtool libraries.
-+
-+The commands that this mode executes may require superuser privileges.  Use
-+the \`--dry-run' option if you just want to see what would be executed."
-+  ;;
-+
-+install)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-+
-+Install executables or libraries.
-+
-+INSTALL-COMMAND is the installation command.  The first component should be
-+either the \`install' or \`cp' program.
-+
-+The rest of the components are interpreted as arguments to that command (only
-+BSD-compatible install options are recognized)."
-+  ;;
-+
-+link)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-+
-+Link object files or libraries together to form another library, or to
-+create an executable program.
-+
-+LINK-COMMAND is a command using the C compiler that you would use to create
-+a program from several object files.
-+
-+The following components of LINK-COMMAND are treated specially:
-+
-+  -all-static       do not do any dynamic linking at all
-+  -avoid-version    do not add a version suffix if possible
-+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-+  -export-symbols SYMFILE
-+		    try to export only the symbols listed in SYMFILE
-+  -export-symbols-regex REGEX
-+		    try to export only the symbols matching REGEX
-+  -LLIBDIR          search LIBDIR for required installed libraries
-+  -lNAME            OUTPUT-FILE requires the installed library libNAME
-+  -module           build a library that can dlopened
-+  -no-fast-install  disable the fast-install mode
-+  -no-install       link a not-installable executable
-+  -no-undefined     declare that a library does not refer to external symbols
-+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-+  -release RELEASE  specify package release information
-+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-+  -static           do not do any dynamic linking of libtool libraries
-+  -version-info CURRENT[:REVISION[:AGE]]
-+		    specify library version info [each variable defaults to 0]
-+
-+All other options (arguments beginning with \`-') are ignored.
-+
-+Every other argument is treated as a filename.  Files ending in \`.la' are
-+treated as uninstalled libtool libraries, other files are standard or library
-+object files.
-+
-+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-+only library objects (\`.lo' files) may be specified, and \`-rpath' is
-+required, except when creating a convenience library.
-+
-+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-+using \`ar' and \`ranlib', or on Windows using \`lib'.
-+
-+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-+is created, otherwise an executable program is created."
-+  ;;
-+
-+uninstall)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-+
-+Remove libraries from an installation directory.
-+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, all the files associated with it are deleted.
-+Otherwise, only FILE itself is deleted using RM."
-+  ;;
-+
-+*)
-+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-+  $echo "$help" 1>&2
-+  exit 1
-+  ;;
-+esac
-+
-+echo
-+$echo "Try \`$modename --help' for more information about other modes."
-+
-+exit 0
-+
-+# Local Variables:
-+# mode:shell-script
-+# sh-indentation:2
-+# End:
---- metamail-2.7.orig/config/install-sh
-+++ metamail-2.7/config/install-sh
-@@ -0,0 +1,251 @@
-+#!/bin/sh
-+#
-+# install - install a program, script, or datafile
-+# This comes from X11R5 (mit/util/scripts/install.sh).
-+#
-+# Copyright 1991 by the Massachusetts Institute of Technology
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of M.I.T. not be used in advertising or
-+# publicity pertaining to distribution of the software without specific,
-+# written prior permission.  M.I.T. makes no representations about the
-+# suitability of this software for any purpose.  It is provided "as is"
-+# without express or implied warranty.
-+#
-+# Calling this script install-sh is preferred over install.sh, to prevent
-+# `make' implicit rules from creating a file called install from it
-+# when there is no Makefile.
-+#
-+# This script is compatible with the BSD install script, but was written
-+# from scratch.  It can only install one file at a time, a restriction
-+# shared with many OS's install programs.
-+
-+
-+# set DOITPROG to echo to test this script
-+
-+# Don't use :- since 4.3BSD and earlier shells don't like it.
-+doit="${DOITPROG-}"
-+
-+
-+# put in absolute paths if you don't have them in your path; or use env. vars.
-+
-+mvprog="${MVPROG-mv}"
-+cpprog="${CPPROG-cp}"
-+chmodprog="${CHMODPROG-chmod}"
-+chownprog="${CHOWNPROG-chown}"
-+chgrpprog="${CHGRPPROG-chgrp}"
-+stripprog="${STRIPPROG-strip}"
-+rmprog="${RMPROG-rm}"
-+mkdirprog="${MKDIRPROG-mkdir}"
-+
-+transformbasename=""
-+transform_arg=""
-+instcmd="$mvprog"
-+chmodcmd="$chmodprog 0755"
-+chowncmd=""
-+chgrpcmd=""
-+stripcmd=""
-+rmcmd="$rmprog -f"
-+mvcmd="$mvprog"
-+src=""
-+dst=""
-+dir_arg=""
-+
-+while [ x"$1" != x ]; do
-+    case $1 in
-+	-c) instcmd="$cpprog"
-+	    shift
-+	    continue;;
-+
-+	-d) dir_arg=true
-+	    shift
-+	    continue;;
-+
-+	-m) chmodcmd="$chmodprog $2"
-+	    shift
-+	    shift
-+	    continue;;
-+
-+	-o) chowncmd="$chownprog $2"
-+	    shift
-+	    shift
-+	    continue;;
-+
-+	-g) chgrpcmd="$chgrpprog $2"
-+	    shift
-+	    shift
-+	    continue;;
-+
-+	-s) stripcmd="$stripprog"
-+	    shift
-+	    continue;;
-+
-+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-+	    shift
-+	    continue;;
-+
-+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-+	    shift
-+	    continue;;
-+
-+	*)  if [ x"$src" = x ]
-+	    then
-+		src=$1
-+	    else
-+		# this colon is to work around a 386BSD /bin/sh bug
-+		:
-+		dst=$1
-+	    fi
-+	    shift
-+	    continue;;
-+    esac
-+done
-+
-+if [ x"$src" = x ]
-+then
-+	echo "install:	no input file specified"
-+	exit 1
-+else
-+	true
-+fi
-+
-+if [ x"$dir_arg" != x ]; then
-+	dst=$src
-+	src=""
-+	
-+	if [ -d $dst ]; then
-+		instcmd=:
-+		chmodcmd=""
-+	else
-+		instcmd=mkdir
-+	fi
-+else
-+
-+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-+# might cause directories to be created, which would be especially bad 
-+# if $src (and thus $dsttmp) contains '*'.
-+
-+	if [ -f $src -o -d $src ]
-+	then
-+		true
-+	else
-+		echo "install:  $src does not exist"
-+		exit 1
-+	fi
-+	
-+	if [ x"$dst" = x ]
-+	then
-+		echo "install:	no destination specified"
-+		exit 1
-+	else
-+		true
-+	fi
-+
-+# If destination is a directory, append the input filename; if your system
-+# does not like double slashes in filenames, you may need to add some logic
-+
-+	if [ -d $dst ]
-+	then
-+		dst="$dst"/`basename $src`
-+	else
-+		true
-+	fi
-+fi
-+
-+## this sed command emulates the dirname command
-+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+
-+# Make sure that the destination directory exists.
-+#  this part is taken from Noah Friedman's mkinstalldirs script
-+
-+# Skip lots of stat calls in the usual case.
-+if [ ! -d "$dstdir" ]; then
-+defaultIFS='	
-+'
-+IFS="${IFS-${defaultIFS}}"
-+
-+oIFS="${IFS}"
-+# Some sh's can't handle IFS=/ for some reason.
-+IFS='%'
-+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-+IFS="${oIFS}"
-+
-+pathcomp=''
-+
-+while [ $# -ne 0 ] ; do
-+	pathcomp="${pathcomp}${1}"
-+	shift
-+
-+	if [ ! -d "${pathcomp}" ] ;
-+        then
-+		$mkdirprog "${pathcomp}"
-+	else
-+		true
-+	fi
-+
-+	pathcomp="${pathcomp}/"
-+done
-+fi
-+
-+if [ x"$dir_arg" != x ]
-+then
-+	$doit $instcmd $dst &&
-+
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-+else
-+
-+# If we're going to rename the final executable, determine the name now.
-+
-+	if [ x"$transformarg" = x ] 
-+	then
-+		dstfile=`basename $dst`
-+	else
-+		dstfile=`basename $dst $transformbasename | 
-+			sed $transformarg`$transformbasename
-+	fi
-+
-+# don't allow the sed command to completely eliminate the filename
-+
-+	if [ x"$dstfile" = x ] 
-+	then
-+		dstfile=`basename $dst`
-+	else
-+		true
-+	fi
-+
-+# Make a temp file name in the proper directory.
-+
-+	dsttmp=$dstdir/#inst.$$#
-+
-+# Move or copy the file name to the temp name
-+
-+	$doit $instcmd $src $dsttmp &&
-+
-+	trap "rm -f ${dsttmp}" 0 &&
-+
-+# and set any options; do chmod last to preserve setuid bits
-+
-+# If any of these fail, we abort the whole thing.  If we want to
-+# ignore errors from any of these, just make sure not to ignore
-+# errors from the above "$doit $instcmd $src $dsttmp" command.
-+
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-+
-+# Now rename the file to the real destination.
-+
-+	$doit $rmcmd -f $dstdir/$dstfile &&
-+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-+
-+fi &&
-+
-+
-+exit 0
---- metamail-2.7.orig/config/missing
-+++ metamail-2.7/config/missing
-@@ -0,0 +1,190 @@
-+#! /bin/sh
-+# Common stub for a few missing GNU programs while installing.
-+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-+# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+if test $# -eq 0; then
-+  echo 1>&2 "Try \`$0 --help' for more information"
-+  exit 1
-+fi
-+
-+case "$1" in
-+
-+  -h|--h|--he|--hel|--help)
-+    echo "\
-+$0 [OPTION]... PROGRAM [ARGUMENT]...
-+
-+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-+error status if there is no known handling for PROGRAM.
-+
-+Options:
-+  -h, --help      display this help and exit
-+  -v, --version   output version information and exit
-+
-+Supported PROGRAM values:
-+  aclocal      touch file \`aclocal.m4'
-+  autoconf     touch file \`configure'
-+  autoheader   touch file \`config.h.in'
-+  automake     touch all \`Makefile.in' files
-+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-+  flex         create \`lex.yy.c', if possible, from existing .c
-+  lex          create \`lex.yy.c', if possible, from existing .c
-+  makeinfo     touch the output file
-+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-+    ;;
-+
-+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-+    echo "missing - GNU libit 0.0"
-+    ;;
-+
-+  -*)
-+    echo 1>&2 "$0: Unknown \`$1' option"
-+    echo 1>&2 "Try \`$0 --help' for more information"
-+    exit 1
-+    ;;
-+
-+  aclocal)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified \`acinclude.m4' or \`configure.in'.  You might want
-+         to install the \`Automake' and \`Perl' packages.  Grab them from
-+         any GNU archive site."
-+    touch aclocal.m4
-+    ;;
-+
-+  autoconf)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified \`configure.in'.  You might want to install the
-+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-+         archive site."
-+    touch configure
-+    ;;
-+
-+  autoheader)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified \`acconfig.h' or \`configure.in'.  You might want
-+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-+         from any GNU archive site."
-+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
-+    test -z "$files" && files="config.h"
-+    touch_files=
-+    for f in $files; do
-+      case "$f" in
-+      *:*) touch_files="$touch_files "`echo "$f" |
-+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-+      *) touch_files="$touch_files $f.in";;
-+      esac
-+    done
-+    touch $touch_files
-+    ;;
-+
-+  automake)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-+         You might want to install the \`Automake' and \`Perl' packages.
-+         Grab them from any GNU archive site."
-+    find . -type f -name Makefile.am -print |
-+	   sed 's/\.am$/.in/' |
-+	   while read f; do touch "$f"; done
-+    ;;
-+
-+  bison|yacc)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified a \`.y' file.  You may need the \`Bison' package
-+         in order for those modifications to take effect.  You can get
-+         \`Bison' from any GNU archive site."
-+    rm -f y.tab.c y.tab.h
-+    if [ $# -ne 1 ]; then
-+        eval LASTARG="\${$#}"
-+	case "$LASTARG" in
-+	*.y)
-+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-+	    if [ -f "$SRCFILE" ]; then
-+	         cp "$SRCFILE" y.tab.c
-+	    fi
-+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-+	    if [ -f "$SRCFILE" ]; then
-+	         cp "$SRCFILE" y.tab.h
-+	    fi
-+	  ;;
-+	esac
-+    fi
-+    if [ ! -f y.tab.h ]; then
-+	echo >y.tab.h
-+    fi
-+    if [ ! -f y.tab.c ]; then
-+	echo 'main() { return 0; }' >y.tab.c
-+    fi
-+    ;;
-+
-+  lex|flex)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified a \`.l' file.  You may need the \`Flex' package
-+         in order for those modifications to take effect.  You can get
-+         \`Flex' from any GNU archive site."
-+    rm -f lex.yy.c
-+    if [ $# -ne 1 ]; then
-+        eval LASTARG="\${$#}"
-+	case "$LASTARG" in
-+	*.l)
-+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-+	    if [ -f "$SRCFILE" ]; then
-+	         cp "$SRCFILE" lex.yy.c
-+	    fi
-+	  ;;
-+	esac
-+    fi
-+    if [ ! -f lex.yy.c ]; then
-+	echo 'main() { return 0; }' >lex.yy.c
-+    fi
-+    ;;
-+
-+  makeinfo)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified a \`.texi' or \`.texinfo' file, or any other file
-+         indirectly affecting the aspect of the manual.  The spurious
-+         call might also be the consequence of using a buggy \`make' (AIX,
-+         DU, IRIX).  You might want to install the \`Texinfo' package or
-+         the \`GNU make' package.  Grab either from any GNU archive site."
-+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    if test -z "$file"; then
-+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-+    fi
-+    touch $file
-+    ;;
-+
-+  *)
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, and you do not seem to have it handy on your
-+         system.  You might have modified some files without having the
-+         proper tools for further handling them.  Check the \`README' file,
-+         it often tells you about the needed prerequirements for installing
-+         this package.  You may also peek at any GNU archive site, in case
-+         some other package would contain this missing \`$1' program."
-+    exit 1
-+    ;;
-+esac
-+
-+exit 0
---- metamail-2.7.orig/config/ltconfig
-+++ metamail-2.7/config/ltconfig
-@@ -0,0 +1,3115 @@
-+#! /bin/sh
-+
-+# ltconfig - Create a system-specific libtool.
-+# Copyright (C) 1996-1999 Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# A lot of this script is taken from autoconf-2.10.
-+
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+echo=echo
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec "$SHELL" "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit 0
-+fi
-+
-+# Find the correct PATH separator.  Usually this is `:', but
-+# DJGPP uses `;' like DOS.
-+if test "X${PATH_SEPARATOR+set}" != Xset; then
-+  UNAME=${UNAME-`uname 2>/dev/null`}
-+  case X$UNAME in
-+    *-DOS) PATH_SEPARATOR=';' ;;
-+    *)     PATH_SEPARATOR=':' ;;
-+  esac
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+if test "X${echo_test_string+set}" != Xset; then
-+  # find a string as large as possible, as long as the shell can cope with it
-+  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+       echo_test_string="`eval $cmd`" &&
-+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
-+      break
-+    fi
-+  done
-+fi
-+
-+if test "X`($echo '\t') 2>/dev/null`" != 'X\t' ||
-+   test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then
-+  # The Solaris, AIX, and Digital Unix default echo programs unquote
-+  # backslashes.  This makes it impossible to quote backslashes using
-+  #   echo "$something" | sed 's/\\/\\\\/g'
-+  #
-+  # So, first we look for a working echo in the user's PATH.
-+
-+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+  for dir in $PATH /usr/ucb; do
-+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+       test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-+      echo="$dir/echo"
-+      break
-+    fi
-+  done
-+  IFS="$save_ifs"
-+
-+  if test "X$echo" = Xecho; then
-+    # We didn't find a better echo, so look for alternatives.
-+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+       test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-+      # This shell has a builtin print -r that does the trick.
-+      echo='print -r'
-+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-+      # If we have ksh, try running ltconfig again with it.
-+      ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
-+      export ORIGINAL_CONFIG_SHELL
-+      CONFIG_SHELL=/bin/ksh
-+      export CONFIG_SHELL
-+      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
-+    else
-+      # Try using printf.
-+      echo='printf "%s\n"'
-+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+	 test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-+	# Cool, printf works
-+	:
-+      elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
-+	   test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-+	CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL"
-+	export CONFIG_SHELL
-+	SHELL="$CONFIG_SHELL"
-+	export SHELL
-+	echo="$CONFIG_SHELL $0 --fallback-echo"
-+      elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
-+	   test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-+	echo="$CONFIG_SHELL $0 --fallback-echo"
-+      else
-+	# maybe with a smaller string...
-+	prev=:
-+
-+	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then
-+	    break
-+	  fi
-+	  prev="$cmd"
-+	done
-+
-+	if test "$prev" != 'sed 50q "$0"'; then
-+	  echo_test_string=`eval $prev`
-+	  export echo_test_string
-+	  exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"}
-+	else
-+	  # Oops.  We lost completely, so just stick with echo.
-+	  echo=echo
-+	fi
-+      fi
-+    fi
-+  fi
-+fi
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
-+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# The name of this program.
-+progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
-+
-+# Constants:
-+PROGRAM=ltconfig
-+PACKAGE=libtool
-+VERSION=1.3.5
-+TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+rm="rm -f"
-+
-+help="Try \`$progname --help' for more information."
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+enable_shared=yes
-+# All known linkers require a `.a' archive for static linking (except M$VC,
-+# which needs '.lib').
-+enable_static=yes
-+enable_fast_install=yes
-+enable_dlopen=unknown
-+enable_win32_dll=no
-+ltmain=
-+silent=
-+srcdir=
-+ac_config_guess=
-+ac_config_sub=
-+host=
-+nonopt=
-+ofile="$default_ofile"
-+verify_host=yes
-+with_gcc=no
-+with_gnu_ld=no
-+need_locks=yes
-+ac_ext=c
-+objext=o
-+libext=a
-+exeext=
-+cache_file=
-+
-+old_AR="$AR"
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+old_CPPFLAGS="$CPPFLAGS"
-+old_LDFLAGS="$LDFLAGS"
-+old_LD="$LD"
-+old_LN_S="$LN_S"
-+old_LIBS="$LIBS"
-+old_NM="$NM"
-+old_RANLIB="$RANLIB"
-+old_DLLTOOL="$DLLTOOL"
-+old_OBJDUMP="$OBJDUMP"
-+old_AS="$AS"
-+
-+# Parse the command line options.
-+args=
-+prev=
-+for option
-+do
-+  case "$option" in
-+  -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) optarg= ;;
-+  esac
-+
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$prev"; then
-+    eval "$prev=\$option"
-+    prev=
-+    continue
-+  fi
-+
-+  case "$option" in
-+  --help) cat <<EOM
-+Usage: $progname [OPTION]... [HOST [LTMAIN]]
-+
-+Generate a system-specific libtool script.
-+
-+    --debug                enable verbose shell tracing
-+    --disable-shared       do not build shared libraries
-+    --disable-static       do not build static libraries
-+    --disable-fast-install do not optimize for fast installation
-+    --enable-dlopen        enable dlopen support
-+    --enable-win32-dll     enable building dlls on win32 hosts
-+    --help                 display this help and exit
-+    --no-verify            do not verify that HOST is a valid host type
-+-o, --output=FILE          specify the output file [default=$default_ofile]
-+    --quiet                same as \`--silent'
-+    --silent               do not print informational messages
-+    --srcdir=DIR           find \`config.guess' in DIR
-+    --version              output version information and exit
-+    --with-gcc             assume that the GNU C compiler will be used
-+    --with-gnu-ld          assume that the C compiler uses the GNU linker
-+    --disable-lock         disable file locking
-+    --cache-file=FILE      configure cache file
-+
-+LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
-+that provides basic libtool functionality.
-+
-+HOST is the canonical host system name [default=guessed].
-+EOM
-+  exit 0
-+  ;;
-+
-+  --debug)
-+    echo "$progname: enabling shell trace mode"
-+    set -x
-+    ;;
-+
-+  --disable-shared) enable_shared=no ;;
-+
-+  --disable-static) enable_static=no ;;
-+
-+  --disable-fast-install) enable_fast_install=no ;;
-+
-+  --enable-dlopen) enable_dlopen=yes ;;
-+
-+  --enable-win32-dll) enable_win32_dll=yes ;;
-+
-+  --quiet | --silent) silent=yes ;;
-+
-+  --srcdir) prev=srcdir ;;
-+  --srcdir=*) srcdir="$optarg" ;;
-+
-+  --no-verify) verify_host=no ;;
-+
-+  --output | -o) prev=ofile ;;
-+  --output=*) ofile="$optarg" ;;
-+
-+  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"; exit 0 ;;
-+
-+  --with-gcc) with_gcc=yes ;;
-+  --with-gnu-ld) with_gnu_ld=yes ;;
-+
-+  --disable-lock) need_locks=no ;;
-+
-+  --cache-file=*) cache_file="$optarg" ;;
-+
-+  -*)
-+    echo "$progname: unrecognized option \`$option'" 1>&2
-+    echo "$help" 1>&2
-+    exit 1
-+    ;;
-+
-+  *)
-+    if test -z "$ltmain"; then
-+      ltmain="$option"
-+    elif test -z "$host"; then
-+# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
-+#      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
-+#        echo "$progname: warning \`$option' is not a valid host type" 1>&2
-+#      fi
-+      host="$option"
-+    else
-+      echo "$progname: too many arguments" 1>&2
-+      echo "$help" 1>&2
-+      exit 1
-+    fi ;;
-+  esac
-+done
-+
-+if test -z "$ltmain"; then
-+  echo "$progname: you must specify a LTMAIN file" 1>&2
-+  echo "$help" 1>&2
-+  exit 1
-+fi
-+
-+if test ! -f "$ltmain"; then
-+  echo "$progname: \`$ltmain' does not exist" 1>&2
-+  echo "$help" 1>&2
-+  exit 1
-+fi
-+
-+# Quote any args containing shell metacharacters.
-+ltconfig_args=
-+for arg
-+do
-+  case "$arg" in
-+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-+  ltconfig_args="$ltconfig_args '$arg'" ;;
-+  *) ltconfig_args="$ltconfig_args $arg" ;;
-+  esac
-+done
-+
-+# A relevant subset of AC_INIT.
-+
-+# File descriptor usage:
-+# 0 standard input
-+# 1 file creation
-+# 2 errors and warnings
-+# 3 some systems may open it to /dev/tty
-+# 4 used on the Kubota Titan
-+# 5 compiler messages saved in config.log
-+# 6 checking for... messages and results
-+if test "$silent" = yes; then
-+  exec 6>/dev/null
-+else
-+  exec 6>&1
-+fi
-+exec 5>>./config.log
-+
-+# NLS nuisances.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
-+if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi
-+if test "X${LANG+set}"   = Xset; then LANG=C;   export LANG;   fi
-+
-+if test -n "$cache_file" && test -r "$cache_file"; then
-+  echo "loading cache $cache_file within ltconfig"
-+  . $cache_file
-+fi
-+
-+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-+    ac_n= ac_c='
-+' ac_t='	'
-+  else
-+    ac_n=-n ac_c= ac_t=
-+  fi
-+else
-+  ac_n= ac_c='\c' ac_t=
-+fi
-+
-+if test -z "$srcdir"; then
-+  # Assume the source directory is the same one as the path to LTMAIN.
-+  srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'`
-+  test "$srcdir" = "$ltmain" && srcdir=.
-+fi
-+
-+trap "$rm conftest*; exit 1" 1 2 15
-+if test "$verify_host" = yes; then
-+  # Check for config.guess and config.sub.
-+  ac_aux_dir=
-+  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-+    if test -f $ac_dir/config.guess; then
-+      ac_aux_dir=$ac_dir
-+      break
-+    fi
-+  done
-+  if test -z "$ac_aux_dir"; then
-+    echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
-+    echo "$help" 1>&2
-+    exit 1
-+  fi
-+  ac_config_guess=$ac_aux_dir/config.guess
-+  ac_config_sub=$ac_aux_dir/config.sub
-+
-+  # Make sure we can run config.sub.
-+  if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
-+  else
-+    echo "$progname: cannot run $ac_config_sub" 1>&2
-+    echo "$help" 1>&2
-+    exit 1
-+  fi
-+
-+  echo $ac_n "checking host system type""... $ac_c" 1>&6
-+
-+  host_alias=$host
-+  case "$host_alias" in
-+  "")
-+    if host_alias=`$SHELL $ac_config_guess`; then :
-+    else
-+      echo "$progname: cannot guess host type; you must specify one" 1>&2
-+      echo "$help" 1>&2
-+      exit 1
-+    fi ;;
-+  esac
-+  host=`$SHELL $ac_config_sub $host_alias`
-+  echo "$ac_t$host" 1>&6
-+
-+  # Make sure the host verified.
-+  test -z "$host" && exit 1
-+
-+elif test -z "$host"; then
-+  echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
-+  echo "$help" 1>&2
-+  exit 1
-+else
-+  host_alias=$host
-+fi
-+
-+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-+case "$host_os" in
-+linux-gnu*) ;;
-+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-+esac
-+
-+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+
-+case "$host_os" in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR cru $oldlib$oldobjs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+# Set a sane default for `AR'.
-+test -z "$AR" && AR=ar
-+
-+# Set a sane default for `OBJDUMP'.
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+
-+# If RANLIB is not set, then run the test.
-+if test "${RANLIB+set}" != "set"; then
-+  result=no
-+
-+  echo $ac_n "checking for ranlib... $ac_c" 1>&6
-+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+  for dir in $PATH; do
-+    test -z "$dir" && dir=.
-+    if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then
-+      RANLIB="ranlib"
-+      result="ranlib"
-+      break
-+    fi
-+  done
-+  IFS="$save_ifs"
-+
-+  echo "$ac_t$result" 1>&6
-+fi
-+
-+if test -n "$RANLIB"; then
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+fi
-+
-+# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$AS" && AS=as
-+
-+# Check to see if we are using GCC.
-+if test "$with_gcc" != yes || test -z "$CC"; then
-+  # If CC is not set, then try to find GCC or a usable CC.
-+  if test -z "$CC"; then
-+    echo $ac_n "checking for gcc... $ac_c" 1>&6
-+    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+    for dir in $PATH; do
-+      test -z "$dir" && dir=.
-+      if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then
-+	CC="gcc"
-+	break
-+      fi
-+    done
-+    IFS="$save_ifs"
-+
-+    if test -n "$CC"; then
-+      echo "$ac_t$CC" 1>&6
-+    else
-+      echo "$ac_t"no 1>&6
-+    fi
-+  fi
-+
-+  # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
-+  if test -z "$CC"; then
-+    echo $ac_n "checking for cc... $ac_c" 1>&6
-+    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+    cc_rejected=no
-+    for dir in $PATH; do
-+      test -z "$dir" && dir=.
-+      if test -f $dir/cc || test -f $dir/cc$ac_exeext; then
-+	if test "$dir/cc" = "/usr/ucb/cc"; then
-+	  cc_rejected=yes
-+	  continue
-+	fi
-+	CC="cc"
-+	break
-+      fi
-+    done
-+    IFS="$save_ifs"
-+    if test $cc_rejected = yes; then
-+      # We found a bogon in the path, so make sure we never use it.
-+      set dummy $CC
-+      shift
-+      if test $# -gt 0; then
-+	# We chose a different compiler from the bogus one.
-+	# However, it has the same name, so the bogon will be chosen
-+	# first if we set CC to just the name; use the full file name.
-+	shift
-+	set dummy "$dir/cc" "$@"
-+	shift
-+	CC="$@"
-+      fi
-+    fi
-+
-+    if test -n "$CC"; then
-+      echo "$ac_t$CC" 1>&6
-+    else
-+      echo "$ac_t"no 1>&6
-+    fi
-+
-+    if test -z "$CC"; then
-+      echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
-+      exit 1
-+    fi
-+  fi
-+
-+  # Now see if the compiler is really GCC.
-+  with_gcc=no
-+  echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
-+  echo "$progname:581: checking whether we are using GNU C" >&5
-+
-+  $rm conftest.c
-+  cat > conftest.c <<EOF
-+#ifdef __GNUC__
-+  yes;
-+#endif
-+EOF
-+  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+    with_gcc=yes
-+  fi
-+  $rm conftest.c
-+  echo "$ac_t$with_gcc" 1>&6
-+fi
-+
-+# Allow CC to be a program name with arguments.
-+set dummy $CC
-+compiler="$2"
-+
-+echo $ac_n "checking for object suffix... $ac_c" 1>&6
-+$rm conftest*
-+echo 'int i = 1;' > conftest.c
-+echo "$progname:603: checking for object suffix" >& 5
-+if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
-+  # Append any warnings to the config.log.
-+  cat conftest.err 1>&5
-+
-+  for ac_file in conftest.*; do
-+    case $ac_file in
-+    *.c) ;;
-+    *) objext=`echo $ac_file | sed -e s/conftest.//` ;;
-+    esac
-+  done
-+else
-+  cat conftest.err 1>&5
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.c >&5
-+fi
-+$rm conftest*
-+echo "$ac_t$objext" 1>&6
-+
-+echo $ac_n "checking for executable suffix... $ac_c" 1>&6
-+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_cv_exeext="no"
-+  $rm conftest*
-+  echo 'main () { return 0; }' > conftest.c
-+  echo "$progname:629: checking for executable suffix" >& 5
-+  if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
-+    # Append any warnings to the config.log.
-+    cat conftest.err 1>&5
-+
-+    for ac_file in conftest.*; do
-+      case $ac_file in
-+      *.c | *.err | *.$objext ) ;;
-+      *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
-+      esac
-+    done
-+  else
-+    cat conftest.err 1>&5
-+    echo "$progname: failed program was:" >&5
-+    cat conftest.c >&5
-+  fi
-+  $rm conftest*
-+fi
-+if test "X$ac_cv_exeext" = Xno; then
-+  exeext=""
-+else
-+  exeext="$ac_cv_exeext"
-+fi
-+echo "$ac_t$ac_cv_exeext" 1>&6
-+
-+echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
-+pic_flag=
-+special_shlib_compile_flags=
-+wl=
-+link_static_flag=
-+no_builtin_flag=
-+
-+if test "$with_gcc" = yes; then
-+  wl='-Wl,'
-+  link_static_flag='-static'
-+
-+  case "$host_os" in
-+  beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
-+    # PIC is the default for these OSes.
-+    ;;
-+  aix*)
-+    # Below there is a dirty hack to force normal static linking with -ldl
-+    # The problem is because libdl dynamically linked with both libc and
-+    # libC (AIX C++ library), which obviously doesn't included in libraries
-+    # list by gcc. This cause undefined symbols with -static flags.
-+    # This hack allows C programs to be linked with "-static -ldl", but
-+    # we not sure about C++ programs.
-+    link_static_flag="$link_static_flag ${wl}-lC"
-+    ;;
-+  cygwin* | mingw* | os2*)
-+    # We can build DLLs from non-PIC.
-+    ;;
-+  amigaos*)
-+    # FIXME: we need at least 68020 code to build shared libraries, but
-+    # adding the `-m68020' flag to GCC prevents building anything better,
-+    # like `-m68040'.
-+    pic_flag='-m68020 -resident32 -malways-restore-a4'
-+    ;;
-+  sysv4*MP*)
-+    if test -d /usr/nec; then
-+       pic_flag=-Kconform_pic
-+    fi
-+    ;;
-+  *)
-+    pic_flag='-fPIC'
-+    ;;
-+  esac
-+else
-+  # PORTME Check for PIC flags for the system compiler.
-+  case "$host_os" in
-+  aix3* | aix4*)
-+    # All AIX code is PIC.
-+    link_static_flag='-bnso -bI:/lib/syscalls.exp'
-+    ;;
-+
-+  hpux9* | hpux10* | hpux11*)
-+    # Is there a better link_static_flag that works with the bundled CC?
-+    wl='-Wl,'
-+    link_static_flag="${wl}-a ${wl}archive"
-+    pic_flag='+Z'
-+    ;;
-+
-+  irix5* | irix6*)
-+    wl='-Wl,'
-+    link_static_flag='-non_shared'
-+    # PIC (with -KPIC) is the default.
-+    ;;
-+
-+  cygwin* | mingw* | os2*)
-+    # We can build DLLs from non-PIC.
-+    ;;
-+
-+  osf3* | osf4* | osf5*)
-+    # All OSF/1 code is PIC.
-+    wl='-Wl,'
-+    link_static_flag='-non_shared'
-+    ;;
-+
-+  sco3.2v5*)
-+    pic_flag='-Kpic'
-+    link_static_flag='-dn'
-+    special_shlib_compile_flags='-belf'
-+    ;;
-+
-+  solaris*)
-+    pic_flag='-KPIC'
-+    link_static_flag='-Bstatic'
-+    wl='-Wl,'
-+    ;;
-+
-+  sunos4*)
-+    pic_flag='-PIC'
-+    link_static_flag='-Bstatic'
-+    wl='-Qoption ld '
-+    ;;
-+
-+  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+    pic_flag='-KPIC'
-+    link_static_flag='-Bstatic'
-+    wl='-Wl,'
-+    ;;
-+
-+  uts4*)
-+    pic_flag='-pic'
-+    link_static_flag='-Bstatic'
-+    ;;
-+  sysv4*MP*)
-+    if test -d /usr/nec ;then
-+      pic_flag='-Kconform_pic'
-+      link_static_flag='-Bstatic'
-+    fi
-+    ;;
-+  *)
-+    can_build_shared=no
-+    ;;
-+  esac
-+fi
-+
-+if test -n "$pic_flag"; then
-+  echo "$ac_t$pic_flag" 1>&6
-+
-+  # Check to make sure the pic_flag actually works.
-+  echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
-+  $rm conftest*
-+  echo "int some_variable = 0;" > conftest.c
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS $pic_flag -DPIC"
-+  echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5
-+  if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
-+    # Append any warnings to the config.log.
-+    cat conftest.err 1>&5
-+    
-+    case "$host_os" in
-+    hpux9* | hpux10* | hpux11*)
-+      # On HP-UX, both CC and GCC only warn that PIC is supported... then they
-+      # create non-PIC objects.  So, if there were any warnings, we assume that
-+      # PIC is not supported.
-+      if test -s conftest.err; then
-+	echo "$ac_t"no 1>&6
-+	can_build_shared=no
-+	pic_flag=
-+      else
-+	echo "$ac_t"yes 1>&6
-+	pic_flag=" $pic_flag"
-+      fi
-+      ;;
-+    *)
-+      echo "$ac_t"yes 1>&6
-+      pic_flag=" $pic_flag"
-+      ;;
-+    esac
-+  else
-+    # Append any errors to the config.log.
-+    cat conftest.err 1>&5
-+    can_build_shared=no
-+    pic_flag=
-+    echo "$ac_t"no 1>&6
-+  fi
-+  CFLAGS="$save_CFLAGS"
-+  $rm conftest*
-+else
-+  echo "$ac_t"none 1>&6
-+fi
-+
-+# Check to see if options -o and -c are simultaneously supported by compiler
-+echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6
-+$rm -r conftest 2>/dev/null
-+mkdir conftest
-+cd conftest
-+$rm conftest*
-+echo "int some_variable = 0;" > conftest.c
-+mkdir out
-+# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-+# that will create temporary files in the current directory regardless of
-+# the output directory.  Thus, making CWD read-only will cause this test
-+# to fail, enabling locking or at least warning the user not to do parallel
-+# builds.
-+chmod -w .
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -o out/conftest2.o"
-+echo "$progname:829: checking if $compiler supports -c -o file.o" >&5
-+if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
-+
-+  # The compiler can only warn and ignore the option if not recognized
-+  # So say no if there are warnings
-+    if test -s out/conftest.err; then
-+      echo "$ac_t"no 1>&6
-+      compiler_c_o=no
-+    else
-+      echo "$ac_t"yes 1>&6
-+      compiler_c_o=yes
-+    fi
-+else
-+  # Append any errors to the config.log.
-+  cat out/conftest.err 1>&5
-+  compiler_c_o=no
-+  echo "$ac_t"no 1>&6
-+fi
-+CFLAGS="$save_CFLAGS"
-+chmod u+w .
-+$rm conftest* out/*
-+rmdir out
-+cd ..
-+rmdir conftest
-+$rm -r conftest 2>/dev/null
-+
-+if test x"$compiler_c_o" = x"yes"; then
-+  # Check to see if we can write to a .lo
-+  echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6
-+  $rm conftest*
-+  echo "int some_variable = 0;" > conftest.c
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -c -o conftest.lo"
-+  echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5
-+if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
-+
-+    # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+      if test -s conftest.err; then
-+	echo "$ac_t"no 1>&6
-+	compiler_o_lo=no
-+      else
-+	echo "$ac_t"yes 1>&6
-+	compiler_o_lo=yes
-+      fi
-+  else
-+    # Append any errors to the config.log.
-+    cat conftest.err 1>&5
-+    compiler_o_lo=no
-+    echo "$ac_t"no 1>&6
-+  fi
-+  CFLAGS="$save_CFLAGS"
-+  $rm conftest*
-+else
-+  compiler_o_lo=no
-+fi
-+
-+# Check to see if we can do hard links to lock some files if needed
-+hard_links="nottested"
-+if test "$compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  echo "$ac_t$hard_links" 1>&6
-+  $rm conftest*
-+  if test "$hard_links" = no; then
-+    echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
-+if test "$with_gcc" = yes; then
-+  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-+  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
-+  $rm conftest*
-+  echo "int some_variable = 0;" > conftest.c
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
-+  echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+  if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
-+
-+    # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+      if test -s conftest.err; then
-+	echo "$ac_t"no 1>&6
-+	compiler_rtti_exceptions=no
-+      else
-+	echo "$ac_t"yes 1>&6
-+	compiler_rtti_exceptions=yes
-+      fi
-+  else
-+    # Append any errors to the config.log.
-+    cat conftest.err 1>&5
-+    compiler_rtti_exceptions=no
-+    echo "$ac_t"no 1>&6
-+  fi
-+  CFLAGS="$save_CFLAGS"
-+  $rm conftest*
-+
-+  if test "$compiler_rtti_exceptions" = "yes"; then
-+    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-+  else
-+    no_builtin_flag=' -fno-builtin'
-+  fi
-+  
-+fi
-+
-+# Check for any special shared library compilation flags.
-+if test -n "$special_shlib_compile_flags"; then
-+  echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
-+  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$special_shlib_compile_flags[ 	]" >/dev/null; then :
-+  else
-+    echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
-+    can_build_shared=no
-+  fi
-+fi
-+
-+echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
-+$rm conftest*
-+echo 'main(){return(0);}' > conftest.c
-+save_LDFLAGS="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $link_static_flag"
-+echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5
-+if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+  echo "$ac_t$link_static_flag" 1>&6
-+else
-+  echo "$ac_t"none 1>&6
-+  link_static_flag=
-+fi
-+LDFLAGS="$save_LDFLAGS"
-+$rm conftest*
-+
-+if test -z "$LN_S"; then
-+  # Check to see if we can use ln -s, or we need hard links.
-+  echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
-+  $rm conftest.dat
-+  if ln -s X conftest.dat 2>/dev/null; then
-+    $rm conftest.dat
-+    LN_S="ln -s"
-+  else
-+    LN_S=ln
-+  fi
-+  if test "$LN_S" = "ln -s"; then
-+    echo "$ac_t"yes 1>&6
-+  else
-+    echo "$ac_t"no 1>&6
-+  fi
-+fi
-+
-+# Make sure LD is an absolute path.
-+if test -z "$LD"; then
-+  ac_prog=ld
-+  if test "$with_gcc" = yes; then
-+    # Check if gcc -print-prog-name=ld gives a path.
-+    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
-+    echo "$progname:991: checking for ld used by GCC" >&5
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5`
-+    case "$ac_prog" in
-+    # Accept absolute paths.
-+    [\\/]* | [A-Za-z]:[\\/]*)
-+      re_direlt='/[^/][^/]*/\.\./'
-+      # Canonicalize the path of ld
-+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+    "")
-+      # If it fails, then pretend we are not using GCC.
-+      ac_prog=ld
-+      ;;
-+    *)
-+      # If it is relative, then search for the first ld in PATH.
-+      with_gnu_ld=unknown
-+      ;;
-+    esac
-+  elif test "$with_gnu_ld" = yes; then
-+    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
-+    echo "$progname:1015: checking for GNU ld" >&5
-+  else
-+    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-+    echo "$progname:1018: checking for non-GNU ld" >&5
-+  fi
-+
-+  if test -z "$LD"; then
-+    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+    for ac_dir in $PATH; do
-+      test -z "$ac_dir" && ac_dir=.
-+      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+	LD="$ac_dir/$ac_prog"
-+	# Check to see if the program is GNU ld.  I'd rather use --version,
-+	# but apparently some GNU ld's only accept -v.
-+	# Break only if it was the GNU/non-GNU ld that we prefer.
-+	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+	  test "$with_gnu_ld" != no && break
-+	else
-+	  test "$with_gnu_ld" != yes && break
-+	fi
-+      fi
-+    done
-+    IFS="$ac_save_ifs"
-+  fi
-+
-+  if test -n "$LD"; then
-+    echo "$ac_t$LD" 1>&6
-+  else
-+    echo "$ac_t"no 1>&6
-+  fi
-+
-+  if test -z "$LD"; then
-+    echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
-+    exit 1
-+  fi
-+fi
-+
-+# Check to see if it really is or is not GNU ld.
-+echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
-+# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  with_gnu_ld=yes
-+else
-+  with_gnu_ld=no
-+fi
-+echo "$ac_t$with_gnu_ld" 1>&6
-+
-+# See if the linker supports building shared libraries.
-+echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
-+
-+allow_undefined_flag=
-+no_undefined_flag=
-+need_lib_prefix=unknown
-+need_version=unknown
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+archive_cmds=
-+archive_expsym_cmds=
-+old_archive_from_new_cmds=
-+export_dynamic_flag_spec=
-+whole_archive_flag_spec=
-+thread_safe_flag_spec=
-+hardcode_libdir_flag_spec=
-+hardcode_libdir_separator=
-+hardcode_direct=no
-+hardcode_minus_L=no
-+hardcode_shlibpath_var=unsupported
-+runpath_var=
-+always_export_symbols=no
-+export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+# include_expsyms should be a list of space-separated symbols to be *always*
-+# included in the symbol list
-+include_expsyms=
-+# exclude_expsyms can be an egrep regular expression of symbols to exclude
-+# it will be wrapped by ` (' and `)$', so one must not match beginning or
-+# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+# as well as any symbol that contains `d'.
-+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+# platforms (ab)use it in PIC code, but their linkers get confused if
-+# the symbol is explicitly referenced.  Since portable code cannot
-+# rely on this symbol name, it's probably fine to never include it in
-+# preloaded symbol tables.
-+
-+case "$host_os" in
-+cygwin* | mingw*)
-+  # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+  # When not using gcc, we currently assume that we are using
-+  # Microsoft Visual C++.
-+  if test "$with_gcc" != yes; then
-+    with_gnu_ld=no
-+  fi
-+  ;;
-+
-+esac
-+
-+ld_shlibs=yes
-+if test "$with_gnu_ld" = yes; then
-+  # If archive_cmds runs LD, not CC, wlarc should be empty
-+  wlarc='${wl}'
-+
-+  # See if GNU ld supports shared libraries.
-+  case "$host_os" in
-+  aix3* | aix4*)
-+    # On AIX, the GNU linker is very broken
-+    ld_shlibs=no
-+    cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+
-+    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+    # that the semantics of dynamic libraries on AmigaOS, at least up
-+    # to version 4, is to share data among multiple programs linked
-+    # with the same dynamic library.  Since this doesn't match the
-+    # behavior of shared libraries on other platforms, we can use
-+    # them.
-+    ld_shlibs=no
-+    ;;
-+
-+  beos*)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      allow_undefined_flag=unsupported
-+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+      # support --undefined.  This deserves some investigation.  FIXME
-+      archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  cygwin* | mingw*)
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+
-+    # Extract the symbol export list from an `--export-all' def file,
-+    # then regenerate the def file from the symbol export list, so that
-+    # the compiled dll only exports the symbol export list.
-+    # Be careful not to strip the DATA tag left by newer dlltools.
-+    export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
-+      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
-+      $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs $convenience~
-+      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $objdir/$soname-def > $export_symbols'
-+
-+    # If DATA tags from a recent dlltool are present, honour them!
-+    archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
-+      _lt_hint=1;
-+      cat $export_symbols | while read symbol; do
-+        set dummy \$symbol;
-+        case \$# in
-+          2) echo "	\$2 @ \$_lt_hint ; " >> $objdir/$soname-def;;
-+          *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;;
-+        esac;
-+	_lt_hint=`expr 1 + \$_lt_hint`;
-+      done~
-+      test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
-+      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
-+      $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
-+      $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
-+      $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
-+
-+      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+      # can we support soname and/or expsyms with a.out? -oliva
-+    fi
-+    ;;
-+
-+  solaris* | sysv5*)
-+    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-+      ld_shlibs=no
-+      cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;      
-+
-+  sunos4*)
-+    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+    wlarc=
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+  esac
-+
-+  if test "$ld_shlibs" = yes; then
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    case $host_os in
-+    cygwin* | mingw*)
-+      # dlltool doesn't understand --whole-archive et. al.
-+      whole_archive_flag_spec=
-+      ;;
-+    *)
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-+        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+        whole_archive_flag_spec=
-+      fi
-+      ;;
-+    esac
-+  fi
-+else
-+  # PORTME fill in a description of your system's linker (not GNU ld)
-+  case "$host_os" in
-+  aix3*)
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+    archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
-+    # Note: this linker hardcodes the directories in LIBPATH if there
-+    # are no directories specified by -L.
-+    hardcode_minus_L=yes
-+    if test "$with_gcc" = yes && test -z "$link_static_flag"; then
-+      # Neither direct hardcoding nor static linking is supported with a
-+      # broken collect2.
-+      hardcode_direct=unsupported
-+    fi
-+    ;;
-+
-+  aix4*)
-+    hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
-+    hardcode_libdir_separator=':'
-+    if test "$with_gcc" = yes; then
-+      collect2name=`${CC} -print-prog-name=collect2`
-+      if test -f "$collect2name" && \
-+	 strings "$collect2name" | grep resolve_lib_name >/dev/null
-+      then
-+	# We have reworked collect2
-+	hardcode_direct=yes
-+      else
-+	# We have old collect2
-+	hardcode_direct=unsupported
-+	# It fails to find uninstalled libraries when the uninstalled
-+	# path is not listed in the libpath.  Setting hardcode_minus_L
-+	# to unsupported forces relinking
-+	hardcode_minus_L=yes
-+	hardcode_libdir_flag_spec='-L$libdir'
-+	hardcode_libdir_separator=
-+      fi
-+      shared_flag='-shared'
-+    else
-+      shared_flag='${wl}-bM:SRE'
-+      hardcode_direct=yes
-+    fi
-+    allow_undefined_flag=' ${wl}-berok'
-+    archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
-+    archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
-+    case "$host_os" in aix4.[01]|aix4.[01].*)
-+      # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
-+      always_export_symbols=yes ;;
-+    esac
-+   ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    # see comment about different semantics on the GNU ld section
-+    ld_shlibs=no
-+    ;;
-+
-+  cygwin* | mingw*)
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec=' '
-+    allow_undefined_flag=unsupported
-+    # Tell ltmain to make .lib files, not .a files.
-+    libext=lib
-+    # FIXME: Setting linknames here is a bad hack.
-+    archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+    # The linker will automatically build a .lib file if we build a DLL.
-+    old_archive_from_new_cmds='true'
-+    # FIXME: Should let the user specify the lib program.
-+    old_archive_cmds='lib /OUT:$oldlib$oldobjs'
-+    fix_srcfile_path='`cygpath -w $srcfile`'
-+    ;;
-+
-+  freebsd1*)
-+    ld_shlibs=no
-+    ;;
-+
-+  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+  # support.  Future versions do this automatically, but an explicit c++rt0.o
-+  # does not break anything, and helps significantly (at the cost of a little
-+  # extra space).
-+  freebsd2.2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+  freebsd2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+  freebsd*)
-+    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  hpux9* | hpux10* | hpux11*)
-+    case "$host_os" in
-+    hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-+    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;;
-+    esac
-+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes # Not in the search PATH, but as the default
-+			 # location of the library.
-+    export_dynamic_flag_spec='${wl}-E'
-+    ;;
-+
-+  irix5* | irix6*)
-+    if test "$with_gcc" = yes; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+    else
-+      archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'  # a.out
-+    else
-+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts'      # ELF
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  openbsd*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  os2*)
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    allow_undefined_flag=unsupported
-+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def'
-+    old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
-+    ;;
-+
-+  osf3*)
-+    if test "$with_gcc" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  osf4* | osf5*)  # As osf3* with the addition of the -msym flag
-+    if test "$with_gcc" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    ;;
-+  rhapsody*)
-+    archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_libdir_flags_spec='-L$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+                                       
-+  sco3.2v5*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_shlibpath_var=no
-+    runpath_var=LD_RUN_PATH
-+    hardcode_runpath_var=yes
-+    ;;
-+
-+  solaris*)
-+    no_undefined_flag=' -z text'
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_shlibpath_var=no
-+    case "$host_os" in
-+    solaris2.[0-5] | solaris2.[0-5].*) ;;
-+    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+    esac
-+    ;;
-+
-+  sunos4*)
-+    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4)
-+    if test "x$host_vendor" = xsequent; then
-+      # Use $CC to link under sequent, because it throws in some extra .o 
-+      # files that make .init and .fini sections work.
-+      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts'
-+    else
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    fi
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    hardcode_direct=no #Motorola manual says yes, but my tests say they lie 
-+    ;;  
-+
-+  sysv4.3*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_shlibpath_var=no
-+    export_dynamic_flag_spec='-Bexport'
-+    ;;
-+
-+  sysv5*)
-+    no_undefined_flag=' -z text'
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
-+    hardcode_libdir_flag_spec=
-+    hardcode_shlibpath_var=no
-+    runpath_var='LD_RUN_PATH'
-+    ;;
-+
-+  uts4*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  dgux*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4*MP*)
-+    if test -d /usr/nec; then
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+      hardcode_shlibpath_var=no
-+      runpath_var=LD_RUN_PATH
-+      hardcode_runpath_var=yes
-+      ld_shlibs=yes
-+    fi
-+    ;;
-+
-+  sysv4.2uw2*)
-+    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts'
-+    hardcode_direct=yes
-+    hardcode_minus_L=no
-+    hardcode_shlibpath_var=no
-+    hardcode_runpath_var=yes
-+    runpath_var=LD_RUN_PATH
-+    ;;
-+
-+  unixware7*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    ld_shlibs=no
-+    ;;
-+  esac
-+fi
-+echo "$ac_t$ld_shlibs" 1>&6
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+if test -z "$NM"; then
-+  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
-+  case "$NM" in
-+  [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path.
-+  *)
-+    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-+    for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do
-+      test -z "$ac_dir" && ac_dir=.
-+      if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext; then
-+	# Check to see if the nm accepts a BSD-compat flag.
-+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+	#   nm: unknown option "B" ignored
-+	if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-+	  NM="$ac_dir/nm -B"
-+	  break
-+	elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-+	  NM="$ac_dir/nm -p"
-+	  break
-+	else
-+	  NM=${NM="$ac_dir/nm"} # keep the first match, but
-+	  continue # so that we can try to find one that supports BSD flags
-+	fi
-+      fi
-+    done
-+    IFS="$ac_save_ifs"
-+    test -z "$NM" && NM=nm
-+    ;;
-+  esac
-+  echo "$ac_t$NM" 1>&6
-+fi
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
-+
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[BCDEGRST]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-+
-+# Transform the above into a raw symbol and a C symbol.
-+symxfrm='\1 \2\3 \3'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-+
-+# Define system-specific variables.
-+case "$host_os" in
-+aix*)
-+  symcode='[BCDT]'
-+  ;;
-+cygwin* | mingw*)
-+  symcode='[ABCDGISTW]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
-+  ;;
-+irix*)
-+  symcode='[BCDEGRST]'
-+  ;;
-+solaris*)
-+  symcode='[BDT]'
-+  ;;
-+sysv4)
-+  symcode='[DFNSTU]'
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-+  symcode='[ABCDGISTW]'
-+fi
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Write the raw and C identifiers.
-+  global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode\)[ 	][ 	]*\($ac_symprfx\)$sympat$/$symxfrm/p'"
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+  $rm conftest*
-+  cat > conftest.c <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+  echo "$progname:1653: checking if global_symbol_pipe works" >&5
-+  if { (eval echo $progname:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if { echo "$progname:1657: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
-+
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-+	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.c
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+	  # Now generate the symbol file.
-+	  eval "$global_symbol_to_cdecl"' < "$nlist" >> conftest.c'
-+
-+	  cat <<EOF >> conftest.c
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr_t void *
-+#else
-+# define lt_ptr_t char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr_t address;
-+}
-+lt_preloaded_symbols[] =
-+{
-+EOF
-+	  sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.c
-+	  cat <<\EOF >> conftest.c
-+  {0, (lt_ptr_t) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$objext conftstm.$objext
-+	  save_LIBS="$LIBS"
-+	  save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$objext"
-+	  CFLAGS="$CFLAGS$no_builtin_flag"
-+	  if { (eval echo $progname:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+	    pipe_works=yes
-+	  else
-+	    echo "$progname: failed program was:" >&5
-+	    cat conftest.c >&5
-+	  fi
-+	  LIBS="$save_LIBS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&5
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&5
-+      fi
-+    else
-+      echo "cannot run $global_symbol_pipe" >&5
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&5
-+    cat conftest.c >&5
-+  fi
-+  $rm conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    global_symbol_pipe=
-+  fi
-+done
-+if test "$pipe_works" = yes; then
-+  echo "${ac_t}ok" 1>&6
-+else
-+  echo "${ac_t}failed" 1>&6
-+fi
-+
-+if test -z "$global_symbol_pipe"; then
-+  global_symbol_to_cdecl=
-+fi
-+
-+# Check hardcoding attributes.
-+echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" || \
-+   test -n "$runpath_var"; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$hardcode_shlibpath_var" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
-+echo "$ac_t$hardcode_action" 1>&6
-+
-+
-+reload_flag=
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
-+# PORTME Some linkers may need a different reload flag.
-+reload_flag='-r'
-+echo "$ac_t$reload_flag" 1>&6
-+test -n "$reload_flag" && reload_flag=" $reload_flag"
-+
-+# PORTME Fill in your ld.so characteristics
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+file_magic_cmd=
-+file_magic_test_file=
-+deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [regex]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given egrep regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
-+case "$host_os" in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}.so$major'
-+  ;;
-+
-+aix4*)
-+  version_type=linux
-+  # AIX has no versioning support, so currently we can not hardcode correct
-+  # soname into executable. Probably we can add versioning support to
-+  # collect2, so additional links can be useful in future.
-+  # We preserve .a as extension for shared libraries though AIX4.2
-+  # and later linker supports .so
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
-+  shlibpath_var=LIBPATH
-+  deplibs_check_method=pass_all
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}.so'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  deplibs_check_method=pass_all
-+  lt_cv_dlopen="load_add_on"
-+  lt_cv_dlopen_libs=
-+  lt_cv_dlopen_self=yes
-+  ;;
-+
-+bsdi4*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=/shlib/libc.so
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  export_dynamic_flag_spec=-rdynamic
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw*)
-+  version_type=windows
-+  need_version=no
-+  need_lib_prefix=no
-+  if test "$with_gcc" = yes; then
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a'
-+  else
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
-+  fi
-+  dynamic_linker='Win32 ld.exe'
-+  deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+  file_magic_cmd='${OBJDUMP} -f'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  lt_cv_dlopen="LoadLibrary"
-+  lt_cv_dlopen_libs=
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+  
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-$objformat
-+  case "$version_type" in
-+    freebsd-elf*)
-+      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+      file_magic_cmd=/usr/bin/file
-+      file_magic_test_file=`echo /usr/lib/libc.so*`
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      deplibs_check_method=unknown
-+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case "$host_os" in
-+  freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  *) # from 3.2 on
-+    shlibpath_overrides_runpath=no
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  deplibs_check_method=pass_all
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  dynamic_linker="$host_os dld.sl"
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  shlibpath_var=SHLIB_PATH
-+  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-+  soname_spec='${libname}${release}.sl$major'
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  case "$host_os" in
-+  hpux10.20*)
-+    # TODO:  Does this work for hpux-11 too?
-+    deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-+    file_magic_cmd=/usr/bin/file
-+    file_magic_test_file=/usr/lib/libc.sl
-+    ;;
-+  esac
-+  ;;
-+
-+irix5* | irix6*)
-+  version_type=irix
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}.so.$major'
-+  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
-+  case "$host_os" in
-+  irix5*)
-+    libsuff= shlibsuff=
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-+    ;;
-+  *)
-+    case "$LD" in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-+  deplibs_check_method='pass_all'
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  deplibs_check_method=pass_all
-+
-+  if test -f /lib/ld.so.1; then
-+    dynamic_linker='GNU ld.so'
-+  else
-+    # Only the GNU ld.so supports shared libraries on MkLinux.
-+    case "$host_cpu" in
-+    powerpc*) dynamic_linker=no ;;
-+    *) dynamic_linker='Linux ld.so' ;;
-+    esac
-+  fi
-+  ;;
-+
-+netbsd*)
-+  version_type=sunos
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+    soname_spec='${libname}${release}.so$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+    need_version=no
-+  fi
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  need_lib_prefix=no
-+  library_names_spec='$libname.dll $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_version=no
-+  soname_spec='${libname}${release}.so'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  # this will be overridden with pass_all, but let us keep it just in case
-+  deplibs_check_method='file_magic COFF format alpha shared library'
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=/shlib/libc.so
-+  deplibs_check_method='pass_all'
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
-+
-+rhapsody*)
-+  version_type=sunos
-+  library_names_spec='${libname}.so'
-+  soname_spec='${libname}.so'
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  deplibs_check_method=pass_all
-+  ;;
-+
-+sco3.2v5*)
-+  version_type=osf
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib"
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=/lib/libc.so
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case "$host_vendor" in
-+    sequent)
-+      file_magic_cmd='/bin/file'
-+      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+      ;;
-+    ncr)
-+      deplibs_check_method='pass_all'
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-+      file_magic_cmd=/usr/bin/file
-+      file_magic_test_file=`echo /usr/lib/libc.so*`
-+      ;;
-+  esac
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-+    soname_spec='$libname.so.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+echo "$ac_t$dynamic_linker" 1>&6
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+# Report the final consequences.
-+echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
-+
-+# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
-+# configure.in, otherwise build static only libraries.
-+case "$host_os" in
-+cygwin* | mingw* | os2*)
-+  if test x$can_build_shared = xyes; then
-+    test x$enable_win32_dll = xno && can_build_shared=no
-+    echo "checking if package supports dlls... $can_build_shared" 1>&6
-+  fi
-+;;
-+esac
-+
-+if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then
-+  case "$deplibs_check_method" in
-+  "file_magic "*)
-+    file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+    if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+       egrep "$file_magic_regex" > /dev/null; then
-+      :
-+    else
-+      cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+    fi ;;
-+  esac
-+fi
-+
-+echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+
-+aix4*)
-+  test "$enable_shared" = yes && enable_static=no
-+  ;;
-+esac
-+
-+echo "$ac_t$enable_shared" 1>&6
-+
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+
-+echo "checking whether to build static libraries... $enable_static" 1>&6
-+
-+if test "$hardcode_action" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+echo $ac_n "checking for objdir... $ac_c" 1>&6
-+rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null
-+echo "$ac_t$objdir" 1>&6
-+
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
-+  lt_cv_dlopen=no lt_cv_dlopen_libs=
-+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-+echo "$progname:2248: checking for dlopen in -ldl" >&5
-+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldl  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2256 "ltconfig"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen();
-+
-+int main() {
-+dlopen()
-+; return 0; }
-+EOF
-+if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-+echo "$progname:2288: checking for dlopen" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2293 "ltconfig"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char dlopen(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_dlopen) || defined (__stub___dlopen)
-+choke me
-+#else
-+dlopen();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo $progname:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_dlopen=yes"
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_dlopen=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-+echo "$progname:2335: checking for dld_link in -ldld" >&5
-+ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2343 "ltconfig"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dld_link();
-+
-+int main() {
-+dld_link()
-+; return 0; }
-+EOF
-+if { (eval echo $progname:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-+echo "$progname:2375: checking for shl_load" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2380 "ltconfig"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char shl_load(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shl_load();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_shl_load) || defined (__stub___shl_load)
-+choke me
-+#else
-+shl_load();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo $progname:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_shl_load=yes"
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_shl_load=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="shl_load"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-+echo "$progname:2423: checking for shl_load in -ldld" >&5
-+ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2431 "ltconfig"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shl_load();
-+
-+int main() {
-+shl_load()
-+; return 0; }
-+EOF
-+if { (eval echo $progname:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+fi
-+
-+    
-+fi
-+
-+  
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  fi
-+
-+  case "$lt_cv_dlopen" in
-+  dlopen)
-+for ac_hdr in dlfcn.h; do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "$progname:2488: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2493 "ltconfig"
-+#include <$ac_hdr>
-+int fnord = 0;
-+EOF
-+ac_try="$ac_compile >/dev/null 2>conftest.out"
-+{ (eval echo $progname:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+    if test "x$ac_cv_header_dlfcn_h" = xyes; then
-+      CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+    fi
-+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+  echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-+echo "$progname:2526: checking whether a program can dlopen itself" >&5
-+if test "${lt_cv_dlopen_self+set}" = set; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test "$cross_compiling" = yes; then
-+    lt_cv_dlopen_self=cross
-+  else
-+    cat > conftest.c <<EOF
-+#line 2534 "ltconfig"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LTDL_GLOBAL	RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+#  define LTDL_GLOBAL	DL_GLOBAL
-+# else
-+#  define LTDL_GLOBAL	0
-+# endif
-+#endif
-+
-+/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LTDL_LAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
-+# else
-+#  ifdef DL_LAZY
-+#   define LTDL_LAZY_OR_NOW	DL_LAZY
-+#  else
-+#   ifdef RTLD_NOW
-+#    define LTDL_LAZY_OR_NOW	RTLD_NOW
-+#   else
-+#    ifdef DL_NOW
-+#     define LTDL_LAZY_OR_NOW	DL_NOW
-+#    else
-+#     define LTDL_LAZY_OR_NOW	0
-+#    endif
-+#   endif
-+#  endif
-+# endif
-+#endif
-+
-+fnord() { int i=42;}
-+main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
-+    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-+	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
-+
-+EOF
-+if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+then
-+  lt_cv_dlopen_self=yes
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  lt_cv_dlopen_self=no
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+
-+echo "$ac_t""$lt_cv_dlopen_self" 1>&6
-+
-+  if test "$lt_cv_dlopen_self" = yes; then
-+    LDFLAGS="$LDFLAGS $link_static_flag"
-+  echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-+echo "$progname:2599: checking whether a statically linked program can dlopen itself" >&5
-+if test "${lt_cv_dlopen_self_static+set}" = set; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test "$cross_compiling" = yes; then
-+    lt_cv_dlopen_self_static=cross
-+  else
-+    cat > conftest.c <<EOF
-+#line 2607 "ltconfig"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LTDL_GLOBAL	RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+#  define LTDL_GLOBAL	DL_GLOBAL
-+# else
-+#  define LTDL_GLOBAL	0
-+# endif
-+#endif
-+
-+/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LTDL_LAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
-+# else
-+#  ifdef DL_LAZY
-+#   define LTDL_LAZY_OR_NOW	DL_LAZY
-+#  else
-+#   ifdef RTLD_NOW
-+#    define LTDL_LAZY_OR_NOW	RTLD_NOW
-+#   else
-+#    ifdef DL_NOW
-+#     define LTDL_LAZY_OR_NOW	DL_NOW
-+#    else
-+#     define LTDL_LAZY_OR_NOW	0
-+#    endif
-+#   endif
-+#  endif
-+# endif
-+#endif
-+
-+fnord() { int i=42;}
-+main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
-+    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-+    if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
-+
-+EOF
-+if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+then
-+  lt_cv_dlopen_self_static=yes
-+else
-+  echo "$progname: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  lt_cv_dlopen_self_static=no
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+
-+echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
-+fi
-+    ;;
-+  esac
-+
-+  case "$lt_cv_dlopen_self" in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case "$lt_cv_dlopen_self_static" in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+
-+# Copy echo and quote the copy, instead of the original, because it is
-+# used later.
-+ltecho="$echo"
-+if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-+   ltecho="$CONFIG_SHELL \$0 --fallback-echo"
-+fi
-+LTSHELL="$SHELL"
-+
-+LTCONFIG_VERSION="$VERSION"
-+
-+# Only quote variables if we're using ltmain.sh.
-+case "$ltmain" in
-+*.sh)
-+  # Now quote all the things that may contain metacharacters.
-+  for var in ltecho old_CC old_CFLAGS old_CPPFLAGS \
-+    old_LD old_LDFLAGS old_LIBS \
-+    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS \
-+    AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \
-+    reload_flag reload_cmds wl \
-+    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-+    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-+    library_names_spec soname_spec \
-+    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-+    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \
-+    file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \
-+    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-+    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-+
-+    case "$var" in
-+    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  case "$ltecho" in
-+  *'\$0 --fallback-echo"')
-+    ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+    ;;
-+  esac
-+
-+  trap "$rm \"$ofile\"; exit 1" 1 2 15
-+  echo "creating $ofile"
-+  $rm "$ofile"
-+  cat <<EOF > "$ofile"
-+#! $SHELL
-+
-+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
-+#
-+# Copyright (C) 1996-1999 Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# 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.
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="sed -e s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+### BEGIN LIBTOOL CONFIG
-+EOF
-+  cfgfile="$ofile"
-+  ;;
-+
-+*)
-+  # Double-quote the variables that need it (for aesthetics).
-+  for var in old_CC old_CFLAGS old_CPPFLAGS \
-+    old_LD old_LDFLAGS old_LIBS \
-+    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS; do
-+    eval "$var=\\\"\$var\\\""
-+  done
-+
-+  # Just create a config file.
-+  cfgfile="$ofile.cfg"
-+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-+  echo "creating $cfgfile"
-+  $rm "$cfgfile"
-+  cat <<EOF > "$cfgfile"
-+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+EOF
-+  ;;
-+esac
-+
-+cat <<EOF >> "$cfgfile"
-+# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+#
-+# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
-+# LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\
-+# NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\
-+# DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP AS=$old_AS \\
-+#   $0$ltconfig_args
-+#
-+# Compiler and other test output produced by $progname, useful for
-+# debugging $progname, is in ./config.log if it exists.
-+
-+# The version of $progname that generated this script.
-+LTCONFIG_VERSION=$LTCONFIG_VERSION
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$LTSHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+
-+# An echo program that does not interpret backslashes.
-+echo=$ltecho
-+
-+# The archiver.
-+AR=$AR
-+
-+# The default C compiler.
-+CC=$CC
-+
-+# The linker used to build libraries.
-+LD=$LD
-+
-+# Whether we need hard or soft links.
-+LN_S=$LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$NM
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$reload_flag
-+reload_cmds=$reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$wl
-+
-+# Object file suffix (normally "o").
-+objext="$objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$pic_flag
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$compiler_c_o
-+
-+# Can we write directly to a .lo ?
-+compiler_o_lo=$compiler_o_lo
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$link_static_flag
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$no_builtin_flag
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$whole_archive_flag_spec
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$thread_safe_flag_spec
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$RANLIB
-+old_archive_cmds=$old_archive_cmds
-+old_postinstall_cmds=$old_postinstall_cmds
-+old_postuninstall_cmds=$old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$old_archive_from_new_cmds
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$archive_cmds
-+archive_expsym_cmds=$archive_expsym_cmds
-+postinstall_cmds=$postinstall_cmds
-+postuninstall_cmds=$postuninstall_cmds
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$allow_undefined_flag
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$no_undefined_flag
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$global_symbol_to_cdecl
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$hardcode_libdir_separator
-+
-+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$export_symbols_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$include_expsyms
-+
-+EOF
-+
-+case "$ltmain" in
-+*.sh)
-+  echo '### END LIBTOOL CONFIG' >> "$ofile"
-+  echo >> "$ofile"
-+  case "$host_os" in
-+  aix3*)
-+    cat <<\EOF >> "$ofile"
-+
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+EOF
-+    ;;
-+  esac
-+
-+  # Append the ltmain.sh script.
-+  sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+
-+  chmod +x "$ofile"
-+  ;;
-+
-+*)
-+  # Compile the libtool program.
-+  echo "FIXME: would compile $ltmain"
-+  ;;
-+esac
-+
-+test -n "$cache_file" || exit 0
-+
-+# AC_CACHE_SAVE
-+trap '' 1 2 15
-+cat > confcache <<\EOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs.  It is not useful on other systems.
-+# If it contains results you don't want to keep, you may remove or edit it.
-+#
-+# By default, configure uses ./config.cache as the cache file,
-+# creating it if it does not exist already.  You can give configure
-+# the --cache-file=FILE option to use a different cache file; that is
-+# what configure does when it calls configure scripts in
-+# subdirectories, so they share the cache.
-+# Giving --cache-file=/dev/null disables caching, for debugging configure.
-+# config.status only pays attention to the cache file if you give it the
-+# --recheck option to rerun configure.
-+#
-+EOF
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, don't put newlines in cache variables' values.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(set) 2>&1 |
-+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-+  *ac_space=\ *)
-+    # `set' does not quote correctly, so add quotes (double-quote substitution
-+    # turns \\\\ into \\, and sed turns \\ into \).
-+    sed -n \
-+      -e "s/'/'\\\\''/g" \
-+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-+    ;;
-+  *)
-+    # `set' quotes correctly as required by POSIX, so do not add quotes.
-+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-+    ;;
-+  esac >> confcache
-+if cmp -s $cache_file confcache; then
-+  :
-+else
-+  if test -w $cache_file; then
-+    echo "updating cache $cache_file"
-+    cat confcache > $cache_file
-+  else
-+    echo "not updating unwritable cache $cache_file"
-+  fi
-+fi
-+rm -f confcache
-+
-+exit 0
-+
-+# Local Variables:
-+# mode:shell-script
-+# sh-indentation:2
-+# End:
---- metamail-2.7.orig/config/mkinstalldirs
-+++ metamail-2.7/config/mkinstalldirs
-@@ -0,0 +1,40 @@
-+#! /bin/sh
-+# mkinstalldirs --- make directory hierarchy
-+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain
-+
-+# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
-+
-+errstatus=0
-+
-+for file
-+do
-+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+   shift
-+
-+   pathcomp=
-+   for d
-+   do
-+     pathcomp="$pathcomp$d"
-+     case "$pathcomp" in
-+       -* ) pathcomp=./$pathcomp ;;
-+     esac
-+
-+     if test ! -d "$pathcomp"; then
-+        echo "mkdir $pathcomp"
-+
-+        mkdir "$pathcomp" || lasterr=$?
-+
-+        if test ! -d "$pathcomp"; then
-+  	  errstatus=$lasterr
-+        fi
-+     fi
-+
-+     pathcomp="$pathcomp/"
-+   done
-+done
-+
-+exit $errstatus
-+
-+# mkinstalldirs ends here
---- metamail-2.7.orig/Makefile.am
-+++ metamail-2.7/Makefile.am
-@@ -0,0 +1,14 @@
-+## Makefile.am -- Process this file with automake to produce Makefile.in
-+
-+auxdir                  = @ac_aux_dir@
-+AUX_DIST                = $(auxdir)/install-sh $(auxdir)/missing \
-+                        $(auxdir)/mkinstalldirs
-+AUX_DIST_EXTRA          = $(auxdir)/readline.m4 $(auxdir)/sys_errlist.m4 \
-+                        $(auxdir)/sys_siglist.m4
-+EXTRA_DIST              = bootstrap
-+
-+MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure \
-+			metamail/config-h.in metamail/stamp-h.in
-+
-+SUBDIRS                 = replace metamail src bin 
-+ACLOCAL                 = aclocal -I $(auxdir)
---- metamail-2.7.orig/Makefile.in
-+++ metamail-2.7/Makefile.in
-@@ -0,0 +1,349 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = .
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AS = @AS@
-+CATCOMMAND = @CATCOMMAND@
-+CC = @CC@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LPRCOMMAND = @LPRCOMMAND@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_aux_dir = @ac_aux_dir@
-+
-+auxdir = @ac_aux_dir@
-+AUX_DIST = $(auxdir)/install-sh $(auxdir)/missing                         $(auxdir)/mkinstalldirs
-+
-+AUX_DIST_EXTRA = $(auxdir)/readline.m4 $(auxdir)/sys_errlist.m4                         $(auxdir)/sys_siglist.m4
-+
-+EXTRA_DIST = bootstrap
-+
-+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure 			metamail/config-h.in metamail/stamp-h.in
-+
-+
-+SUBDIRS = replace metamail src bin 
-+ACLOCAL = aclocal -I $(auxdir)
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-+CONFIG_HEADER = ./metamail/config.h
-+CONFIG_CLEAN_FILES = 
-+DIST_COMMON =  README COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \
-+configure configure.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+all: all-redirect
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
-+	cd $(srcdir) && $(ACLOCAL)
-+
-+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
-+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-+	cd $(srcdir) && $(AUTOCONF)
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+
-+@SET_MAKE@
-+
-+all-recursive install-data-recursive install-exec-recursive \
-+installdirs-recursive install-recursive uninstall-recursive  \
-+check-recursive installcheck-recursive info-recursive dvi-recursive:
-+	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	dot_seen=no; \
-+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  rev="$$subdir $$rev"; \
-+	  test "$$subdir" != "." || dot_seen=yes; \
-+	done; \
-+	test "$$dot_seen" = "no" && rev=". $$rev"; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+   if test "$$subdir" = .; then :; else \
-+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+   fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	-rm -rf $(distdir)
-+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-+	mkdir $(distdir)/=build
-+	mkdir $(distdir)/=inst
-+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-+	cd $(distdir)/=build \
-+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist
-+	-rm -rf $(distdir)
-+	@banner="$(distdir).tar.gz is ready for distribution"; \
-+	dashes=`echo "$$banner" | sed s/./=/g`; \
-+	echo "$$dashes"; \
-+	echo "$$banner"; \
-+	echo "$$dashes"
-+dist: distdir
-+	-chmod -R a+r $(distdir)
-+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+	-rm -rf $(distdir)
-+dist-all: distdir
-+	-chmod -R a+r $(distdir)
-+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+	-rm -rf $(distdir)
-+distdir: $(DISTFILES)
-+	-rm -rf $(distdir)
-+	mkdir $(distdir)
-+	-chmod 777 $(distdir)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+	for subdir in $(SUBDIRS); do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d $(distdir)/$$subdir \
-+	    || mkdir $(distdir)/$$subdir \
-+	    || exit 1; \
-+	    chmod 777 $(distdir)/$$subdir; \
-+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+info-am:
-+info: info-recursive
-+dvi-am:
-+dvi: dvi-recursive
-+check-am: all-am
-+check: check-recursive
-+installcheck-am:
-+installcheck: installcheck-recursive
-+install-exec-am:
-+install-exec: install-exec-recursive
-+
-+install-data-am:
-+install-data: install-data-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-recursive
-+uninstall-am:
-+uninstall: uninstall-recursive
-+all-am: Makefile
-+all-redirect: all-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs: installdirs-recursive
-+installdirs-am:
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+clean-am:  clean-tags clean-generic mostlyclean-am
-+
-+clean: clean-recursive
-+
-+distclean-am:  distclean-tags distclean-generic clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-recursive
-+	-rm -f config.status
-+
-+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-+		distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-recursive
-+	-rm -f config.status
-+
-+.PHONY: install-data-recursive uninstall-data-recursive \
-+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-+uninstalldirs-recursive all-recursive check-recursive \
-+installcheck-recursive info-recursive dvi-recursive \
-+mostlyclean-recursive distclean-recursive clean-recursive \
-+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs-am \
-+installdirs mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- metamail-2.7.orig/stamp-h.in
-+++ metamail-2.7/stamp-h.in
-@@ -0,0 +1 @@
-+timestamp
---- metamail-2.7.orig/INSTALL
-+++ metamail-2.7/INSTALL
-@@ -0,0 +1,182 @@
-+Basic Installation
-+==================
-+
-+   These are generic installation instructions.
-+
-+   The `configure' shell script attempts to guess correct values for
-+various system-dependent variables used during compilation.  It uses
-+those values to create a `Makefile' in each directory of the package.
-+It may also create one or more `.h' files containing system-dependent
-+definitions.  Finally, it creates a shell script `config.status' that
-+you can run in the future to recreate the current configuration, a file
-+`config.cache' that saves the results of its tests to speed up
-+reconfiguring, and a file `config.log' containing compiler output
-+(useful mainly for debugging `configure').
-+
-+   If you need to do unusual things to compile the package, please try
-+to figure out how `configure' could check whether to do them, and mail
-+diffs or instructions to the address given in the `README' so they can
-+be considered for the next release.  If at some point `config.cache'
-+contains results you don't want to keep, you may remove or edit it.
-+
-+   The file `configure.in' is used to create `configure' by a program
-+called `autoconf'.  You only need `configure.in' if you want to change
-+it or regenerate `configure' using a newer version of `autoconf'.
-+
-+The simplest way to compile this package is:
-+
-+  1. `cd' to the directory containing the package's source code and type
-+     `./configure' to configure the package for your system.  If you're
-+     using `csh' on an old version of System V, you might need to type
-+     `sh ./configure' instead to prevent `csh' from trying to execute
-+     `configure' itself.
-+
-+     Running `configure' takes awhile.  While running, it prints some
-+     messages telling which features it is checking for.
-+
-+  2. Type `make' to compile the package.
-+
-+  3. Optionally, type `make check' to run any self-tests that come with
-+     the package.
-+
-+  4. Type `make install' to install the programs and any data files and
-+     documentation.
-+
-+  5. You can remove the program binaries and object files from the
-+     source code directory by typing `make clean'.  To also remove the
-+     files that `configure' created (so you can compile the package for
-+     a different kind of computer), type `make distclean'.  There is
-+     also a `make maintainer-clean' target, but that is intended mainly
-+     for the package's developers.  If you use it, you may have to get
-+     all sorts of other programs in order to regenerate files that came
-+     with the distribution.
-+
-+Compilers and Options
-+=====================
-+
-+   Some systems require unusual options for compilation or linking that
-+the `configure' script does not know about.  You can give `configure'
-+initial values for variables by setting them in the environment.  Using
-+a Bourne-compatible shell, you can do that on the command line like
-+this:
-+     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-+
-+Or on systems that have the `env' program, you can do it like this:
-+     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-+
-+Compiling For Multiple Architectures
-+====================================
-+
-+   You can compile the package for more than one kind of computer at the
-+same time, by placing the object files for each architecture in their
-+own directory.  To do this, you must use a version of `make' that
-+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-+directory where you want the object files and executables to go and run
-+the `configure' script.  `configure' automatically checks for the
-+source code in the directory that `configure' is in and in `..'.
-+
-+   If you have to use a `make' that does not supports the `VPATH'
-+variable, you have to compile the package for one architecture at a time
-+in the source code directory.  After you have installed the package for
-+one architecture, use `make distclean' before reconfiguring for another
-+architecture.
-+
-+Installation Names
-+==================
-+
-+   By default, `make install' will install the package's files in
-+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-+installation prefix other than `/usr/local' by giving `configure' the
-+option `--prefix=PATH'.
-+
-+   You can specify separate installation prefixes for
-+architecture-specific files and architecture-independent files.  If you
-+give `configure' the option `--exec-prefix=PATH', the package will use
-+PATH as the prefix for installing programs and libraries.
-+Documentation and other data files will still use the regular prefix.
-+
-+   In addition, if you use an unusual directory layout you can give
-+options like `--bindir=PATH' to specify different values for particular
-+kinds of files.  Run `configure --help' for a list of the directories
-+you can set and what kinds of files go in them.
-+
-+   If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-+
-+Optional Features
-+=================
-+
-+   Some packages pay attention to `--enable-FEATURE' options to
-+`configure', where FEATURE indicates an optional part of the package.
-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-+is something like `gnu-as' or `x' (for the X Window System).  The
-+`README' should mention any `--enable-' and `--with-' options that the
-+package recognizes.
-+
-+   For packages that use the X Window System, `configure' can usually
-+find the X include and library files automatically, but if it doesn't,
-+you can use the `configure' options `--x-includes=DIR' and
-+`--x-libraries=DIR' to specify their locations.
-+
-+Specifying the System Type
-+==========================
-+
-+   There may be some features `configure' can not figure out
-+automatically, but needs to determine by the type of host the package
-+will run on.  Usually `configure' can figure that out, but if it prints
-+a message saying it can not guess the host type, give it the
-+`--host=TYPE' option.  TYPE can either be a short name for the system
-+type, such as `sun4', or a canonical name with three fields:
-+     CPU-COMPANY-SYSTEM
-+
-+See the file `config.sub' for the possible values of each field.  If
-+`config.sub' isn't included in this package, then this package doesn't
-+need to know the host type.
-+
-+   If you are building compiler tools for cross-compiling, you can also
-+use the `--target=TYPE' option to select the type of system they will
-+produce code for and the `--build=TYPE' option to select the type of
-+system on which you are compiling the package.
-+
-+Sharing Defaults
-+================
-+
-+   If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
-+`configure' looks for `PREFIX/share/config.site' if it exists, then
-+`PREFIX/etc/config.site' if it exists.  Or, you can set the
-+`CONFIG_SITE' environment variable to the location of the site script.
-+A warning: not all `configure' scripts look for a site script.
-+
-+Operation Controls
-+==================
-+
-+   `configure' recognizes the following options to control how it
-+operates.
-+
-+`--cache-file=FILE'
-+     Use and save the results of the tests in FILE instead of
-+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-+     debugging `configure'.
-+
-+`--help'
-+     Print a summary of the options to `configure', and exit.
-+
-+`--quiet'
-+`--silent'
-+`-q'
-+     Do not print messages saying which checks are being made.  To
-+     suppress all normal output, redirect it to `/dev/null' (any error
-+     messages will still be shown).
-+
-+`--srcdir=DIR'
-+     Look for the package's source code in directory DIR.  Usually
-+     `configure' can determine that directory automatically.
-+
-+`--version'
-+     Print the version of Autoconf used to generate the `configure'
-+     script, and exit.
-+
-+`configure' also accepts some other, not widely useful, options.
---- metamail-2.7.orig/COPYING
-+++ metamail-2.7/COPYING
-@@ -0,0 +1,340 @@
-+		    GNU GENERAL PUBLIC LICENSE
-+		       Version 2, June 1991
-+
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+			    Preamble
-+
-+  The licenses for most software are designed to take away your
-+freedom to share and change it.  By contrast, the GNU General Public
-+License is intended to guarantee your freedom to share and change free
-+software--to make sure the software is free for all its users.  This
-+General Public License applies to most of the Free Software
-+Foundation's software and to any other program whose authors commit to
-+using it.  (Some other Free Software Foundation software is covered by
-+the GNU Library General Public License instead.)  You can apply it to
-+your programs, too.
-+
-+  When we speak of free software, we are referring to freedom, not
-+price.  Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+this service if you wish), that you receive source code or can get it
-+if you want it, that you can change the software or use pieces of it
-+in new free programs; and that you know you can do these things.
-+
-+  To protect your rights, we need to make restrictions that forbid
-+anyone to deny you these rights or to ask you to surrender the rights.
-+These restrictions translate to certain responsibilities for you if you
-+distribute copies of the software, or if you modify it.
-+
-+  For example, if you distribute copies of such a program, whether
-+gratis or for a fee, you must give the recipients all the rights that
-+you have.  You must make sure that they, too, receive or can get the
-+source code.  And you must show them these terms so they know their
-+rights.
-+
-+  We protect your rights with two steps: (1) copyright the software, and
-+(2) offer you this license which gives you legal permission to copy,
-+distribute and/or modify the software.
-+
-+  Also, for each author's protection and ours, we want to make certain
-+that everyone understands that there is no warranty for this free
-+software.  If the software is modified by someone else and passed on, we
-+want its recipients to know that what they have is not the original, so
-+that any problems introduced by others will not reflect on the original
-+authors' reputations.
-+
-+  Finally, any free program is threatened constantly by software
-+patents.  We wish to avoid the danger that redistributors of a free
-+program will individually obtain patent licenses, in effect making the
-+program proprietary.  To prevent this, we have made it clear that any
-+patent must be licensed for everyone's free use or not licensed at all.
-+
-+  The precise terms and conditions for copying, distribution and
-+modification follow.
-+
-+		    GNU GENERAL PUBLIC LICENSE
-+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+  0. This License applies to any program or other work which contains
-+a notice placed by the copyright holder saying it may be distributed
-+under the terms of this General Public License.  The "Program", below,
-+refers to any such program or work, and a "work based on the Program"
-+means either the Program or any derivative work under copyright law:
-+that is to say, a work containing the Program or a portion of it,
-+either verbatim or with modifications and/or translated into another
-+language.  (Hereinafter, translation is included without limitation in
-+the term "modification".)  Each licensee is addressed as "you".
-+
-+Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope.  The act of
-+running the Program is not restricted, and the output from the Program
-+is covered only if its contents constitute a work based on the
-+Program (independent of having been made by running the Program).
-+Whether that is true depends on what the Program does.
-+
-+  1. You may copy and distribute verbatim copies of the Program's
-+source code as you receive it, in any medium, provided that you
-+conspicuously and appropriately publish on each copy an appropriate
-+copyright notice and disclaimer of warranty; keep intact all the
-+notices that refer to this License and to the absence of any warranty;
-+and give any other recipients of the Program a copy of this License
-+along with the Program.
-+
-+You may charge a fee for the physical act of transferring a copy, and
-+you may at your option offer warranty protection in exchange for a fee.
-+
-+  2. You may modify your copy or copies of the Program or any portion
-+of it, thus forming a work based on the Program, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+    a) You must cause the modified files to carry prominent notices
-+    stating that you changed the files and the date of any change.
-+
-+    b) You must cause any work that you distribute or publish, that in
-+    whole or in part contains or is derived from the Program or any
-+    part thereof, to be licensed as a whole at no charge to all third
-+    parties under the terms of this License.
-+
-+    c) If the modified program normally reads commands interactively
-+    when run, you must cause it, when started running for such
-+    interactive use in the most ordinary way, to print or display an
-+    announcement including an appropriate copyright notice and a
-+    notice that there is no warranty (or else, saying that you provide
-+    a warranty) and that users may redistribute the program under
-+    these conditions, and telling the user how to view a copy of this
-+    License.  (Exception: if the Program itself is interactive but
-+    does not normally print such an announcement, your work based on
-+    the Program is not required to print an announcement.)
-+
-+These requirements apply to the modified work as a whole.  If
-+identifiable sections of that work are not derived from the Program,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works.  But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Program, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Program.
-+
-+In addition, mere aggregation of another work not based on the Program
-+with the Program (or with a work based on the Program) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+  3. You may copy and distribute the Program (or a work based on it,
-+under Section 2) in object code or executable form under the terms of
-+Sections 1 and 2 above provided that you also do one of the following:
-+
-+    a) Accompany it with the complete corresponding machine-readable
-+    source code, which must be distributed under the terms of Sections
-+    1 and 2 above on a medium customarily used for software interchange; or,
-+
-+    b) Accompany it with a written offer, valid for at least three
-+    years, to give any third party, for a charge no more than your
-+    cost of physically performing source distribution, a complete
-+    machine-readable copy of the corresponding source code, to be
-+    distributed under the terms of Sections 1 and 2 above on a medium
-+    customarily used for software interchange; or,
-+
-+    c) Accompany it with the information you received as to the offer
-+    to distribute corresponding source code.  (This alternative is
-+    allowed only for noncommercial distribution and only if you
-+    received the program in object code or executable form with such
-+    an offer, in accord with Subsection b above.)
-+
-+The source code for a work means the preferred form of the work for
-+making modifications to it.  For an executable work, complete source
-+code means all the source code for all modules it contains, plus any
-+associated interface definition files, plus the scripts used to
-+control compilation and installation of the executable.  However, as a
-+special exception, the source code distributed need not include
-+anything that is normally distributed (in either source or binary
-+form) with the major components (compiler, kernel, and so on) of the
-+operating system on which the executable runs, unless that component
-+itself accompanies the executable.
-+
-+If distribution of executable or object code is made by offering
-+access to copy from a designated place, then offering equivalent
-+access to copy the source code from the same place counts as
-+distribution of the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+  4. You may not copy, modify, sublicense, or distribute the Program
-+except as expressly provided under this License.  Any attempt
-+otherwise to copy, modify, sublicense or distribute the Program is
-+void, and will automatically terminate your rights under this License.
-+However, parties who have received copies, or rights, from you under
-+this License will not have their licenses terminated so long as such
-+parties remain in full compliance.
-+
-+  5. You are not required to accept this License, since you have not
-+signed it.  However, nothing else grants you permission to modify or
-+distribute the Program or its derivative works.  These actions are
-+prohibited by law if you do not accept this License.  Therefore, by
-+modifying or distributing the Program (or any work based on the
-+Program), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Program or works based on it.
-+
-+  6. Each time you redistribute the Program (or any work based on the
-+Program), the recipient automatically receives a license from the
-+original licensor to copy, distribute or modify the Program subject to
-+these terms and conditions.  You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties to
-+this License.
-+
-+  7. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License.  If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Program at all.  For example, if a patent
-+license would not permit royalty-free redistribution of the Program by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Program.
-+
-+If any portion of this section is held invalid or unenforceable under
-+any particular circumstance, the balance of the section is intended to
-+apply and the section as a whole is intended to apply in other
-+circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system, which is
-+implemented by public license practices.  Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+  8. If the distribution and/or use of the Program is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Program under this License
-+may add an explicit geographical distribution limitation excluding
-+those countries, so that distribution is permitted only in or among
-+countries not thus excluded.  In such case, this License incorporates
-+the limitation as if written in the body of this License.
-+
-+  9. The Free Software Foundation may publish revised and/or new versions
-+of the General Public License from time to time.  Such new versions will
-+be similar in spirit to the present version, but may differ in detail to
-+address new problems or concerns.
-+
-+Each version is given a distinguishing version number.  If the Program
-+specifies a version number of this License which applies to it and "any
-+later version", you have the option of following the terms and conditions
-+either of that version or of any later version published by the Free
-+Software Foundation.  If the Program does not specify a version number of
-+this License, you may choose any version ever published by the Free Software
-+Foundation.
-+
-+  10. If you wish to incorporate parts of the Program into other free
-+programs whose distribution conditions are different, write to the author
-+to ask for permission.  For software which is copyrighted by the Free
-+Software Foundation, write to the Free Software Foundation; we sometimes
-+make exceptions for this.  Our decision will be guided by the two goals
-+of preserving the free status of all derivatives of our free software and
-+of promoting the sharing and reuse of software generally.
-+
-+			    NO WARRANTY
-+
-+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-+REPAIR OR CORRECTION.
-+
-+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGES.
-+
-+		     END OF TERMS AND CONDITIONS
-+
-+	    How to Apply These Terms to Your New Programs
-+
-+  If you develop a new program, and you want it to be of the greatest
-+possible use to the public, the best way to achieve this is to make it
-+free software which everyone can redistribute and change under these terms.
-+
-+  To do so, attach the following notices to the program.  It is safest
-+to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least
-+the "copyright" line and a pointer to where the full notice is found.
-+
-+    <one line to give the program's name and a brief idea of what it does.>
-+    Copyright (C) <year>  <name of author>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+If the program is interactive, make it output a short notice like this
-+when it starts in an interactive mode:
-+
-+    Gnomovision version 69, Copyright (C) year  name of author
-+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-+    This is free software, and you are welcome to redistribute it
-+    under certain conditions; type `show c' for details.
-+
-+The hypothetical commands `show w' and `show c' should show the appropriate
-+parts of the General Public License.  Of course, the commands you use may
-+be called something other than `show w' and `show c'; they could even be
-+mouse-clicks or menu items--whatever suits your program.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the program, if
-+necessary.  Here is a sample; alter the names:
-+
-+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-+
-+  <signature of Ty Coon>, 1 April 1989
-+  Ty Coon, President of Vice
-+
-+This General Public License does not permit incorporating your program into
-+proprietary programs.  If your program is a subroutine library, you may
-+consider it more useful to permit linking proprietary applications with the
-+library.  If this is what you want to do, use the GNU Library General
-+Public License instead of this License.
---- metamail-2.7.orig/bootstrap
-+++ metamail-2.7/bootstrap
-@@ -0,0 +1,9 @@
-+#! /bin/sh
-+
-+set -x
-+
-+aclocal -I config
-+libtoolize --force --copy
-+autoheader
-+automake --foreign --add-missing --copy
-+autoconf
diff --git a/source/n/metamail/metamail_2.7-54.diff b/source/n/metamail/metamail_2.7-54.diff
new file mode 100644
index 000000000..a8e1f9807
--- /dev/null
+++ b/source/n/metamail/metamail_2.7-54.diff
@@ -0,0 +1,43055 @@
+--- metamail-2.7.orig/INSTALL
++++ metamail-2.7/INSTALL
+@@ -0,0 +1,182 @@
++Basic Installation
++==================
++
++   These are generic installation instructions.
++
++   The `configure' shell script attempts to guess correct values for
++various system-dependent variables used during compilation.  It uses
++those values to create a `Makefile' in each directory of the package.
++It may also create one or more `.h' files containing system-dependent
++definitions.  Finally, it creates a shell script `config.status' that
++you can run in the future to recreate the current configuration, a file
++`config.cache' that saves the results of its tests to speed up
++reconfiguring, and a file `config.log' containing compiler output
++(useful mainly for debugging `configure').
++
++   If you need to do unusual things to compile the package, please try
++to figure out how `configure' could check whether to do them, and mail
++diffs or instructions to the address given in the `README' so they can
++be considered for the next release.  If at some point `config.cache'
++contains results you don't want to keep, you may remove or edit it.
++
++   The file `configure.in' is used to create `configure' by a program
++called `autoconf'.  You only need `configure.in' if you want to change
++it or regenerate `configure' using a newer version of `autoconf'.
++
++The simplest way to compile this package is:
++
++  1. `cd' to the directory containing the package's source code and type
++     `./configure' to configure the package for your system.  If you're
++     using `csh' on an old version of System V, you might need to type
++     `sh ./configure' instead to prevent `csh' from trying to execute
++     `configure' itself.
++
++     Running `configure' takes awhile.  While running, it prints some
++     messages telling which features it is checking for.
++
++  2. Type `make' to compile the package.
++
++  3. Optionally, type `make check' to run any self-tests that come with
++     the package.
++
++  4. Type `make install' to install the programs and any data files and
++     documentation.
++
++  5. You can remove the program binaries and object files from the
++     source code directory by typing `make clean'.  To also remove the
++     files that `configure' created (so you can compile the package for
++     a different kind of computer), type `make distclean'.  There is
++     also a `make maintainer-clean' target, but that is intended mainly
++     for the package's developers.  If you use it, you may have to get
++     all sorts of other programs in order to regenerate files that came
++     with the distribution.
++
++Compilers and Options
++=====================
++
++   Some systems require unusual options for compilation or linking that
++the `configure' script does not know about.  You can give `configure'
++initial values for variables by setting them in the environment.  Using
++a Bourne-compatible shell, you can do that on the command line like
++this:
++     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
++
++Or on systems that have the `env' program, you can do it like this:
++     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
++
++Compiling For Multiple Architectures
++====================================
++
++   You can compile the package for more than one kind of computer at the
++same time, by placing the object files for each architecture in their
++own directory.  To do this, you must use a version of `make' that
++supports the `VPATH' variable, such as GNU `make'.  `cd' to the
++directory where you want the object files and executables to go and run
++the `configure' script.  `configure' automatically checks for the
++source code in the directory that `configure' is in and in `..'.
++
++   If you have to use a `make' that does not supports the `VPATH'
++variable, you have to compile the package for one architecture at a time
++in the source code directory.  After you have installed the package for
++one architecture, use `make distclean' before reconfiguring for another
++architecture.
++
++Installation Names
++==================
++
++   By default, `make install' will install the package's files in
++`/usr/local/bin', `/usr/local/man', etc.  You can specify an
++installation prefix other than `/usr/local' by giving `configure' the
++option `--prefix=PATH'.
++
++   You can specify separate installation prefixes for
++architecture-specific files and architecture-independent files.  If you
++give `configure' the option `--exec-prefix=PATH', the package will use
++PATH as the prefix for installing programs and libraries.
++Documentation and other data files will still use the regular prefix.
++
++   In addition, if you use an unusual directory layout you can give
++options like `--bindir=PATH' to specify different values for particular
++kinds of files.  Run `configure --help' for a list of the directories
++you can set and what kinds of files go in them.
++
++   If the package supports it, you can cause programs to be installed
++with an extra prefix or suffix on their names by giving `configure' the
++option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
++
++Optional Features
++=================
++
++   Some packages pay attention to `--enable-FEATURE' options to
++`configure', where FEATURE indicates an optional part of the package.
++They may also pay attention to `--with-PACKAGE' options, where PACKAGE
++is something like `gnu-as' or `x' (for the X Window System).  The
++`README' should mention any `--enable-' and `--with-' options that the
++package recognizes.
++
++   For packages that use the X Window System, `configure' can usually
++find the X include and library files automatically, but if it doesn't,
++you can use the `configure' options `--x-includes=DIR' and
++`--x-libraries=DIR' to specify their locations.
++
++Specifying the System Type
++==========================
++
++   There may be some features `configure' can not figure out
++automatically, but needs to determine by the type of host the package
++will run on.  Usually `configure' can figure that out, but if it prints
++a message saying it can not guess the host type, give it the
++`--host=TYPE' option.  TYPE can either be a short name for the system
++type, such as `sun4', or a canonical name with three fields:
++     CPU-COMPANY-SYSTEM
++
++See the file `config.sub' for the possible values of each field.  If
++`config.sub' isn't included in this package, then this package doesn't
++need to know the host type.
++
++   If you are building compiler tools for cross-compiling, you can also
++use the `--target=TYPE' option to select the type of system they will
++produce code for and the `--build=TYPE' option to select the type of
++system on which you are compiling the package.
++
++Sharing Defaults
++================
++
++   If you want to set default values for `configure' scripts to share,
++you can create a site shell script called `config.site' that gives
++default values for variables like `CC', `cache_file', and `prefix'.
++`configure' looks for `PREFIX/share/config.site' if it exists, then
++`PREFIX/etc/config.site' if it exists.  Or, you can set the
++`CONFIG_SITE' environment variable to the location of the site script.
++A warning: not all `configure' scripts look for a site script.
++
++Operation Controls
++==================
++
++   `configure' recognizes the following options to control how it
++operates.
++
++`--cache-file=FILE'
++     Use and save the results of the tests in FILE instead of
++     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
++     debugging `configure'.
++
++`--help'
++     Print a summary of the options to `configure', and exit.
++
++`--quiet'
++`--silent'
++`-q'
++     Do not print messages saying which checks are being made.  To
++     suppress all normal output, redirect it to `/dev/null' (any error
++     messages will still be shown).
++
++`--srcdir=DIR'
++     Look for the package's source code in directory DIR.  Usually
++     `configure' can determine that directory automatically.
++
++`--version'
++     Print the version of Autoconf used to generate the `configure'
++     script, and exit.
++
++`configure' also accepts some other, not widely useful, options.
+--- metamail-2.7.orig/Makefile.am
++++ metamail-2.7/Makefile.am
+@@ -0,0 +1,14 @@
++## Makefile.am -- Process this file with automake to produce Makefile.in
++
++auxdir                  = @ac_aux_dir@
++AUX_DIST                = $(auxdir)/install-sh $(auxdir)/missing \
++                        $(auxdir)/mkinstalldirs
++AUX_DIST_EXTRA          = $(auxdir)/readline.m4 $(auxdir)/sys_errlist.m4 \
++                        $(auxdir)/sys_siglist.m4
++EXTRA_DIST              = bootstrap
++
++MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure \
++			metamail/config-h.in metamail/stamp-h.in
++
++SUBDIRS                 = replace metamail src bin 
++ACLOCAL                 = aclocal -I $(auxdir)
+--- metamail-2.7.orig/Makefile.in
++++ metamail-2.7/Makefile.in
+@@ -0,0 +1,349 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = .
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++auxdir = @ac_aux_dir@
++AUX_DIST = $(auxdir)/install-sh $(auxdir)/missing                         $(auxdir)/mkinstalldirs
++
++AUX_DIST_EXTRA = $(auxdir)/readline.m4 $(auxdir)/sys_errlist.m4                         $(auxdir)/sys_siglist.m4
++
++EXTRA_DIST = bootstrap
++
++MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure 			metamail/config-h.in metamail/stamp-h.in
++
++
++SUBDIRS = replace metamail src bin 
++ACLOCAL = aclocal -I $(auxdir)
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = ./metamail/config.h
++CONFIG_CLEAN_FILES = 
++DIST_COMMON =  README COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \
++configure configure.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++all: all-redirect
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
++	cd $(srcdir) && $(ACLOCAL)
++
++config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	$(SHELL) ./config.status --recheck
++$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
++	cd $(srcdir) && $(AUTOCONF)
++
++# This directory's subdirectories are mostly independent; you can cd
++# into them and run `make' without going through this Makefile.
++# To change the values of `make' variables: instead of editing Makefiles,
++# (1) if the variable is set in `config.status', edit `config.status'
++#     (which will cause the Makefiles to be regenerated when you run `make');
++# (2) otherwise, pass the desired values on the `make' command line.
++
++@SET_MAKE@
++
++all-recursive install-data-recursive install-exec-recursive \
++installdirs-recursive install-recursive uninstall-recursive  \
++check-recursive installcheck-recursive info-recursive dvi-recursive:
++	@set fnord $(MAKEFLAGS); amf=$$2; \
++	dot_seen=no; \
++	target=`echo $@ | sed s/-recursive//`; \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    dot_seen=yes; \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	done; \
++	if test "$$dot_seen" = "no"; then \
++	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
++	fi; test -z "$$fail"
++
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
++	@set fnord $(MAKEFLAGS); amf=$$2; \
++	dot_seen=no; \
++	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
++	  rev="$$subdir $$rev"; \
++	  test "$$subdir" != "." || dot_seen=yes; \
++	done; \
++	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	target=`echo $@ | sed s/-recursive//`; \
++	for subdir in $$rev; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	done && test -z "$$fail"
++tags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++	done
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++   if test "$$subdir" = .; then :; else \
++	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
++   fi; \
++	done; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(PACKAGE)-$(VERSION)
++top_distdir = $(distdir)
++
++# This target untars the dist file and tries a VPATH configuration.  Then
++# it guarantees that the distribution is self-contained by making another
++# tarfile.
++distcheck: dist
++	-rm -rf $(distdir)
++	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
++	mkdir $(distdir)/=build
++	mkdir $(distdir)/=inst
++	dc_install_base=`cd $(distdir)/=inst && pwd`; \
++	cd $(distdir)/=build \
++	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
++	  && $(MAKE) $(AM_MAKEFLAGS) \
++	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
++	  && $(MAKE) $(AM_MAKEFLAGS) check \
++	  && $(MAKE) $(AM_MAKEFLAGS) install \
++	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
++	  && $(MAKE) $(AM_MAKEFLAGS) dist
++	-rm -rf $(distdir)
++	@banner="$(distdir).tar.gz is ready for distribution"; \
++	dashes=`echo "$$banner" | sed s/./=/g`; \
++	echo "$$dashes"; \
++	echo "$$banner"; \
++	echo "$$dashes"
++dist: distdir
++	-chmod -R a+r $(distdir)
++	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
++	-rm -rf $(distdir)
++dist-all: distdir
++	-chmod -R a+r $(distdir)
++	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
++	-rm -rf $(distdir)
++distdir: $(DISTFILES)
++	-rm -rf $(distdir)
++	mkdir $(distdir)
++	-chmod 777 $(distdir)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++	for subdir in $(SUBDIRS); do \
++	  if test "$$subdir" = .; then :; else \
++	    test -d $(distdir)/$$subdir \
++	    || mkdir $(distdir)/$$subdir \
++	    || exit 1; \
++	    chmod 777 $(distdir)/$$subdir; \
++	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
++	      || exit 1; \
++	  fi; \
++	done
++info-am:
++info: info-recursive
++dvi-am:
++dvi: dvi-recursive
++check-am: all-am
++check: check-recursive
++installcheck-am:
++installcheck: installcheck-recursive
++install-exec-am:
++install-exec: install-exec-recursive
++
++install-data-am:
++install-data: install-data-recursive
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-recursive
++uninstall-am:
++uninstall: uninstall-recursive
++all-am: Makefile
++all-redirect: all-recursive
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs: installdirs-recursive
++installdirs-am:
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-tags mostlyclean-generic
++
++mostlyclean: mostlyclean-recursive
++
++clean-am:  clean-tags clean-generic mostlyclean-am
++
++clean: clean-recursive
++
++distclean-am:  distclean-tags distclean-generic clean-am
++	-rm -f libtool
++
++distclean: distclean-recursive
++	-rm -f config.status
++
++maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
++		distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-recursive
++	-rm -f config.status
++
++.PHONY: install-data-recursive uninstall-data-recursive \
++install-exec-recursive uninstall-exec-recursive installdirs-recursive \
++uninstalldirs-recursive all-recursive check-recursive \
++installcheck-recursive info-recursive dvi-recursive \
++mostlyclean-recursive distclean-recursive clean-recursive \
++maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
++distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs-am \
++installdirs mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/src/Makefile.am
++++ metamail-2.7/src/Makefile.am
+@@ -0,0 +1,3 @@
++MAINTAINERCLEANFILES	= Makefile.in
++
++SUBDIRS			= metamail richmail
+--- metamail-2.7.orig/src/richmail/usascii.c
++++ metamail-2.7/src/richmail/usascii.c
+@@ -0,0 +1,129 @@
++/*-------------------------------------------------------------------------
++
++  usascii.c - Code for the US-ASCII specific parts of the richtext processor.
++ 
++  Copyright (c) 1992 Rhys Weatherley
++
++  Permission to use, copy, modify, and distribute this material
++  for any purpose and without fee is hereby granted, provided
++  that the above copyright notice and this permission notice
++  appear in all copies, and that the name of Rhys Weatherley not be
++  used in advertising or publicity pertaining to this
++  material without specific, prior written permission.
++  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
++  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
++  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++  Revision History:
++  ================
++
++   Version  DD/MM/YY  By  Description
++   -------  --------  --  --------------------------------------
++     1.0    21/06/92  RW  Original Version of usascii.c
++
++  You may contact the author by:
++  =============================
++
++   e-mail: rhys@cs.uq.oz.au
++     mail: Rhys Weatherley
++	   5 Horizon Drive
++	   Jamboree Heights
++	   Queensland 4074
++	   Australia
++
++-------------------------------------------------------------------------*/
++
++#include <stdio.h>
++#include <metamail/common.h>
++
++#include "richlex.h"
++#include "richset.h"
++
++/*
++ * Initialise the US-ASCII character set processor.
++ */
++usascii_init (name)
++char	*name;
++{
++    if (name)
++	richtextencoding (RICH_ENC_US_ASCII);
++}
++
++/*
++ * Process a command for the US-ASCII processor.
++ */
++int	usascii_command (token,negated)
++char	*token;
++int	negated;
++{
++    if (!strcmp(token,"us-ascii")) {
++    	if (negated) {
++	    charsetpop (&usascii_charset);
++	} else {
++	    charsetpush (&usascii_charset);
++	    richtextencoding (RICH_ENC_US_ASCII);
++	}
++	return (1);
++    } else {
++    	return (0);
++    }
++}
++
++/*
++ * Check for singleton US-ASCII tokens.
++ */
++int	usascii_single (token)
++char	*token;
++{
++    return (0);
++}
++
++/*
++ * Determine the width of a US-ASCII character.
++ */
++int	usascii_width (ch)
++RCHAR	ch;
++{
++    return (1);
++}
++
++/*
++ * Determine if the current character can be used as a folding point.
++ */
++int	usascii_fold (ch)
++RCHAR	ch;
++{
++    return (ch < 0x7F && isspace (ch));
++}
++
++/*
++ * Render the given US-ASCII character.
++ */
++usascii_render (ch,param)
++RCHAR	ch;
++void	*param;
++{
++    (*RichtextPutc) ((int)ch,param);
++}
++
++/*
++ * Enter or leave the US-ASCII encoding.
++ */
++usascii_encoding (newenc)
++int	newenc;
++{
++    /* Nothing to be done in this version */
++}
++
++/*
++ * Define the US-ASCII character set processor.
++ */
++struct 	charsetproc	usascii_charset =
++	  {"us-ascii",
++	   usascii_init,
++	   usascii_command,
++	   usascii_single,
++	   usascii_width,
++	   usascii_fold,
++	   usascii_render,
++	   usascii_encoding};
+--- metamail-2.7.orig/src/richmail/richtoatk.c
++++ metamail-2.7/src/richmail/richtoatk.c
+@@ -0,0 +1,98 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++#include <metamail/common.h>
++
++#include "richlex.h"
++
++char *translate(t)
++char *t;
++{
++    if (!strcmp(t, "fixed")) return("typewriter");
++    if (!strcmp(t, "excerpt")) return("quotation");
++    /* Really ought to handle ISO-10646 and ISO-8859-X somehow */
++    return(t);
++}
++
++main() {
++    RCHAR c;
++    int i, JustDidNewline = 0;
++    char tok[MAX_TOKEN_SIZE + 1],*token;
++
++    fputs("\\begindata{text, 42}\n\\template{messages}\n", stdout);
++    /* The 0, 0 means that we're not implementing text/enriched */
++    while((c = richtextlex(stdin,tok + 1, 0, 0)) != (RCHAR)EOF) {
++	if (c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND) {
++	    if (c == RICHTEXT_NEG_COMMAND) {
++		tok[0] = '/';
++		token = tok;
++	    } else
++		token = tok + 1;
++            if (!strcmp(token, "lt")) {
++                putc('<', stdout);
++                JustDidNewline = 0;
++            } else if (!strcmp(token, "nl")) {
++                fputs(JustDidNewline ? "\n" : "\n\n", stdout);
++                JustDidNewline = 1;
++            } else if (!strcmp(token, "/paragraph")) {
++                fputs(JustDidNewline ? "\n\n" : "\n\n\n", stdout);
++                JustDidNewline = 1;
++            } else if (!strcmp(token, "comment")) {
++	        int tempc;
++                while (strcmp(token, "/comment")) {
++                    while ((tempc = getc(stdin)) != '<') ;
++                    for (i=0; (tempc = getc(stdin)) != '>'; ++i) {
++                        token[i] = isupper(tempc) ? tolower(tempc) : tempc;
++                    }
++                    token[i] = '\0';
++                }
++            } else if (!ignoretoken(token)) {
++                if (token[0] == '/') {
++                    putc('}', stdout);
++                } else {
++                    fprintf(stdout, "\\%s{", translate(token));
++                    JustDidNewline = 0;
++                }
++            }
++        } else if (c == '\n') {
++            putc(' ', stdout);
++            JustDidNewline = 0;
++        } else {
++            putc((int)c, stdout);
++            JustDidNewline = 0;
++        }
++    }
++    fputs("\n \n\\enddata{text, 42}\n", stdout);
++}
++
++ignoretoken(t)
++char *t;
++{
++    if (*t == '/') ++t;
++    if (!strcmp(t, "us-ascii")) return(1);
++    if (!strcmp(t, "paragraph")) return(1); /* handled otherwise */
++    if (!strcmp(t, "no-op")) return(1);
++    return(0);
++}
++
++controlputc(c)
++int c;
++{
++}
++
++controloutput(s, immediate)
++char *s;
++int immediate;
++{
++}
+--- metamail-2.7.orig/src/richmail/NOTES
++++ metamail-2.7/src/richmail/NOTES
+@@ -0,0 +1,7 @@
++
++"richtext.c" may be used as a library in another program, by defining the
++macro RICHTEXT_LIBRARY when it is compiled and calling the function
++"richtext_main(argc, argv)" with the arguments set to the normal richtext
++command-line arguments.  It is also necessary to link with "richlex.c",
++"richset.c", "usascii.c" and "iso2022.c" which provide services to
++"richtext.c".
+--- metamail-2.7.orig/src/richmail/COMMANDS
++++ metamail-2.7/src/richmail/COMMANDS
+@@ -0,0 +1,29 @@
++Commands for changing character sets in richtext:
++
++Japanese:
++
++<iso-2022-jp>		ISO-2022 encoding for mixed US-ASCII and JIS.
++<x-jis-x0201-1976>	Variant of US-ASCII for Japan.
++<x-jis-x0201>		Variant of US-ASCII for Japan.
++<x-jis-x0208-1978>	JIS X 0208-1978
++<x-jis-x0208-1983>	JIS X 0208-1983
++<x-jis-x0208>		JIS X 0208-1983
++
++Korean:
++
++<iso-2022-kr>		ISO-2022 encoding for mixed US-ASCII and Korean.
++<x-ksc-5601>		2-byte encoding of Hangul without shift/escape seqs.
++
++Internal commands:
++
++<x-iso-2022-gen-HH>	Used for ISO-2022 escape seqences.
++<x-iso-shift-in>	SI character
++<x-iso-shift-out>	SO character
++<x-iso-charset-HH>	Used for ISO-2022 ESC$)? character set designators.
++
++Notes:
++
++<iso-2022-*> text sequences may contain ISO-2022 escape sequences for changing
++character sets.  <x-jis-*-*> and <x-ksc-*> text sequences can also contain
++such escape sequences, but they start out in 2-byte mode, and are intended
++mainly for 2-byte character sequences, rather than a mixture.
+--- metamail-2.7.orig/src/richmail/richtext.c
++++ metamail-2.7/src/richmail/richtext.c
+@@ -0,0 +1,905 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++
++#include <metamail/common.h>
++
++#include <curses.h>  /* This and next for tgetstr(3X) and kin */
++#include <term.h>
++
++#include "richlex.h"
++#include "richset.h"
++
++int iso2022_fputc ();
++
++/*
++ * ########################################################################
++ * The function "InitGlobals" must be updated whenever a new variable is
++ * added here or a default value is changed.  The same must be done for
++ * the next section of variables also.  This is needed because this module
++ * could be linked into another program as a library and called more than
++ * once in a single program execution.
++ * ########################################################################
++ */
++static int linepos = 0, inspace = 0, leftmargin = 0, rightmargin, biggertext=0;
++static int workingleft = 0, workingright, inexcerpt = 0, insignature = 0;
++static int highlight=0, underline=0, bold=0, nofill=0;
++static int termcolumns=80, termrows=23;
++int controlputc();
++
++/* A common problem, in justifying text, is figuring out how to format a 
++   line when part of it wants to be left-justified, part right-justified, 
++   and part centered, or some combination thereof.  There is no perfect 
++   solution to this problem, so this program takes an incredibly cheesy 
++   but simple way out:  voting.  For each character on the line, a point
++   is added to the "center" score if it is supposed to be centered, and 
++   so on.  If it is inside TWO "center" environments, two points are added.
++   This may be the world's first implementation of justification by voting...
++*/
++
++static int centerenv=0, leftjustenv=0, rightjustenv=0;
++static int centerct=0, leftjustct=0, rightjustct=0;
++static int UsePager = 0;
++static int linesused = 0;
++static int JustSawCmd=0;
++static int JustCorrect = 0;	/* Non-zero to just correct and not format */
++static int OverStrike = 0;
++static int TextEnriched = 0;
++static char MoveRight[10];
++static char highlightbuf[50], highlightendbuf[50], StartUnderline[50], StopUnderline[50];
++static char KS[50], KE[50], BoldOn[50], BoldOff[50];
++static char charsetname[50];
++static int FakeTerminal;
++
++extern tputs();
++
++static outputc(), realoutputc(), MakeWorkingMargins(), Pause(), fputsmovingright(), ResetTerminalCodes(), FinalizeTerminal(), outputstr(), FPUTS(), lc2strcmp();
++
++#define	OUTC(c)		(outputc((RCHAR)(c)))
++
++static void
++InitGlobals()
++{
++    linepos = 0;
++    inspace = 0;
++    leftmargin = 0;
++    biggertext = 0;
++    workingleft = 0;
++    inexcerpt = 0;
++    insignature = 0;
++    termcolumns = 80;
++    termrows = 23;
++    centerenv = 0;
++    leftjustenv = 0;
++    rightjustenv = 0;
++    centerct = 0;
++    leftjustct = 0;
++    rightjustct = 0;
++    UsePager = 0;
++    linesused = 0;
++    JustSawCmd = 0;
++    JustCorrect = 0;
++    highlight = 0;
++    underline = 0;
++    bold = 0;
++    TextEnriched = 0;
++    nofill = 0;
++}
++
++static void
++cleanup(signum)
++int signum;
++{
++    FinalizeTerminal();
++    signal(signum, SIG_DFL);
++    kill(getpid(), signum);
++}
++
++static InitSignals() {
++    signal(SIGINT, cleanup);
++    signal(SIGILL, cleanup);
++    signal(SIGTRAP, cleanup);
++    signal(SIGIOT, cleanup);
++    signal(SIGFPE, cleanup);
++#ifndef linux
++    signal(SIGEMT, cleanup);
++    signal(SIGBUS, cleanup);
++#endif
++    signal(SIGSEGV, cleanup);
++    signal(SIGTERM, cleanup);
++#ifdef SIGXCPU
++    signal(SIGXCPU, cleanup);
++#endif
++}
++
++static nomemabort() {
++    fprintf(stderr, "richtext: Out of memory\n");
++    FinalizeTerminal();
++    exit(-1);
++}
++
++#ifndef	RICHTEXT_LIBRARY
++
++/*
++ * Only include the main function if this module is not being used as a
++ * library call.
++ */
++
++main(argc, argv)
++int argc;
++char **argv;
++{
++  exit(richtext_main(argc, argv));
++}
++
++#endif
++
++richtext_main(argc, argv)
++int argc;
++char **argv;
++{
++    RCHAR c;
++    int i, atstart, negated,
++    ForceTermcap=0, ForcePlain=0, NotTtyEnv = 0;
++    char token[MAX_TOKEN_SIZE], *tok, *nottty;
++    char tbuf[1024], *term, *dum;
++    FILE *InputFP = stdin, *tmpfp;
++
++    InitSignals();
++    InitGlobals();
++    richtextreset();
++    strcpy(charsetname,"us-ascii");
++    dum = (char *) getenv("MM_USEPAGER");
++    if (dum && atoi(dum)) ++UsePager;
++    for (i=1; i< argc; ++i) {
++        if (!strcmp(argv[i], "-p")) {
++            ++UsePager;
++        } else if (!strcmp(argv[i],"-c")) {
++            /* Only perform correction: don't format */
++            JustCorrect = 1;
++        } else if (!strcmp(argv[i], "-f")) {
++            /* Force termcap usage */
++            ForceTermcap = 1;
++        } else if (!strcmp(argv[i], "-t")) {
++            /* Force plain text */
++            ForcePlain = 1;
++        } else if (!strcmp(argv[i],"-n")) {
++            /* Disable the richtext correction routines */
++            CorrectionEnabled = 0;
++        } else if (!strcmp(argv[i],"-m")) {
++            /* Enable the multi-byte '<' hack */
++            RichtextLessThanFlag = 1;
++	} else if (!strncmp(argv[i], "-s", 2)) {
++	    /* Specify the character set to use (and convert to lower case) */
++	    char *name;
++	    if (argv[i][2])
++		strcpy(charsetname, argv[i] + 2);
++	    else if (i < (argc - 1))
++		strcpy(charsetname, argv[++i]);
++	    name = charsetname;
++	    while (*name) {
++		if (isupper(*name))
++		    *name = tolower(*name);
++		++name;
++	    }
++	} else if (!strcmp(argv[i], "-o")) {
++	    /* Use Overstriking */
++	    OverStrike = 1;
++	    ForcePlain = 1;
++	} else if (!strcmp(argv[i], "-e")) {
++		/* Work with text/enriched instead of text/richtext */
++		TextEnriched = 1;
++        } else {
++            /* open for input */
++            tmpfp = fopen(argv[i], "r");
++            if (tmpfp)
++	    	InputFP = tmpfp;
++	    else {
++	    	perror (argv[i]);
++		exit (1);
++	    }
++        }
++    }
++    /* THIS IS THE UNIX TERMINAL INITIALIZATION CODE */
++    nottty = (char *) getenv("MM_NOTTTY");
++    if (nottty) NotTtyEnv = atoi(nottty);
++    if (UsePager && (!isatty(0) || !isatty(1) || NotTtyEnv)) {
++        UsePager = 0;   /* Disable pager if I/O has been redirected or we're under a window-oriented mail reader */
++    }
++    if ((!ForcePlain && (isatty(1) || isatty(0))) || ForceTermcap) {
++        term = (char *) getenv("TERM");
++    } else {
++        term = NULL;
++    }
++    if (term && tgetent(tbuf, term) != 1) {
++        term = NULL;
++    }
++    if (term) {
++        static char cb[1024];
++        char *cp;
++                   
++        cp = cb;
++	
++        if (dum = (char*) tgetstr("ks", &cp)) 
++	  strcpy (KS, dum); 
++	else
++	  KS[0] = '\0';
++        if (dum = (char*) tgetstr("ke", &cp)) 
++	  strcpy (KE, dum); 
++	else
++	  KE[0] = '\0';
++        if (dum = (char*) tgetstr("so", &cp))
++	  strcpy (highlightbuf, dum); highlightbuf[0] = '\0';
++        if (dum = (char*) tgetstr("se", &cp))
++	  strcpy (highlightendbuf, dum); highlightendbuf[0] = '\0';
++        if (dum = (char*) tgetstr("md", &cp)) 
++	  strcpy (BoldOn, dum); 
++	else 
++	  strcpy(BoldOn, highlightbuf);
++        if (dum = (char*) tgetstr("me", &cp)) 
++	  strcpy (BoldOff, dum); 
++	else 
++	  strcpy(BoldOff, highlightendbuf);
++        if (dum = (char*) tgetstr("us", &cp))
++	  strcpy (StartUnderline, dum);
++	else
++	  StartUnderline[0] = '\0';
++        if (dum = (char*) tgetstr("ue", &cp))
++	  strcpy (StopUnderline, dum);
++	else StopUnderline[0] = '\0';
++        if (dum = (char*) tgetstr("nd", &cp))
++	  strcpy (MoveRight, dum);
++	else {
++            MoveRight[0] = ' ';
++            MoveRight[1] = '\0';
++        }
++        /* Some TERMCAP entries have REALLY screwed up "nd" fields, sigh... */
++        if (!strcmp(MoveRight, "\014")) strcpy(MoveRight, " ");
++        termcolumns = tgetnum("co");
++        if (termcolumns <= 0) termcolumns = 80;
++        termrows = tgetnum("li");
++        if (termrows <= 0) termrows = 23;
++	else termrows--;
++        FakeTerminal=0;
++    } else if (OverStrike) {
++        KS[0] = '\0';
++        KE[0] = '\0';
++	FakeTerminal = 1;
++	BoldOn[0] = '\0';
++	BoldOff[0] = '\0';
++	highlightbuf[0] = '\0';
++	highlightendbuf[0] = '\0';
++	StartUnderline[0] = '\0';
++	StopUnderline[0] = '\0';
++	strcpy(MoveRight, " ");
++        termcolumns = 80;
++        termrows = 23;
++    } else {
++        KS[0] = '\0';
++        KE[0] = '\0';
++        FakeTerminal = 1;
++        strcpy(BoldOn, "*");
++        strcpy(BoldOff, "*");
++        strcpy(highlightbuf, "_");
++        strcpy(highlightendbuf, "_");
++        strcpy(StartUnderline, "_");
++        strcpy(StopUnderline, "_");
++        strcpy(MoveRight, " ");
++        termcolumns = 80;
++        termrows = 23;
++    }
++    /* Check for the LINES & COLUMNS hack */
++    dum = getenv("LINES");
++    if (dum && ((i=atoi(dum)) > 0)) termrows = i - 1;
++    dum = getenv("COLUMNS");
++    if (dum && ((i=atoi(dum)) > 0)) termcolumns = i;
++    charsetnameinit(charsetname);
++    RichtextPutc = iso2022_fputc;
++    if (JustCorrect) {
++        richtextcorrect(InputFP,stdout,TextEnriched);
++        return(0);
++    }
++    FPUTS(KS, stdout);
++    rightmargin = workingright = termcolumns - 1;
++    while((c = richtextlex(InputFP,token,TextEnriched, nofill)) != (RCHAR)EOF) {
++        if (c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND) { 
++            negated = (c == RICHTEXT_NEG_COMMAND);
++            tok = token;
++
++	    /* Try to process the command with the character set processors */
++	    if (charsetcommand (tok,negated))
++	        continue;
++
++	    /* Do the default action for the command */
++            switch(tok[0]) {
++                case 'b':
++                    if (!strcmp(tok, "bold")) {
++                        if (negated) {
++                            --bold;
++                            if (bold <= 0) {
++				if (FakeTerminal) outputstr(BoldOff);
++				else controloutput(BoldOff, 0);
++			    }
++                        } else {
++                            ++bold;
++                        }
++                        ResetTerminalCodes(FakeTerminal, highlight, underline,
++                                            bold, highlightbuf, highlightendbuf, 0,
++                                            StartUnderline, StopUnderline, 0, BoldOn,
++                                            BoldOff, 1);
++                    } else if (!strcmp(tok, "bigger")) {
++                        if (negated) --biggertext; else ++biggertext;
++                    }
++                    break;
++                case 'c':
++                    if (!strcmp(tok, "center")) {
++                        if (negated) --centerenv; else ++centerenv;
++                    } else if (!TextEnriched && !strcmp(tok, "comment")) {
++                        int commct=1;
++			int tempc;
++                        while (commct > 0) {
++                            while ((tempc = getc(InputFP)) != '<' 
++                                    && tempc != EOF) ;
++                            if (tempc == EOF) break;
++                            for (i=0; (tempc = getc(InputFP)) != '>' 
++                              && tempc != EOF; ++i) {
++                                token[i] = isupper(tempc) ? 
++                                  tolower(tempc) : tempc;
++				if (i == MAX_TOKEN_SIZE-2) break;
++                            }
++                            if (tempc== EOF) break;
++                            token[i] = 0;
++                            if (!strcmp(token, "/comment")) --commct;
++                            if (!strcmp(token, "comment")) ++commct;
++                        }
++                    }
++                    break;
++                case 'e':
++                    if (!strcmp(tok, "excerpt")) {
++                        atstart = !(linepos > workingleft);
++                        if (negated) {
++                            leftmargin -= 4;
++                            rightmargin += 4;
++                            --inexcerpt;
++                        } else {
++                            leftmargin += 4;
++                            rightmargin -= 4;
++                            ++inexcerpt;
++                        }
++                        MakeWorkingMargins();
++                        if (!atstart) OUTC('\n');
++                    }
++                    break;
++                case 'f':
++                    if (!strcmp(tok, "flushleft")) {
++                        if (negated) --leftjustenv; else ++leftjustenv;
++                    } else if (!strcmp(tok, "flushright")) {
++                        if (negated) --rightjustenv; else ++rightjustenv;
++                    }
++                    break;
++                case 'i':
++                    if (!strcmp(tok, "italic")) {
++                        if (negated) {
++                            --highlight;
++                            if (highlight <= 0) {
++				if (FakeTerminal) outputstr(highlightendbuf);
++				else controloutput(highlightendbuf, 0);
++			    }
++                        } else {
++                            ++highlight;
++                        }
++                        ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
++                                            highlightbuf, highlightendbuf, 1, StartUnderline,
++                                            StopUnderline, 0, BoldOn, BoldOff, 0);
++                    } else if (!strcmp(tok, "indent")) {
++                        if (negated) {
++                            leftmargin -= 4;
++                        } else {
++                            leftmargin += 4;
++                        }
++                    } else if (!strcmp(tok, "indentright")) {
++                        if (negated) {
++                            rightmargin += 4;
++                        } else {
++                            rightmargin -= 4;
++                        }
++		    } else if (TextEnriched && !strcmp(tok, "iNtErNaL-nL")) {
++			OUTC('\n');
++                    }
++                    MakeWorkingMargins();
++                    break;
++                case 'l':
++                    if (!TextEnriched && !strcmp(tok, "lt")) {
++                        OUTC('<');
++                    }
++                    break;
++                case 'n':
++ 		    if (!TextEnriched && !strcmp(tok, "nl")) {
++                        OUTC('\n');
++		    } else if (TextEnriched && !strcmp(tok, "nofill")) {
++			if (negated) {
++			    --nofill;
++			} else {
++			    ++nofill;
++			}
++                    } else if (!TextEnriched && !strcmp(tok, "np")) {
++                        OUTC('\n');
++                        OUTC('\014');
++                    }
++                    break;
++                case 'o':
++                    if (!TextEnriched && !strcmp(tok, "outdent")) {
++                        if (negated) {
++                            leftmargin += 4;
++                        } else {
++                            leftmargin -= 4;
++                        }
++                    } else if (!TextEnriched && !strcmp(tok, "outdentright")) {
++                        if (negated) {
++                            rightmargin -= 4;
++                        } else {
++                            rightmargin += 4;
++                        }
++                    }
++                    MakeWorkingMargins();
++                    break;                    
++                case 'p':
++                    if (!TextEnriched && !strcmp(tok, "paragraph")) {
++                        if (negated) OUTC('\n');
++                        OUTC('\n');
++                    } else if (TextEnriched && !strcmp(tok, "param")) {
++                        int commct=1;
++                        while (commct > 0) {
++			    for (;;) {
++				c = richtextlex(InputFP,token,TextEnriched, nofill);
++				if (c == EOF || c == RICHTEXT_COMMAND || c == RICHTEXT_NEG_COMMAND)
++				    break;
++                            }
++			    if (c == EOF) break;
++			    if (!strcmp(token,"param")) {
++				if (c == RICHTEXT_NEG_COMMAND) --commct;
++				else if (c == RICHTEXT_COMMAND) ++commct;
++                        }
++                    }
++		    }
++                    break;
++                case 's':
++                    if (!TextEnriched && !strcmp(tok, "signature")) {
++                        atstart = !(linepos > workingleft);
++                        if (negated) {
++                            leftmargin -= 4;
++                            rightmargin += 4;
++                            --insignature;
++                        } else {
++                            leftmargin += 4;
++                            rightmargin -= 4;
++                            ++insignature;
++                        }
++                        MakeWorkingMargins();
++                        if (!atstart) OUTC('\n');
++                    }
++                    break;
++                case 'u':
++                    if (!strcmp(tok, "underline")) {
++                        if (negated) {
++                            --underline;
++                            if (underline <= 0) {
++				if (FakeTerminal) outputstr(StopUnderline);
++				else controloutput(StopUnderline,0);
++			    }
++                        } else {
++                            ++underline;
++                        }
++                        ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
++                                            highlightbuf, highlightendbuf, 0, StartUnderline,
++                                            StopUnderline, 1, BoldOn, BoldOff, 0);
++                    }
++                    break;
++                case 'v':
++                    if (TextEnriched && !strcmp(tok, "verbatim")) {
++                        for (;;) {
++			    int tempc;
++                            while ((tempc = getc(InputFP)) != '<' 
++                                    && tempc != EOF)
++				OUTC(tempc);
++                            if (tempc == EOF) break;
++			    ungetc(tempc = getc(InputFP), InputFP);
++			    if (tempc == '<') {
++				OUTC('<');
++				getc(InputFP);
++				continue;
++			    }
++                            for (i=0; (tempc = getc(InputFP)) != '>' 
++                              && tempc != EOF; ++i) {
++                                token[i] = tempc;
++				if (i == MAX_TOKEN_SIZE-2) break;
++                            }
++                            if (tempc== EOF) break;
++                            token[i] = 0;
++                            if (!lc2strcmp(token, "/verbatim")) break;
++			    else for (i=0; token[i]; i++)
++			        OUTC(token[i]);
++                        }
++                    }
++                    break;
++                default:
++                    /* Ignore all other tokens */
++                    break;
++            }
++            JustSawCmd = 1;
++        } else if (c == '\n') {
++	    if (nofill) {
++		OUTC(c);
++	    } else if (linepos > 0 && !inspace) {
++                OUTC(' ');
++            }
++            JustSawCmd = 0;
++        } else {
++            OUTC(c);
++            JustSawCmd = 0;
++        }
++    }
++    if (term) { /* cleanup a bit for insurance */
++        controloutput(highlightendbuf, 0);
++        controloutput(StopUnderline, 0);
++    }
++    OUTC('\n'); /* for good measure */
++    FPUTS(KE, stdout);
++    fflush(stdout);
++    if (UsePager) {
++        Pause();
++    }
++    return(0);
++}
++
++static struct charsetmember OutputBuf[1000] = {0,0};
++static int PendingOutput = 0, PendingControls = 0;
++
++controlputc(c)
++int c;
++{
++    charmemberctrl (&OutputBuf[PendingOutput],(RCHAR)c);
++    ++PendingOutput;
++    ++PendingControls;
++}
++
++static immediate_controlputc(c)
++int c;
++{
++    (*RichtextPutc) (c, stdout);
++}
++
++controloutput(s, immediate)
++char *s;
++int immediate;
++{
++    tputs(s, 1, immediate ? immediate_controlputc : controlputc);
++}
++
++static folding_point (buf, pos)
++struct	charsetmember *buf;
++int	pos;
++{
++    int i;
++    for (i = pos; i > 0; --i) {
++    	if (!charisctrl (buf[i]) && charmemberfold (buf[i]))
++	    return (i);
++    }
++    return (0);
++}
++
++static calc_column (buf, pos)
++struct	charsetmember *buf;
++int	pos;
++{
++    struct charsetmember *s;
++    int col = 0;
++    for (s = buf; (s -> ch); ++s) {
++    	if (!charisctrl (*s))
++    	    col += charmemberwidth (*s);
++	else
++	    ++col;
++    }
++    return (col);
++}
++
++static FlushOut() {
++    int i, j, x;
++    static struct charsetmember NewOutputBuf[1000];
++    struct charsetmember *s;
++    int NewPendingControls=0, NewPendingOutput = 0;
++
++    OutputBuf[PendingOutput].ch = 0;
++    OutputBuf[PendingOutput].charset = NULL;
++    if (linepos >= workingright) {
++        for (i=0, j=0; j<workingright && i < PendingOutput; ++i) {
++            if (!charisctrl (OutputBuf[i])) ++j;
++        }
++	x = folding_point (OutputBuf,i);
++	if ((workingleft + 4) < x)
++	    i = x;
++	else
++            while (i > workingleft + 4) {
++                if (!charisctrl (OutputBuf[i])
++                     && isspace((unsigned char) OutputBuf[i].ch)) {
++                    break;
++                }
++                --i;
++            }
++        for (j=0; i<PendingOutput; ++j, ++i) {
++            NewOutputBuf[j] = OutputBuf[i];
++            ++NewPendingOutput;
++            if (charisctrl (NewOutputBuf[j])) ++NewPendingControls;
++        }
++        PendingOutput -= NewPendingOutput;
++        PendingControls -= NewPendingControls;
++        charmember (&OutputBuf[PendingOutput],(RCHAR)'\n');
++	PendingOutput++;
++        OutputBuf[PendingOutput].ch = 0;
++        OutputBuf[PendingOutput].charset = 0;
++#ifdef MISTAKE
++        ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
++                            highlightbuf, highlightendbuf, 0, StartUnderline,
++                            StopUnderline, 0, BoldOn, BoldOff, 0);
++#endif
++    }
++    if ((rightjustct > leftjustct)
++         && (rightjustct > centerct)
++         && (rightjustct > 0)) {
++        /* right justified */
++        i = rightmargin - calc_column (OutputBuf,PendingOutput) 
++		+ PendingControls;
++        for (j=0; j<i; ++j)  {
++            controloutput(MoveRight, 1);
++        }
++        fputsmovingright(OutputBuf, stdout);
++        ++linesused;
++    } else if ((leftjustct > centerct)
++                && (leftjustct > 0)) {
++        /* left justified */
++        for (s=OutputBuf; s -> ch && isspace((unsigned char) (s -> ch)); ++s)
++	    {;}
++        fputsmovingright(s, stdout);
++        ++linesused;
++    } else if (centerct > 0) {
++        /* centered */
++        i = (termcolumns - calc_column (OutputBuf,PendingOutput) - 1
++		+ PendingControls) / 2;
++        for (j=0; j<i; ++j) {
++            controloutput(MoveRight, 1);
++        }
++        fputsmovingright(OutputBuf, stdout);
++        ++linesused;
++    } else {
++        /* Leave indentation (margins) as-is */
++        fputsmovingright(OutputBuf, stdout);
++        ++linesused;
++    }
++    if (linesused >= termrows && UsePager) Pause();
++    rightjustct = leftjustct = centerct = 0; /* not quite right for wrapping, sigh... */
++    PendingOutput = PendingControls = linepos = 0;
++    inspace = 1;
++    j = (isspace((unsigned char) NewOutputBuf[0].ch)) ? 1 : 0;
++    for ( ; j<NewPendingOutput; ++j) {
++        if (charisctrl (NewOutputBuf[j])) {
++	    OutputBuf[PendingOutput++] = NewOutputBuf[j];
++            ++PendingControls;
++        } else {
++            realoutputc(NewOutputBuf[j], 1);
++        }
++    }
++    ResetTerminalCodes(FakeTerminal, highlight, underline, bold,
++                        highlightbuf, highlightendbuf, 0, StartUnderline,
++                        StopUnderline, 0, BoldOn, BoldOff, 0);
++}
++
++static outputc(c)
++RCHAR c;
++{
++    struct charsetmember member;
++    charmember (&member,c);
++    realoutputc(member, 0);
++}
++
++static realoutputc(c, alreadyformatted)
++struct charsetmember c;
++int alreadyformatted;
++{
++    int i, newinspace;
++
++    if (c.ch == '\n') {
++    	charmember (&OutputBuf[PendingOutput],(RCHAR)'\n');
++	PendingOutput++;
++        FlushOut();
++    } else if (c.ch == '\t') {
++        int tabpos = (linepos + 8) / 8;
++        if (tabpos >= workingright) {
++    	    charmember (&OutputBuf[PendingOutput],(RCHAR)'\n');
++	    PendingOutput++;
++            FlushOut();
++        } else {
++            int spaces = (8*tabpos) - linepos;
++            while (spaces-->0) {
++    	        charmember (&OutputBuf[PendingOutput],(RCHAR)' ');
++	        PendingOutput++;
++                ++linepos;
++            }
++        }
++    } else {
++        newinspace = isspace((unsigned char) c.ch);
++        if (!inspace || !newinspace || !JustSawCmd) {
++            if (linepos == 0) {
++                int i = workingleft;
++                if (inexcerpt) {
++    	            charmember (&OutputBuf[PendingOutput],(RCHAR)'>');
++	            PendingOutput++;
++                    --i;
++                }
++                if (insignature) {
++    	            charmember (&OutputBuf[PendingOutput],(RCHAR)'+');
++	            PendingOutput++;
++                    --i;
++                }
++                while (i-->0) {
++    	            charmember (&OutputBuf[PendingOutput],(RCHAR)' ');
++	            PendingOutput++;
++                }
++                linepos = workingleft;
++            }
++            if (!alreadyformatted && biggertext && !(inspace && newinspace)) {
++    	        charmember (&OutputBuf[PendingOutput],(RCHAR)'_');
++	        PendingOutput++;
++                ++linepos;
++            }
++            inspace = newinspace;
++            linepos += charmemberwidth (c);
++	    OutputBuf[PendingOutput++] = c;
++	    if (OverStrike && !inspace) {
++		if (bold) {
++		    controlputc('\b');
++		    controlputc((int) c.ch);
++		}
++		if (highlight||underline) {
++		    controlputc('\b');
++		    controlputc('_');
++		}
++	    }
++            leftjustct += leftjustenv;
++            rightjustct += rightjustenv;
++            centerct += centerenv;
++            if (c.ch == '\014') inspace = 1;
++            if (linepos >= workingright) FlushOut();
++        }
++    }
++}
++
++static MakeWorkingMargins() {
++    int oldworkingleft=workingleft, i;
++
++    workingleft = leftmargin;
++    workingright = rightmargin;
++    if (workingleft < 0) workingleft = 0;
++    if (workingright < 0) workingright = 0;
++    if (workingright > (termcolumns - 1)) workingright = (termcolumns - 1);
++    if (workingleft > (workingright - 8)) workingleft = workingright -8;
++    if (linepos == oldworkingleft && linepos != 0) {
++        for (i=workingleft-oldworkingleft; i > 0; --i) OUTC(' ');
++    }
++}
++
++static Pause()
++{
++    int	c;
++
++    (void) fputs("Press RETURN to continue (or 'q' to quit):\n", stdout);
++    fflush(stdout);
++    c = getc(stdin);
++    if (c == 'q' || c == 'Q') exit(0);
++    linesused = 0;
++}
++
++/* Leading spaces should be output as MoveRight, to avoid 
++   having margins that are underlined or reverse video */
++
++static fputsmovingright(s, fp)
++struct charsetmember *s;
++FILE *fp;
++{
++    int inmargin=1;
++    if (!s) return;
++    while (s -> ch) {
++        if (inmargin && (s -> ch) == ' ') {
++            controloutput(MoveRight, 1);
++        } else {
++            if (inmargin) inmargin = 0;
++	    if (charisctrl (*s))
++	        (*RichtextPutc) ((int)(s -> ch), fp);
++	    else
++	    	charmemberrender (*s, fp);
++        }
++        ++s;
++    }
++}
++
++static ResetTerminalCodes(FakeTerminal, highlight, underline, bold, highlightbuf, highlightendbuf,
++                    modifiedhighlight, StartUnderline, StopUnderline, modifiedunderline,
++                    BoldOn, BoldOff, modifiedbold)
++char *highlightbuf, *highlightendbuf, *StartUnderline, *StopUnderline,
++    *BoldOn, *BoldOff;
++{
++    if (OverStrike)
++	return;
++
++    /* We always turn back on the appropriate terminal modes, because
++      on some terminals one thing turns off all of them */
++    if (highlight >= 1) {
++        if (FakeTerminal) {
++            if (modifiedhighlight && highlight == 1) outputstr(highlightbuf);
++        } else controloutput(highlightbuf, 0);
++    }
++    if (bold >= 1) {
++        if (FakeTerminal) {
++            if (modifiedbold && bold == 1) outputstr(BoldOn);
++        } else controloutput(BoldOn, 0);
++    }
++    if (underline >= 1) {
++        if (FakeTerminal) {
++            if (modifiedunderline && underline == 1) outputstr(StartUnderline);
++        } else controloutput(StartUnderline, 0);
++    }
++}
++
++static FinalizeTerminal() {
++    tputs(highlightendbuf, 1, immediate_controlputc);
++    tputs(BoldOff, 1, immediate_controlputc);
++    tputs(StopUnderline, 1, immediate_controlputc);
++    FPUTS(KE, stdout);
++}
++
++static outputstr(s)
++char *s;
++{
++    while (*s) OUTC(*s++);
++}
++
++static FPUTS(s,fp)
++unsigned char *s;
++FILE *fp;
++{
++    while(*s) (*RichtextPutc)((int)(*s++),fp);
++}
++
++static lc2strcmp(s1, s2)
++char *s1, *s2;
++{
++    if (!s1 || !s2) return (-1);
++    while (*s1 && *s2) {
++	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
++	++s1; ++s2;
++    }
++    return((*s1 == *s2) ? 0 : -1);
++}
++
++static lc2strncmp(s1, s2, len)
++char *s1, *s2;
++int len;
++{
++    if (!s1 || !s2) return (-1);
++    while (*s1 && *s2 && len > 0) {
++	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
++	++s1; ++s2; --len;
++    }
++    if (len <= 0) return(0);
++    return((*s1 == *s2) ? 0 : -1);
++}
+--- metamail-2.7.orig/src/richmail/Makefile.am
++++ metamail-2.7/src/richmail/Makefile.am
+@@ -0,0 +1,15 @@
++MAINTAINERCLEANFILES    = Makefile.in
++
++CFLAGS			= -lncurses
++
++INCLUDES                = -I$(top_builddir) -I$(top_builddir)/metamail \
++                        -I$(top_srcdir) -I$(top_srcdir)/metamail
++
++bin_PROGRAMS            = richtext richtoatk
++
++richtext_SOURCES	= richtext.c richlex.c richset.c usascii.c iso2022.c
++richtext_LDADD		= $(top_builddir)/metamail/libmetamail.la
++
++richtoatk_SOURCES	= richtoatk.c richlex.c richset.c usascii.c iso2022.c
++richtoatk_LDADD		= $(top_builddir)/metamail/libmetamail.la
++
+--- metamail-2.7.orig/src/richmail/iso2022.c
++++ metamail-2.7/src/richmail/iso2022.c
+@@ -0,0 +1,375 @@
++/*-------------------------------------------------------------------------
++
++  iso2022.c - Code for the ISO-2022 specific parts of the richtext processor.
++ 
++  Copyright (c) 1992 Rhys Weatherley
++
++  Permission to use, copy, modify, and distribute this material
++  for any purpose and without fee is hereby granted, provided
++  that the above copyright notice and this permission notice
++  appear in all copies, and that the name of Rhys Weatherley not be
++  used in advertising or publicity pertaining to this
++  material without specific, prior written permission.
++  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
++  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
++  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++  Revision History:
++  ================
++
++   Version  DD/MM/YY  By  Description
++   -------  --------  --  --------------------------------------
++     1.0    21/06/92  RW  Original Version of iso2022.c
++
++  You may contact the author by:
++  =============================
++
++   e-mail: rhys@cs.uq.oz.au
++     mail: Rhys Weatherley
++	   5 Horizon Drive
++	   Jamboree Heights
++	   Queensland 4074
++	   Australia
++
++  Acknowledgements:
++  ================
++
++  Many thanks to Yutaka Sato (ysato@etl.go.jp) for protyping ISO-2022
++  support in a previous version of richtext, on whose code this is based.
++
++-------------------------------------------------------------------------*/
++
++#include <metamail/common.h>
++
++#include "richlex.h"
++#include "richset.h"
++
++/*
++ * Global data for this module.
++ */
++static	int	SwToAscii;
++static	int	SwToOther;
++static	int	OutPrevChar;
++static	int	OutPrevPrevChar;
++static	int	OutCharLen;
++static	int	OutCharSet;
++static	int	OutAsciiMode;
++
++#define	OUT_ASCII	0
++#define	OUT_JIS		1
++#define	OUT_KSC		2
++
++#define	ESC		033
++#define	SO		016
++#define	SI		017
++
++#define	ISO_GENERIC_PREFIX	"x-iso-2022-gen-"
++#define	ISO_GENERIC_LEN		15
++#define	ISO_SHIFT_PREFIX	"x-iso-shift-"
++#define	ISO_SHIFT_LEN		12
++#define	ISO_CHARSET_PREFIX	"x-iso-charset-"
++#define	ISO_CHARSET_LEN		14
++
++/*
++ * Initialise the ISO-2022 character set processor.
++ */
++iso2022_init (name)
++char	*name;
++{
++    SwToAscii = 'B';
++    SwToOther = 'B';
++    OutPrevChar = 0;
++    OutPrevPrevChar = 0;
++    OutCharLen = 1;
++    OutCharSet = OUT_ASCII;
++    OutAsciiMode = RICH_ENC_US_ASCII;
++    if (!name)
++	return;
++    if (!strncmp (name,"iso-2022-jp",11))
++	richtextencoding (RICH_ENC_JP_ASCII);
++    else if (!strncmp (name,"iso-2022-kr",11)) {
++	richtextencoding (RICH_ENC_KR_ASCII);
++	controloutput("\033$)C",0);
++    } else
++	richtextencoding (RICH_ENC_US_ASCII);
++}
++
++/*
++ * Process a command for the ISO-2022 processor.
++ */
++int	iso2022_command (token,negated)
++char	*token;
++int	negated;
++{
++    int swchar;
++    if (!strcmp(token,"iso-2022-jp")) {
++    	if (negated) {
++	    /* Return to previous output mode */
++	    controloutput("\033(B",0);
++	    SwToAscii = 'B';
++	    charsetpop(&iso2022_charset);
++	} else {
++	    /* Enter JIS-X0208-1983 output mode */
++	    charsetpush(&iso2022_charset);
++	    richtextencoding(RICH_ENC_US_ASCII);
++	    controloutput("\033(B",0);
++	    SwToOther = 'B';
++	}
++	return (1);
++    } else if (!strcmp(token,"iso-2022-kr")) {
++	if (negated) {
++	    /* Return to previous output mode */
++	    controloutput("\017",0);
++	    charsetpop(&iso2022_charset);
++	} else {
++	    /* Enter KSC-5601 output mode */
++	    charsetpush(&iso2022_charset);
++	    richtextencoding(RICH_ENC_KR_ASCII);
++	    controloutput("\033$)C\017",0);
++	}
++	return (1);
++    } else if (!strncmp(token,"x-jis-x0201",11)) {
++    	if (negated) {
++	    /* Return to previous output mode */
++	    controloutput("\033(B",0);
++	    SwToAscii = 'B';
++	    charsetpop(&iso2022_charset);
++	} else {
++	    /* Enter JIS-X-0201-1976 output mode */
++	    charsetpush(&iso2022_charset);
++	    richtextencoding(RICH_ENC_JP_ASCII);
++	    controloutput("\033(J",0);
++	    SwToAscii = 'J';
++	}
++	return (1);
++    } else if (!strncmp(token,"x-jis-x0208",11)) {
++    	if (negated) {
++	    /* Return to previous output mode */
++	    controloutput("\033(B",0);
++	    SwToAscii = 'B';
++	    charsetpop(&iso2022_charset);
++	} else {
++	    /* Enter JIS-X0208-* output mode */
++	    charsetpush(&iso2022_charset);
++	    if (!strcmp (token + 11,"-1978"))
++		SwToOther = '@';
++	    else
++		SwToOther = 'B';
++	    richtextencoding((SwToOther == '@' ? RICH_ENC_JIS_1978 :
++					      RICH_ENC_JIS_1983));
++	    controloutput("\033$",0);
++	    controlputc(SwToOther);
++	}
++	return (1);
++    } else if (!strcmp(token,"x-ksc-5601")) {
++    	if (negated) {
++	    /* Return to previous output mode */
++	    controloutput("\017",0);
++	    charsetpop(&iso2022_charset);
++	} else {
++	    /* Enter KSC-5601 output mode */
++	    charsetpush(&iso2022_charset);
++	    richtextencoding(RICH_ENC_KSC_5601);
++	    controloutput("\033$)C\016",0);
++	}
++	return (1);
++    } else if (!strncmp (token,ISO_GENERIC_PREFIX,ISO_GENERIC_LEN)) {
++    	/* Process an escape sequence for changing character sets */
++	sscanf(token + ISO_GENERIC_LEN,"%x",&swchar);
++	if (swchar <= ' ' || swchar >= 0x7F)
++	    return (1);
++	if (negated) {
++	    /* Return to previous output mode from multi-byte mode */
++	    if (!charsettop(&iso2022_charset))
++	      charsetpush(&iso2022_charset);
++	    richtextencoding((swchar == 'J' ? RICH_ENC_JP_ASCII :
++					      RICH_ENC_US_ASCII));
++	    controloutput("\033(",0);
++	    controlputc(swchar);
++	    SwToAscii = swchar;
++	} else {
++	    /* Enter multi-byte (Japanese) mode */
++	    if (!charsettop(&iso2022_charset))
++	      charsetpush(&iso2022_charset);
++	    richtextencoding((swchar == '@' ? RICH_ENC_JIS_1978 :
++					      RICH_ENC_JIS_1983));
++	    controloutput("\033$",0);
++	    controlputc(swchar);
++	    SwToOther = swchar;
++	}
++	return (1);
++    } else if (!strncmp (token,ISO_SHIFT_PREFIX,ISO_SHIFT_LEN)) {
++    	/* Process a character set shift sequence */
++	if (!strcmp(token + ISO_SHIFT_LEN,"out") &&
++	    	RichtextCharEncoding == RICH_ENC_KR_ASCII) {
++	    /* Enter KSC-5601 2-byte mode */
++	    if (!charsettop(&iso2022_charset))
++	      charsetpush(&iso2022_charset);
++	    richtextencoding(RICH_ENC_KSC_5601);
++	    controloutput("\016",0);
++	} else if (!strcmp (token + ISO_SHIFT_LEN,"in") &&
++		RichtextCharEncoding == RICH_ENC_KSC_5601) {
++	    /* Return to US-ASCII from KSC-5601 */
++	    if (!charsettop(&iso2022_charset))
++	      charsetpush(&iso2022_charset);
++	    richtextencoding(RICH_ENC_KR_ASCII);
++	    controloutput("\017",0);
++	}
++	return (1);
++    } else {
++    	return (0);
++    }
++}
++
++/*
++ * Check for singleton ISO-2022 tokens.
++ */
++int	iso2022_single (token)
++char	*token;
++{
++    return (!strncmp (token,ISO_GENERIC_PREFIX,ISO_GENERIC_LEN) ||
++	    !strncmp (token,ISO_SHIFT_PREFIX,ISO_SHIFT_LEN) ||
++	    !strncmp (token,ISO_CHARSET_PREFIX,ISO_CHARSET_LEN));
++}
++
++/*
++ * Determine the width of a ISO-2022 character.
++ */
++int	iso2022_width (ch)
++RCHAR	ch;
++{
++    return (ch & 0xFF00 ? 2 : 1);
++}
++
++/*
++ * Determine if the current character can be used as a folding point.
++ */
++int	iso2022_fold (ch)
++RCHAR	ch;
++{
++    if (ch < 0x7F && isspace (ch)) {
++    	return (1);
++    } else {
++        return ((ch & 0xFF00) != 0);
++    }
++}
++
++/*
++ * Render the given ISO-2022 character.
++ */
++iso2022_render (ch,param)
++RCHAR	ch;
++void	*param;
++{
++    if (ch & 0xFF00) {
++	if (OutCharLen < 2) {
++	    /* Add extra escape sequences after stray ASCII characters */
++	    /* This normally happens in excerpts and signatures, etc.  */
++	    if (OutAsciiMode == RICH_ENC_JP_ASCII) {
++		(*RichtextPutc) (033,param);
++		(*RichtextPutc) ('$',param);
++		(*RichtextPutc) (SwToOther,param);
++	    } else if (OutAsciiMode == RICH_ENC_KR_ASCII) {
++		(*RichtextPutc) (SO,param);
++	    }
++	}
++        (*RichtextPutc) ((int)((ch & 0xFF00) >> 8),param);
++        (*RichtextPutc) ((int)(ch & 0xFF),param);
++    } else {
++	if (OutCharLen > 1 && ch >= 0x20) {
++	    /* Add extra escape sequences before stray ASCII characters */
++	    /* This normally happens in excerpts and signatures, etc.   */
++	    if (OutAsciiMode == RICH_ENC_JP_ASCII) {
++		(*RichtextPutc) (033,param);
++		(*RichtextPutc) ('(',param);
++		(*RichtextPutc) (SwToAscii,param);
++	    } else if (OutAsciiMode == RICH_ENC_KR_ASCII) {
++		(*RichtextPutc) (SI,param);
++	    }
++	}
++	(*RichtextPutc) ((int)(ch & 0xFF),param);
++    }
++}
++
++/*
++ * Enter or leave the ISO-2022 encoding.
++ */
++iso2022_encoding (newenc)
++int	newenc;
++{
++    switch (newenc) {
++	case RICH_ENC_US_ASCII: controloutput("\033(B",0); break;
++	case RICH_ENC_JP_ASCII: controloutput("\033(J",0); break;
++	case RICH_ENC_KR_ASCII: controloutput("\017",0);   break;
++	case RICH_ENC_JIS_1978: controloutput("\033$@",0); break;
++	case RICH_ENC_JIS_1983: controloutput("\033$B",0); break;
++	case RICH_ENC_KSC_5601: controloutput("\016",0);   break;
++	default:		controloutput("\033(B",0); break;
++    }
++}
++
++/*
++ * Define the ISO-2022-JP and ISO-2022-KR character set processor.
++ */
++struct 	charsetproc	iso2022_charset =
++	  {"iso-2022-jp:iso-2022-kr",
++	   iso2022_init,
++	   iso2022_command,
++	   iso2022_single,
++	   iso2022_width,
++	   iso2022_fold,
++	   iso2022_render,
++	   iso2022_encoding};
++
++/*
++ * Define an output routine for slotting into RichtextPutc so
++ * that ISO-2022 escape sequences are treated correctly.
++ */
++int	iso2022_fputc (ch,file)
++int	ch;
++FILE	*file;
++{
++    if (OutPrevChar == ESC && ch == '(') {
++	/* Process escape sequences that end JIS 2-byte modes */
++	OutCharLen = 1;
++	OutCharSet = OUT_ASCII;
++	OutAsciiMode = RICH_ENC_JP_ASCII;
++    }
++    if (OutPrevPrevChar == ESC && OutPrevChar == '$') {
++	/* Process escape sequences that start JIS 2-byte modes */
++        if (ch != ')') {	/* ')' is for Korean, so ignore it */
++	    OutCharLen = 2;
++	    OutCharSet = OUT_JIS;
++	    OutAsciiMode = RICH_ENC_JP_ASCII;
++	}
++    }
++    if (ch == SO) {
++	OutCharLen = 2;
++	OutCharSet = OUT_KSC;
++	OutAsciiMode = RICH_ENC_KR_ASCII;
++    } else if (ch == SI) {
++	OutCharLen = 1;
++	OutCharSet = OUT_ASCII;
++	OutAsciiMode = RICH_ENC_KR_ASCII;
++    }
++    if (ch == '\n' && OutCharLen == 2) {
++        /* Two-byte characters cannot cross line boundaries */
++	if (OutCharSet == OUT_JIS) {
++            fputc (ESC,file);
++            fputc ('(',file);
++            fputc (SwToAscii,file);
++            fputc ('\n',file);
++            fputc (ESC,file);
++            fputc ('$',file);
++            fputc (SwToOther,file);
++	} else if (OutCharSet == OUT_KSC) {
++	    fputc (SI,file);
++	    fputc ('\n',file);
++	    fputc (SO,file);
++	}
++    } else {
++        fputc (ch,file);
++    }
++    OutPrevPrevChar = OutPrevChar;
++    OutPrevChar = ch;
++}
+--- metamail-2.7.orig/src/richmail/Makefile.in
++++ metamail-2.7/src/richmail/Makefile.in
+@@ -0,0 +1,376 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++MAINTAINERCLEANFILES = Makefile.in
++
++CFLAGS = -lncurses
++
++INCLUDES = -I$(top_builddir) -I$(top_builddir)/metamail                         -I$(top_srcdir) -I$(top_srcdir)/metamail
++
++
++bin_PROGRAMS = richtext richtoatk
++
++richtext_SOURCES = richtext.c richlex.c richset.c usascii.c iso2022.c
++richtext_LDADD = $(top_builddir)/metamail/libmetamail.la
++
++richtoatk_SOURCES = richtoatk.c richlex.c richset.c usascii.c iso2022.c
++richtoatk_LDADD = $(top_builddir)/metamail/libmetamail.la
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = ../../metamail/config.h
++CONFIG_CLEAN_FILES = 
++bin_PROGRAMS =  richtext$(EXEEXT) richtoatk$(EXEEXT)
++PROGRAMS =  $(bin_PROGRAMS)
++
++
++DEFS = @DEFS@ -I. -I$(srcdir) -I../../metamail
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++richtext_OBJECTS =  richtext.$(OBJEXT) richlex.$(OBJEXT) \
++richset.$(OBJEXT) usascii.$(OBJEXT) iso2022.$(OBJEXT)
++richtext_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
++richtext_LDFLAGS = 
++richtoatk_OBJECTS =  richtoatk.$(OBJEXT) richlex.$(OBJEXT) \
++richset.$(OBJEXT) usascii.$(OBJEXT) iso2022.$(OBJEXT)
++richtoatk_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
++richtoatk_LDFLAGS = 
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++DIST_COMMON =  Makefile.am Makefile.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++DEP_FILES =  .deps/iso2022.P .deps/richlex.P .deps/richset.P \
++.deps/richtext.P .deps/richtoatk.P .deps/usascii.P
++SOURCES = $(richtext_SOURCES) $(richtoatk_SOURCES)
++OBJECTS = $(richtext_OBJECTS) $(richtoatk_OBJECTS)
++
++all: all-redirect
++.SUFFIXES:
++.SUFFIXES: .S .c .lo .o .obj .s
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/richmail/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++mostlyclean-binPROGRAMS:
++
++clean-binPROGRAMS:
++	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
++
++distclean-binPROGRAMS:
++
++maintainer-clean-binPROGRAMS:
++
++install-binPROGRAMS: $(bin_PROGRAMS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	  else :; fi; \
++	done
++
++uninstall-binPROGRAMS:
++	@$(NORMAL_UNINSTALL)
++	list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	done
++
++# FIXME: We should only use cygpath when building on Windows,
++# and only if it is available.
++.c.obj:
++	$(COMPILE) -c `cygpath -w $<`
++
++.s.o:
++	$(COMPILE) -c $<
++
++.S.o:
++	$(COMPILE) -c $<
++
++mostlyclean-compile:
++	-rm -f *.o core *.core
++	-rm -f *.$(OBJEXT)
++
++clean-compile:
++
++distclean-compile:
++	-rm -f *.tab.c
++
++maintainer-clean-compile:
++
++.s.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.S.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++
++maintainer-clean-libtool:
++
++richtext$(EXEEXT): $(richtext_OBJECTS) $(richtext_DEPENDENCIES)
++	@rm -f richtext$(EXEEXT)
++	$(LINK) $(richtext_LDFLAGS) $(richtext_OBJECTS) $(richtext_LDADD) $(LIBS)
++
++richtoatk$(EXEEXT): $(richtoatk_OBJECTS) $(richtoatk_DEPENDENCIES)
++	@rm -f richtoatk$(EXEEXT)
++	$(LINK) $(richtoatk_LDFLAGS) $(richtoatk_OBJECTS) $(richtoatk_LDADD) $(LIBS)
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = src/richmail
++
++distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/richmail/Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am: install-binPROGRAMS
++install-exec: install-exec-am
++
++install-data-am:
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-binPROGRAMS
++uninstall: uninstall-am
++all-am: Makefile $(PROGRAMS)
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++	$(mkinstalldirs)  $(DESTDIR)$(bindir)
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
++		mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
++		clean-depend clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
++	-rm -f libtool
++
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-binPROGRAMS \
++		maintainer-clean-compile maintainer-clean-libtool \
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-am
++
++.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
++maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
++mostlyclean-compile distclean-compile clean-compile \
++maintainer-clean-compile mostlyclean-libtool distclean-libtool \
++clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
++distclean-tags clean-tags maintainer-clean-tags distdir \
++mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/src/richmail/richlex.h
++++ metamail-2.7/src/richmail/richlex.h
+@@ -0,0 +1,166 @@
++/*-------------------------------------------------------------------------
++
++  richlex.h - Lexical analysis routines for parsing richtext messages.
++ 
++  Copyright (c) 1992 Rhys Weatherley
++
++  Permission to use, copy, modify, and distribute this material
++  for any purpose and without fee is hereby granted, provided
++  that the above copyright notice and this permission notice
++  appear in all copies, and that the name of Rhys Weatherley not be
++  used in advertising or publicity pertaining to this
++  material without specific, prior written permission.
++  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
++  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
++  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++  Revision History:
++  ================
++
++   Version  DD/MM/YY  By  Description
++   -------  --------  --  --------------------------------------
++     1.0    31/01/92  RW  Original Version of richlex.h
++     1.1    19/06/92  RW  Add support for multi-byte ISO-2022 codes.
++
++  You may contact the author by:
++  =============================
++
++   e-mail: rhys@cs.uq.oz.au
++     mail: Rhys Weatherley
++	   5 Horizon Drive
++	   Jamboree Heights
++	   Queensland 4074
++	   Australia
++
++-------------------------------------------------------------------------*/
++
++#ifndef	__RICHTEXT_H__
++#define	__RICHTEXT_H__
++
++#include <metamail/common.h>
++
++BEGIN_C_DECLS
++
++//#ifdef	__cplusplus
++//extern "C" {
++//#endif
++
++/*
++ * Define the data type to be used by characters in the richtext
++ * system.  Note: this is a long because some machines, MS-DOS
++ * machines for example, only have 16-bit integers and hence won't
++ * be able to cope with large multi-byte character codes.  If
++ * something is strange with your character processing, it is
++ * probably because you aren't using the right types.
++ */
++typedef	long	RCHAR;
++
++/*
++ * Set the following variable to zero to disable the
++ * correction of richtext commands.  The default
++ * value is non-zero.
++ */
++extern	int CorrectionEnabled;
++
++/*
++ * Set the following value to non-zero to enable the
++ * multi-byte '<' hack which ignores richtext commands
++ * in multi-byte modes.  The default value is zero.
++ */
++extern	int RichtextLessThanFlag;
++
++/*
++ * Define the function to call to get characters from
++ * the message.  The calling convention of this
++ * function is: "int func (void *param)".  The default
++ * value is "fgetc".  The function must return EOF
++ * at the end of the messsage;
++ */
++extern	int (*RichtextGetc) ();
++
++/*
++ * Define the function to call to output characters from
++ * richtextcorrect.  The calling convention of this
++ * function is: "int func (int c,void *param)".  The default
++ * value is "fputc".
++ */
++extern	int (*RichtextPutc) ();
++
++/*
++ * Define the maximum size of richtext command tokens.
++ */
++#define	MAX_TOKEN_SIZE		50
++
++/*
++ * Define the special token values that are returned by
++ * the "richtextlex" function.  These values were chosen
++ * to keep away from legal ASCII.
++ *
++ * Version 1.1: modified to negative values to keep away
++ * from legal ISO-2022 and other multi-byte characters.
++ */
++#define	RICHTEXT_COMMAND	((RCHAR)(-2))
++#define	RICHTEXT_NEG_COMMAND	((RCHAR)(-3))
++
++/*
++ * Reset the richtext parsing mechanism.
++ */
++extern	richtextreset();
++
++/*
++ * Get the next token from the input stream.  RICHTEXT_COMMAND
++ * or RICHTEXT_NEG_COMMAND are returned if it is a richtext command.
++ * e.g. "<cmd>" or "</cmd>".  The "token" buffer will receive the
++ * name of the command (without <,> or /) if it is a command.  This
++ * function will also truncate commands longer than MAX_TOKEN_SIZE - 1
++ * characters and abort command parsing if white space is encountered,
++ * so, for example, errors like "<bold hi kids</bold>" don't cause
++ * problems: it will be corrected to "<bold>hi kids</bold>".
++ * The "file" parameter is passed to the function pointed to by
++ * "RichtextGetc" on each call.
++ */
++extern	RCHAR	richtextlex( /* void *file,char *token,int TextEnriched */ );
++
++/*
++ * Read the input stream, correct the richtext, and write the
++ * results to the output stream.  "outparam" is passed to the
++ * "RichtextPutc" function as the second argument, and "inparam"
++ * is passed to "richtextlex" during parsing.
++ */
++extern	richtextcorrect( /* void *inparam,void *outparam,int TextEnriched */ );
++
++#define	RICH_ENC_US_ASCII	0	/* US-ASCII encoding: one-byte */
++#define	RICH_ENC_JP_ASCII	1	/* JP-ASCII encoding: one-byte */
++#define	RICH_ENC_KR_ASCII	2	/* KR-ASCII encoding: one-byte */
++#define	RICH_ENC_JIS_1978	100	/* JIS-X-0208-1978: two-byte */
++#define	RICH_ENC_JIS_1983	101	/* JIS-X-0208-1983: two-byte */
++#define	RICH_ENC_KSC_5601	200	/* KSC-5601 (Korean): two-byte */
++
++/*
++ * The following variable contains the current character
++ * encoding in use.  This should only be read.  Setting it
++ * is done via "richtextencoding".
++ */
++extern	int	RichtextCharEncoding;
++
++/*
++ * Change the encoding used for characters not present in
++ * richtext command sequences.
++ */
++extern	richtextencoding( /* int encoding */ );
++
++/*
++ * Define a number of macros for decoding multi-byte character
++ * codes.  The names of the macros have the form "RICHCHn_xxx"
++ * where "n" is the number of bytes in the character.
++ */
++#define	RICHCH2_FIRST(c)	(((c) >> 8) & 0xFF)
++#define	RICHCH2_SECOND(c)	((c) & 0xFF)
++
++//#ifdef	__cplusplus
++//};
++//#endif
++
++END_C_DECLS
++
++#endif	/* __RICHTEXT_H__ */
+--- metamail-2.7.orig/src/richmail/richset.h
++++ metamail-2.7/src/richmail/richset.h
+@@ -0,0 +1,172 @@
++/*-------------------------------------------------------------------------
++
++  richset.h - Handling for different character sets in richtext.
++ 
++  Copyright (c) 1992 Rhys Weatherley
++
++  Permission to use, copy, modify, and distribute this material
++  for any purpose and without fee is hereby granted, provided
++  that the above copyright notice and this permission notice
++  appear in all copies, and that the name of Rhys Weatherley not be
++  used in advertising or publicity pertaining to this
++  material without specific, prior written permission.
++  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
++  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
++  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++  Revision History:
++  ================
++
++   Version  DD/MM/YY  By  Description
++   -------  --------  --  --------------------------------------
++     1.0    19/06/92  RW  Original Version of richset.h
++
++  You may contact the author by:
++  =============================
++
++   e-mail: rhys@cs.uq.oz.au
++     mail: Rhys Weatherley
++	   5 Horizon Drive
++	   Jamboree Heights
++	   Queensland 4074
++	   Australia
++
++-------------------------------------------------------------------------*/
++
++#ifndef	__RICHSET_H__
++#define	__RICHSET_H__
++
++#include <metamail/common.h>
++
++BEGIN_C_DECLS
++
++/*
++ * Define the interface structure for a character set processor.
++ * The fields are as follows:
++ *
++ *	names	- Colon-separated list of character set names.
++ *	init	- Initialize the character set processor.
++ *	command	- Process a command before the default processing.
++ *		  Returns non-zero if processed, zero if not.
++ *	single	- Should return non-zero for a singleton command.
++ *	width	- Get the width in terminal characters of the character.
++ *	fold	- Returns non-zero if the character can be folded at.
++ *	render	- Render the character through RichtextPutc.
++ *	encoding- Enter or leave an encoding. newenc is -1 to leave.
++ *
++ */
++struct	charsetproc
++		{
++		    char *names;
++		    int (*init) ( /* char *name */ );
++		    int (*command) ( /* char *token, int negated */ );
++		    int (*single) ( /* char *token */ );
++		    int (*width) ( /* RCHAR c */ );
++		    int (*fold) ( /* RCHAR c */ );
++		    int (*render) ( /* RCHAR c, void *param */ );
++		    int (*encoding) ( /* int newenc */ );
++		};
++
++/*
++ * Define some standard character set processors.
++ */
++extern	struct 	charsetproc	usascii_charset;
++extern	struct	charsetproc	iso2022_charset;
++
++/*
++ * Define the information to be kept in the internal buffers
++ * about a character.  If "charset" is NULL, it is a control
++ * character.
++ */
++struct	charsetmember
++		{
++		    RCHAR ch;			 /* The character itself */
++		    struct charsetproc *charset; /* Character set of ch */
++		};
++
++/*
++ * Initialise the stack of character set processors, starting with
++ * a particular base processor.  The initialisation function of all
++ * character set processors is called.
++ */
++extern	charsetinit	( /* struct charsetproc *charset, char *name */ );
++
++/*
++ * Initialise the stack, starting with a character set processor with
++ * a particular name.
++ */
++extern	charsetnameinit	( /* char *name */ );
++
++/*
++ * Push a new character set processor onto the stack.
++ */
++extern	charsetpush	( /* struct charsetproc *charset */ );
++
++/*
++ * Pop the top-most character set processor off the stack
++ * if it matches the given processor.  Note: the base
++ * processor is never popped off.
++ */
++extern	charsetpop	( /* struct charsetproc *charset */ );
++
++/*
++ * See if the character set processor on the top of the stack
++ * matches the given processor.
++ */
++extern	int	charsettop ( /* struct charsetproc *charset */ );
++
++/*
++ * Set the details for a character set member in the top-most
++ * character set.
++ */
++extern	charmember	( /* struct charsetmember *member, RCHAR ch */ );
++
++/*
++ * Set the details for a member of a specific character set.
++ */
++extern	charmemberspec	( /* struct charsetmember *member, RCHAR ch,
++			     struct charset *charset */ );
++
++/*
++ * Set the details for a output control code character.
++ */
++extern	charmemberctrl	( /* struct charsetmember *member, RCHAR ch */ );
++
++/*
++ * Determine if the given character is a control code character.
++ */
++#define	charisctrl(member)	((member).charset == (struct charsetproc *)0)
++
++/*
++ * Attempt to process a richtext command by passing it to the
++ * "command" function of all character set processors.  Returns
++ * zero if the command was not processed.
++ */
++extern	int	charsetcommand	( /* char *token, int negated */ );
++
++/*
++ * Test for an extension singleton command.
++ */
++extern	int	charsetsingle	( /* char *token */ );
++
++/*
++ * Get the width of a particular character.
++ */
++#define	charmemberwidth(member) \
++		((*((member).charset -> width)) ((member).ch))
++
++/*
++ * Determine if a character can be folded at.
++ */
++#define	charmemberfold(member) \
++		((*((member).charset -> fold)) ((member).ch))
++
++/*
++ * Render a character on an output stream.
++ */
++#define	charmemberrender(member,param) \
++		((*((member).charset -> render)) ((member).ch,param))
++
++END_C_DECLS
++
++#endif	/* __RICHSET_H__ */
+--- metamail-2.7.orig/src/richmail/richlex.c
++++ metamail-2.7/src/richmail/richlex.c
+@@ -0,0 +1,480 @@
++/*-------------------------------------------------------------------------
++
++  richlex.c - Lexical analysis routines for parsing richtext messages.
++ 
++  Copyright (c) 1992 Rhys Weatherley
++
++  Permission to use, copy, modify, and distribute this material
++  for any purpose and without fee is hereby granted, provided
++  that the above copyright notice and this permission notice
++  appear in all copies, and that the name of Rhys Weatherley not be
++  used in advertising or publicity pertaining to this
++  material without specific, prior written permission.
++  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
++  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
++  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++  Revision History:
++  ================
++
++   Version  DD/MM/YY  By  Description
++   -------  --------  --  --------------------------------------
++     1.0    31/01/92  RW  Original Version of richlex.c
++     1.1    19/06/92  RW  Add support for multi-byte ISO-2022 codes.
++
++  You may contact the author by:
++  =============================
++
++   e-mail: rhys@cs.uq.oz.au
++     mail: Rhys Weatherley
++	   5 Horizon Drive
++	   Jamboree Heights
++	   Queensland 4074
++	   Australia
++
++  Caveats:
++  =======
++
++  If a multi-byte character contains "<lt>", and a richtext command or
++  escape sequence is started before all bytes of the multi-byte character
++  have been read in, then some characters may be discarded.
++
++-------------------------------------------------------------------------*/
++
++#include <metamail/common.h>
++
++#include "richlex.h"
++#include "richset.h"
++
++int CorrectionEnabled = 1;	/* Zero if correction has been disabled */
++int RichtextLessThanFlag = 0;	/* Non-zero to turn on multi-byte '<' hack */
++
++//extern	int fgetc ();
++//extern	int fputc ();
++
++int (*RichtextGetc) () = fgetc;	/* Function to call to get characters */
++int (*RichtextPutc) () = fputc; /* Function to call to put characters */
++int RichtextCharEncoding = RICH_ENC_US_ASCII; /* Current encoding mode */
++
++#define	MAX_STACK_SIZE	500
++#define	MAX_FLUSH_SIZE	3
++#define	MAX_PUSH_BACK	20
++static	int	StackSize=0;
++static	char	Stack[MAX_STACK_SIZE][MAX_TOKEN_SIZE];
++static	char	NextToken[MAX_TOKEN_SIZE];
++static	int	FlushStack=0;
++static	int	FlushSize=0;
++static	int	EndInpFile=0;
++static	int	CharSize=1;
++static	int	PushbackBuffer[MAX_PUSH_BACK];
++static	int	PushbackSize=0;
++static	int	PushbackExtract=0;
++
++#define	ESC	033
++#define	SI	017
++#define	SO	016
++
++#define	RGETRAW(f)	((*RichtextGetc)(f))
++#define	RGET(f)		(PushbackSize ? richtextgetback() : RGETRAW(f))
++#define	RPUT(c,f)	((*RichtextPutc)(((int)(c)),(f)))
++#define	RUNGET(c)	(richtextunget(c))
++#define	RPUSHBACK(c)	(richtextpushback(c))
++
++/*
++ * Define a "printf" format for a generic ISO-2022 character
++ * set name that includes the hexadecimal representation of
++ * the escape sequence character that turns ISO-2022 on or off
++ * on the terminal.
++ */
++#define	ISO2022_GENERIC	"x-iso-2022-gen-%2x"
++#define	ISO2022_CHARSET "x-iso-charset-"
++
++/*
++ * Define the character set shift characters for ISO-2022-KR.
++ */
++#define	ISO2022_SHIFTIN  "x-iso-shift-in"
++#define	ISO2022_SHIFTOUT "x-iso-shift-out"
++
++/*
++ * Construct multi-byte character codes.
++ */
++#define	RICHCH_2(first,second)	((RCHAR)(((first) << 8) | (second)))
++
++/*
++ * Reset the richtext parsing mechanism.
++ */
++richtextreset()
++{
++    StackSize = 0;
++    FlushStack = 0;
++    FlushSize = 0;
++    EndInpFile = 0;
++    CharSize = 1;
++    PushbackSize = 0;
++    PushbackExtract = 0;
++    RichtextCharEncoding = RICH_ENC_US_ASCII;
++    CorrectionEnabled = 1;
++    RichtextLessThanFlag = 0;
++}
++
++/*
++ * Push a character into the push-back buffer for later
++ * retrieval by RGET.
++ */
++static	void	richtextpushback(c)
++int	c;
++{
++    PushbackBuffer[PushbackSize++] = c;
++}
++
++/*
++ * Unget a character that has been read from the input stream.
++ */
++static	void	richtextunget(c)
++int	c;
++{
++    if (PushbackSize)
++	--PushbackExtract;	/* Character was retrieved from push-back */
++    else
++	richtextpushback(c);	/* Put character into empty push-back */
++}
++
++/*
++ * Unget two characters that have been read from the input stream.
++ */
++static	void	richtextunget2(c1,c2)
++int	c1,c2;
++{
++    if (PushbackExtract > 1) {
++	PushbackExtract -= 2;	/* Go back two characters in the push-back */
++	PushbackBuffer[PushbackExtract++] = c1;
++	PushbackBuffer[PushbackExtract++] = c2;
++    } else {
++	richtextpushback(c1);	/* Put the characters into the push-back */
++	richtextpushback(c2);
++    }
++}
++
++/*
++ * Retrieve a character from the push-back buffer.
++ */
++static	int	richtextgetback()
++{
++    int c;
++    c = PushbackBuffer[PushbackExtract++];
++    if (PushbackExtract >= PushbackSize) {
++	PushbackSize = 0;
++	PushbackExtract = 0;
++    }
++    return(c);
++}
++
++/*
++ * Find a match between NextToken and an element on the stack.
++ * Returns the number of elements down from the top it is.
++ * i.e. 0 if not on the stack, 1 if at the top, etc.
++ */
++static int richtextmatchup()
++{
++    int i = StackSize;
++    while (i > 0 && i > (StackSize - MAX_FLUSH_SIZE)) {
++	--i;
++	if (!strcmp(NextToken,Stack[i]))
++	    return(StackSize - i);
++    }
++    return(0);
++}
++
++/*
++ * Determine if the current token is one of the singleton
++ * richtext commands: <nl>, <lt>, <np>.
++ */
++static richtextsingle(TextEnriched)
++int TextEnriched;
++{
++    return (charsetsingle (NextToken) ||
++	    (!TextEnriched &&
++	        (!strcmp(NextToken,"nl") ||
++		!strcmp(NextToken,"lt") ||
++		!strcmp(NextToken,"np"))));
++}
++
++/*
++ * Recognise a character that can start a richtext command.
++ */
++#define	iscmdch(c)	(isalpha(c) || isdigit(c) || (c) == '/' || (c) == '-')
++#define iscmdch2(c)	(isalpha(c) || isdigit(c) || (c) == '-')
++#define TOLOWER(c)	(isupper(c)?tolower(c):c)
++#define valid_command(c1,c2) \
++	(( c1 == '/' && iscmdch2(c2) ) || \
++	 (!TextEnriched && TOLOWER(c1) == 'l' && TOLOWER(c2) == 't' ))
++
++/*
++ * Get the next token from the input stream.  RICHTEXT_COMMAND
++ * or RICHTEXT_NEG_COMMAND are returned if it is a richtext command.
++ * e.g. "<cmd>" or "</cmd>".  The "token" buffer will receive the
++ * name of the command (without <,> or /) if it is a command.  This
++ * function will also truncate commands longer than MAX_TOKEN_SIZE - 1
++ * characters and abort command parsing if white space is encountered,
++ * so, for example, errors like "<bold hi kids</bold>" don't cause
++ * problems: it will be corrected to "<bold>hi kids</bold>".
++ */
++RCHAR richtextlex(file,token,TextEnriched, nofill)
++void *file;
++char *token;
++int TextEnriched;
++int nofill; /* Inside a nofill env we parse newlines differently */
++{
++    int c,i,lastch;
++    RCHAR cmd;
++
++    lastch = 0;		/* No previous character for multi-byte chars as yet */
++
++    /* Perform any flushing of balancing commands that is necessary */
++    if (FlushStack) {
++	/* Flush out some extra closing commands */
++	strcpy(token,Stack[StackSize - FlushSize + (--FlushStack)]);
++	return(RICHTEXT_NEG_COMMAND);
++    } else if (FlushSize) {
++	/* Finished flushing: output the pending close command */
++	StackSize -= FlushSize;
++	if (StackSize > 0)
++	    --StackSize; /* Remove the command that was being matched up */
++	FlushSize = 0;
++	strcpy(token,NextToken);
++	if (EndInpFile)
++	    return((RCHAR)EOF); /* The last flush was the end-of-file cleanup */
++	else
++	    return(RICHTEXT_NEG_COMMAND);
++    }
++
++    /* Fetch a new character or richtext command */
++    for (;;) {		/* Loop so we can come back on ignored commands */
++        c = RGET(file);
++        if (c == '<') { 
++	    /* Check for multi-byte mode, where "<" is special */
++	    int c2;
++	    if (CharSize > 1) {
++		if (RichtextLessThanFlag) {
++		    /* The multi-byte '<' hack is in effect: not a command */
++		    if (lastch)
++		        return(RICHCH_2(lastch,'<'));
++		    lastch = '<';
++		    continue;	/* Back around for another character */
++		}
++		if ((c = RGET(file)) == EOF) {
++		    RUNGET(c);
++		    return((RCHAR)'<');
++		}
++		c2 = RGET(file);
++		richtextunget2(c,c2);
++		if( !valid_command(c,c2) ){
++		    /* We have a stray less-than symbol */
++	            if (lastch)
++		        return(RICHCH_2(lastch,'<'));
++	            lastch = '<';
++	            continue;	/* Back around for another character */
++		}
++	    } else if (TextEnriched) {
++	    	c2 = RGET(file);
++		if (c2 == '<') {
++		    return((RCHAR)c);
++		} else {
++		    RUNGET(c2);
++		}
++	    }
++
++	    /* Read a command token from the input file */
++	    cmd = RICHTEXT_COMMAND;
++	    if ((c = RGET(file)) == '/') {
++	        cmd = RICHTEXT_NEG_COMMAND;
++	        c = RGET(file);
++	    }
++            for (i = 0; i < (MAX_TOKEN_SIZE - 1) && c != '>'
++	    		&& c != EOF && !isspace(c); ++i) {
++                NextToken[i] = isupper(c) ? tolower(c) : c;
++	        c = RGET(file);
++            }
++	    if (c != '>' && c != EOF && !isspace(c)) {
++		/* We have a long command: skip the rest of it */
++		while (c != '>' && c != EOF && !isspace(c))
++		    c = RGET(file);
++	    }
++            if (c == EOF) {
++		if (!StackSize)
++	    	    return((RCHAR)EOF);
++	        /* Flush the remaining commands at the end of the input file */
++	        FlushSize = StackSize;
++	        FlushStack = FlushSize;
++	        EndInpFile = 1;
++	        return(richtextlex(file,token,TextEnriched, nofill)); /* Flush something out */
++	    }
++            NextToken[i] = '\0';
++
++	    /* Process <lt> specially for multi-byte characters */
++	    if (CharSize > 1 && !TextEnriched && !strcmp(NextToken,"lt")) {
++	        if (lastch)
++		    return(RICHCH_2(lastch,'<'));
++	        lastch = '<';
++	        continue;	/* Back around for another character */
++	    }
++
++	    /* Check to see if we need to correct anything */
++	    if (!CorrectionEnabled) {
++		/* No correction to do: just skip the correction phase */
++		strcpy(token,NextToken);
++		return(cmd);
++	    }
++	    if (cmd == RICHTEXT_COMMAND) {
++		/* Save the command on the stack if not a singleton command */
++		if (!richtextsingle(TextEnriched)) {
++		    strcpy (Stack[StackSize++],NextToken);
++		}
++	    }
++	    else if (!(i = richtextmatchup()))
++		continue;	/* No matchup - just drop it */
++	    else if (i == 1)
++		--StackSize;	/* Correct match at the stack top */
++	    else {
++		/* Flush some correction elements from the stack */
++		FlushSize = i - 1;
++		FlushStack = FlushSize;
++		return(richtextlex(file,token,TextEnriched, nofill));
++	    }
++	    strcpy(token,NextToken);
++	    return(cmd);
++        } else if (c == SI) {
++	    /* Shift-in character: translate to a singleton */
++	    strcpy(token,ISO2022_SHIFTIN);
++	    return(RICHTEXT_COMMAND);
++	} else if (c == SO) {
++	    /* Shift-out character: translate to a singleton */
++	    strcpy(token,ISO2022_SHIFTOUT);
++	    return(RICHTEXT_COMMAND);
++	} else if (c == ESC) {
++	    /* Check for escape sequences that change character sizes */
++	    int newc;
++	    c = RGET(file);
++	    if (c == '$') {
++		newc = RGET(file);
++		if (newc == ')') {
++		    newc = RGET(file);	/* 4-byte ESC-$-)-? sequence */
++		    sprintf(token,ISO2022_CHARSET,newc);
++		} else {
++		    sprintf(token,ISO2022_GENERIC,newc);
++		}
++		return(RICHTEXT_COMMAND);
++	    } else if (c == '(') {
++		newc = RGET(file);
++		sprintf(token,ISO2022_GENERIC,newc);
++		return(RICHTEXT_NEG_COMMAND);
++	    } else {
++		RUNGET(c);
++		return((RCHAR)ESC);
++	    }
++        } else if (c == EOF && StackSize) {
++	    /* Flush the remaining commands at the end of the input file */
++	    FlushSize = StackSize;
++	    FlushStack = FlushSize;
++	    EndInpFile = 1;
++	    return(richtextlex(file,token,TextEnriched, nofill)); /* Flush something out */
++	} else if (CharSize > 1) {
++	    /* Recognise a multi-byte character */
++	    int newc;
++	    if (!lastch && isspace (c))
++	      return ((RCHAR)c); /* Hack for spaces in 2-byte modes */
++	    if (lastch)
++		return (RICHCH_2(lastch,c)); /* This is second of 2 chars */
++	    if ((newc = RGET(file)) == EOF) {
++		RUNGET(newc);	/* Push the EOF back into the input stream */
++		return((RCHAR)c); /* Just return the partial single-byte char */
++	    } else if (newc == '<') {
++		/* The second character could be "<lt>", so loop around */
++		lastch = c;
++		RUNGET(newc);
++		continue;
++	    } else {
++	    	return(RICHCH_2(c,newc));
++	    }
++	} else if (TextEnriched && !nofill && (c == '\n')) {
++	    int c2 = RGET(file);
++	    RUNGET(c2);
++	    if (c2 == '\n') {
++		strcpy(token, "iNtErNaL-nL");
++		return(RICHTEXT_COMMAND);
++	    } else {
++		return((RCHAR)c);
++	    }
++	} else {
++	    return((RCHAR)c);
++	}
++    }
++}
++
++/*
++ * Output a string via "RichtextPutc".
++ */
++static richtextoutstr(str,outparam)
++char *str;
++void *outparam;
++{
++    while (*str) {
++	RPUT(*str,outparam);
++	++str;
++    }
++}
++
++/*
++ * Read the input stream, correct the richtext, and write the
++ * results to the output stream.
++ */
++richtextcorrect(inparam,outparam,TextEnriched)
++void *inparam,*outparam;
++int TextEnriched;
++{
++    RCHAR c;
++    char token[MAX_TOKEN_SIZE];
++    while ((c = richtextlex(inparam,token,TextEnriched, 0)) != (RCHAR)EOF) {
++	if (c == RICHTEXT_COMMAND) {
++	    RPUT('<',outparam);
++	    richtextoutstr(token,outparam);
++	    RPUT('>',outparam);
++	} else if (c == RICHTEXT_NEG_COMMAND) {
++	    RPUT('<',outparam);
++	    RPUT('/',outparam);
++	    richtextoutstr(token,outparam);
++	    RPUT('>',outparam);
++	} else if (c >= 256) {
++	    RPUT(RICHCH2_FIRST(c),outparam);
++	    RPUT(RICHCH2_SECOND(c),outparam);
++	} else {
++	    RPUT(c,outparam);
++	}
++    }
++}
++
++/*
++ * Change the encoding used for characters not present in
++ * richtext command sequences.
++ */
++richtextencoding(encoding)
++int	encoding;
++{
++    RichtextCharEncoding = encoding;
++    switch (RichtextCharEncoding) {
++	case RICH_ENC_US_ASCII:
++	case RICH_ENC_JP_ASCII:
++	case RICH_ENC_KR_ASCII:
++		CharSize = 1;
++		break;
++
++	case RICH_ENC_JIS_1978:
++	case RICH_ENC_JIS_1983:
++	case RICH_ENC_KSC_5601:
++		CharSize = 2;
++		break;
++
++	default:CharSize = 1;
++		break;
++    }
++}
+--- metamail-2.7.orig/src/richmail/richset.c
++++ metamail-2.7/src/richmail/richset.c
+@@ -0,0 +1,222 @@
++/*-------------------------------------------------------------------------
++
++  richset.c - Handling for different character sets in richtext.
++ 
++  Copyright (c) 1992 Rhys Weatherley
++
++  Permission to use, copy, modify, and distribute this material
++  for any purpose and without fee is hereby granted, provided
++  that the above copyright notice and this permission notice
++  appear in all copies, and that the name of Rhys Weatherley not be
++  used in advertising or publicity pertaining to this
++  material without specific, prior written permission.
++  RHYS WEATHERLEY MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR
++  SUITABILITY OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED
++  "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++  Revision History:
++  ================
++
++   Version  DD/MM/YY  By  Description
++   -------  --------  --  --------------------------------------
++     1.0    21/06/92  RW  Original Version of richset.c
++
++  You may contact the author by:
++  =============================
++
++   e-mail: rhys@cs.uq.oz.au
++     mail: Rhys Weatherley
++	   5 Horizon Drive
++	   Jamboree Heights
++	   Queensland 4074
++	   Australia
++
++-------------------------------------------------------------------------*/
++
++#include <metamail/common.h>
++
++#include "richlex.h"
++#include "richset.h"
++
++/*
++ * Define a list of all character set processors in memory.
++ */
++static	struct	charsetproc	*CharacterSets[] =
++	  {&usascii_charset,
++	   &iso2022_charset,
++	   NULL};
++
++/*
++ * Global data for this module.
++ */
++#define	MAX_CHAR_SETS	100
++static	int	NumCharSets=0;
++static	struct	charsetproc	*CharSets[MAX_CHAR_SETS];
++static	int	CharEncStack[MAX_CHAR_SETS];
++
++/*
++ * Initialise the stack of character set processors, starting with
++ * a particular base processor.  The initialisation function of all
++ * character set processors is called.
++ */
++charsetinit (charset,name)
++struct	charsetproc *charset;
++char	*name;
++{
++    int temp = 0;
++    CharSets[0] = charset;
++    NumCharSets = 1;
++    while (CharacterSets[temp]) {
++        (*(CharacterSets[temp] -> init))
++		((CharacterSets[temp] == charset ? name : NULL));
++	++temp;
++    }
++}
++
++/*
++ * Initialise the stack, starting with a character set processor with
++ * a particular name.
++ */
++charsetnameinit	(name)
++char	*name;
++{
++    int temp = 0;
++    int succeed = 0;
++    char *temp1,*temp2;
++    struct charsetproc *charset = &usascii_charset;
++    while (!succeed && CharacterSets[temp]) {
++	temp2 = CharacterSets[temp] -> names;
++	while (!succeed && *temp2) {
++	    temp1 = name;
++	    while (*temp1 && *temp2 && *temp2 != ':' && *temp2 == *temp1) {
++		++temp1;
++		++temp2;
++	    }
++	    if (*temp1 == '\0' && (*temp2 == '\0' || *temp2 == ':')) {
++		succeed = 1;
++		charset = CharacterSets[temp];
++	    }
++	    while (*temp2 && *temp2 != ':') {
++		++temp2;
++	    }
++	    if (*temp2 == ':') {
++		++temp2;
++	    }
++	}
++	++temp;
++    }
++    charsetinit (charset,name);
++}
++
++/*
++ * Push a new character set processor onto the stack.
++ */
++charsetpush (charset)
++struct	charsetproc *charset;
++{
++    if (NumCharSets >= MAX_CHAR_SETS) {
++    	fprintf (stderr,"Too many nested character sets: aborting\n");
++	exit (1);
++    } else {
++	CharEncStack[NumCharSets - 1] = RichtextCharEncoding;
++	(*(CharSets[NumCharSets - 1] -> encoding)) (-1); /* Leave current */
++    	CharSets[NumCharSets++] = charset;
++    }
++}
++
++/*
++ * Pop the top-most character set processor off the stack
++ * if it matches the given processor.  Note: the base
++ * processor is never popped off.
++ */
++charsetpop (charset)
++struct	charsetproc *charset;
++{
++    if (NumCharSets > 1 && CharSets[NumCharSets - 1] == charset) {
++        --NumCharSets;
++	richtextencoding (CharEncStack[NumCharSets - 1]);
++	(*(CharSets[NumCharSets - 1] -> encoding)) (RichtextCharEncoding);
++    }
++}
++
++/*
++ * See if the character set processor on the top of the stack
++ * matches the given processor.
++ */
++int	charsettop (charset)
++struct	charsetproc *charset;
++{
++    if (NumCharSets > 1) {
++	return (CharSets[NumCharSets - 1] == charset);
++    } else {
++	return (0);
++    }
++}
++
++/*
++ * Set the details for a character set member in the top-most
++ * character set.
++ */
++charmember (member,ch)
++struct	charsetmember *member;
++RCHAR	ch;
++{
++    member -> ch = ch;
++    member -> charset = CharSets[NumCharSets - 1];
++}
++
++/*
++ * Set the details for a member of a specific character set.
++ */
++charmemberspec (member,ch,charset)
++struct	charsetmember *member;
++RCHAR	ch;
++struct	charsetproc *charset;
++{
++    member -> ch = ch;
++    member -> charset = charset;
++}
++
++/*
++ * Set the details for a output control code character.
++ */
++charmemberctrl (member,ch)
++struct	charsetmember *member;
++RCHAR	ch;
++{
++    member -> ch = ch;
++    member -> charset = NULL;
++}
++
++/*
++ * Attempt to process a richtext command by passing it to the
++ * "command" function of all character set processors.  Returns
++ * zero if the command was not processed.
++ */
++int	charsetcommand (token,negated)
++char	*token;
++int	negated;
++{
++    int temp = 0;
++    while (CharacterSets[temp]) {
++    	if ((*(CharacterSets[temp] -> command)) (token,negated))
++	    return (1);
++	++temp;
++    }
++    return (0);
++}
++
++/*
++ * Test for an extension singleton command.
++ */
++int	charsetsingle (token)
++char	*token;
++{
++    int temp = 0;
++    while (CharacterSets[temp]) {
++    	if ((*(CharacterSets[temp] -> single)) (token))
++	    return (1);
++	++temp;
++    }
++    return (0);
++}
+--- metamail-2.7.orig/src/Makefile.in
++++ metamail-2.7/src/Makefile.in
+@@ -0,0 +1,298 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++MAINTAINERCLEANFILES = Makefile.in
++
++SUBDIRS = metamail richmail
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = ../metamail/config.h
++CONFIG_CLEAN_FILES = 
++DIST_COMMON =  Makefile.am Makefile.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++all: all-redirect
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++# This directory's subdirectories are mostly independent; you can cd
++# into them and run `make' without going through this Makefile.
++# To change the values of `make' variables: instead of editing Makefiles,
++# (1) if the variable is set in `config.status', edit `config.status'
++#     (which will cause the Makefiles to be regenerated when you run `make');
++# (2) otherwise, pass the desired values on the `make' command line.
++
++@SET_MAKE@
++
++all-recursive install-data-recursive install-exec-recursive \
++installdirs-recursive install-recursive uninstall-recursive  \
++check-recursive installcheck-recursive info-recursive dvi-recursive:
++	@set fnord $(MAKEFLAGS); amf=$$2; \
++	dot_seen=no; \
++	target=`echo $@ | sed s/-recursive//`; \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    dot_seen=yes; \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	done; \
++	if test "$$dot_seen" = "no"; then \
++	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
++	fi; test -z "$$fail"
++
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
++	@set fnord $(MAKEFLAGS); amf=$$2; \
++	dot_seen=no; \
++	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
++	  rev="$$subdir $$rev"; \
++	  test "$$subdir" != "." || dot_seen=yes; \
++	done; \
++	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	target=`echo $@ | sed s/-recursive//`; \
++	for subdir in $$rev; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	done && test -z "$$fail"
++tags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++	done
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++   if test "$$subdir" = .; then :; else \
++	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
++   fi; \
++	done; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = src
++
++distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++	for subdir in $(SUBDIRS); do \
++	  if test "$$subdir" = .; then :; else \
++	    test -d $(distdir)/$$subdir \
++	    || mkdir $(distdir)/$$subdir \
++	    || exit 1; \
++	    chmod 777 $(distdir)/$$subdir; \
++	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
++	      || exit 1; \
++	  fi; \
++	done
++info-am:
++info: info-recursive
++dvi-am:
++dvi: dvi-recursive
++check-am: all-am
++check: check-recursive
++installcheck-am:
++installcheck: installcheck-recursive
++install-exec-am:
++install-exec: install-exec-recursive
++
++install-data-am:
++install-data: install-data-recursive
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-recursive
++uninstall-am:
++uninstall: uninstall-recursive
++all-am: Makefile
++all-redirect: all-recursive
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs: installdirs-recursive
++installdirs-am:
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-tags mostlyclean-generic
++
++mostlyclean: mostlyclean-recursive
++
++clean-am:  clean-tags clean-generic mostlyclean-am
++
++clean: clean-recursive
++
++distclean-am:  distclean-tags distclean-generic clean-am
++	-rm -f libtool
++
++distclean: distclean-recursive
++
++maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
++		distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-recursive
++
++.PHONY: install-data-recursive uninstall-data-recursive \
++install-exec-recursive uninstall-exec-recursive installdirs-recursive \
++uninstalldirs-recursive all-recursive check-recursive \
++installcheck-recursive info-recursive dvi-recursive \
++mostlyclean-recursive distclean-recursive clean-recursive \
++maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
++distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs-am \
++installdirs mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/src/metamail/mailcap.h
++++ metamail-2.7/src/metamail/mailcap.h
+@@ -0,0 +1,34 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++
++#ifndef METAMAIL_MAILCAP_H
++#define METAMAIL_MAILCAP_H 1
++
++struct MailcapEntry {
++  char *contenttype;
++  char *command;
++  char *testcommand;
++  int needsterminal;
++  int copiousoutput;
++  int needtofree;
++  char *label;
++  char *printcommand;
++};
++
++int  ProcessMailcapFiles (char *);
++int  TryBuiltIns         (char *);
++int  ProcessMailcapFile  (char *, char*);
++
++#endif /* METAMAIL_MAILCAP_H */
+--- metamail-2.7.orig/src/metamail/output
++++ metamail-2.7/src/metamail/output
+@@ -0,0 +1,428 @@
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=7  (from Stephan Wright <stephan.wright@chello.at> )
++MM_HEADERS=
++From stephan.wright@chello.at Wed Jan 17 00:54:06 2001
++Return-path: <stephan.wright@chello.at>
++Envelope-to: mike@localhost
++Delivery-date: Wed, 17 Jan 2001 00:54:06 +0100
++Received: from localhost ([127.0.0.1] ident=mail)
++	by skair.in.natoka.at with esmtp (Exim 3.20 #1 (Debian))
++	id 14IfvR-0000eJ-00
++	for <mike@localhost>; Wed, 17 Jan 2001 00:54:05 +0100
++Received: from stud3.tuwien.ac.at [193.170.75.13]
++	by localhost with POP3 (fetchmail-5.5.3)
++	for mike@localhost (single-drop); Wed, 17 Jan 2001 00:54:05 +0100 (CET)
++Received: from mr.tuwien.ac.at (mr.tuwien.ac.at [128.130.2.10])
++	by stud3.tuwien.ac.at (8.9.3 (PHNE_18979)/8.9.3) with ESMTP id AAA08182;
++	Wed, 17 Jan 2001 00:39:08 +0100 (MET)
++Received: from viemta06.chello.at (viemta06.chello.at [195.34.133.56])
++	by mr.tuwien.ac.at (8.11.1/8.11.1) with ESMTP id f0GNd4C26837;
++	Wed, 17 Jan 2001 00:39:04 +0100 (MET)
++Received: from michelangelo.telekabel.at ([62.178.9.127])
++          by viemta06.chello.at
++          (InterMail vK.4.03.01.00 201-232-122 license 9caa03a7df1d31c048ffcc0d31ac5855)
++          with ESMTP
++          id <20010116233900.BMRG7188.viemta06@michelangelo.telekabel.at>;
++          Wed, 17 Jan 2001 00:39:00 +0100
++Message-ID: <3A64DBB9.74527B61@chello.at>
++Date: Wed, 17 Jan 2001 00:39:37 +0100
++From: Stephan Wright <stephan.wright@chello.at>
++Reply-To: stephan.wright@chello.at
++X-Mailer: Mozilla 4.01 [de] (Win95; I)
++MIME-Version: 1.0
++To: Wolfgang Hiermann <wolfgang.hiermann@teleweb.at>,
++        Susanne Schuster <e9107982@student.tuwien.ac.at>,
++        Roland Summerauer <h9751337@obelix.wu-wien.ac.at>,
++        Raimund Kirner <e9625030@student.tuwien.ac.at>,
++        "Michael Mörz" <e9625136@student.tuwien.ac.at>,
++        Doris Ulrich <e8101579@student.tuwien.ac.at>,
++        Daniel Wronski <e9625027@student.tuwien.ac.at>,
++        Balazs Lichtl <e9625772@stud3.tuwien.ac.at>
++Subject: [Fwd: Fw: Das ist aber lieb geschrieben!]
++X-Priority: 3 (Normal)
++Content-Type: multipart/mixed; boundary="------------A0D4511CCFC2DF8B814B1B9E"
++X-UIDL: *2+!!Ec8e9F>?!!70^!!
++Status: RO
++Content-Length: 32777
++Lines: 485
++
++MM_NOTTTY=1
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=multipart/mixed ; boundary = "------------A0D4511CCFC2DF8B814B1B9E"
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=oding: 8bit  (from Stephan Wright <stephan.wright@chello.at> )
++MM_HEADERS=
++Content-Type: text/plain; charset=iso-8859-1
++Content-Type: text/plain; charset=iso-8859-1
++Content-Transfer-Encoding: 8bit
++Content-Transfer-Encoding: 8bit
++
++MM_NOTTTY=1
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=text/plain ; charset = iso-8859-1
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=oding: 8bit  (from Stephan Wright <stephan.wright@chello.at> )
++MM_HEADERS=
++Content-Type: text/plain; charset=iso-8859-1
++Content-Type: text/plain; charset=iso-8859-1
++Content-Transfer-Encoding: 8bit
++Content-Transfer-Encoding: 8bit
++
++MM_NOTTTY=0
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=text/plain ; charset = iso-8859-1
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++Metamail Version 2.7, debugging turned on.
++Trying to open input file: ../../../../metamailtest
++Date: Wed, 17 Jan 2001 00:39:37 +0100
++From: Stephan Wright <stephan.wright@chello.at>
++To: Wolfgang Hiermann <wolfgang.hiermann@teleweb.at>,         Susanne Schuster <e9107982@student.tuwien.ac.at>,         Roland Summerauer <h9751337@obelix.wu-wien.ac.at>,         Raimund Kirner <e9625030@student.tuwien.ac.at>,         "Michael Mörz" <e9625136@student.tuwien.ac.at>,         Doris Ulrich <e8101579@student.tuwien.ac.at>,         Daniel Wronski <e9625027@student.tuwien.ac.at>,         Balazs Lichtl <e9625772@stud3.tuwien.ac.at>
++Subject: [Fwd: Fw: Das ist aber lieb geschrieben!]
++NEW PARAMETER: boundary VALUE: "------------A0D4511CCFC2DF8B814B1B9E"
++
++Here is the environment:
++
++Handling multipart as built-in here.  Boundary: --------------A0D4511CCFC2DF8B814B1B9E
++NEW PARAMETER: charset VALUE: iso-8859-1
++
++Here is the environment:
++
++Here is the environment:
++
++---Executing: xterm -title 'oding: 8bit  (from Stephan Wright <stephan.wright@chello.at> )' -e  metamail -P -b -c 'text/plain ; charset = iso-8859-1' /tmp/MQxhZtQ
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=inline  (from Stephan Wright <stephan.wright@chello.at> )
++MM_HEADERS=
++Content-Type: message/rfc822
++Content-Transfer-Encoding: 8bit
++Content-Disposition: inline
++
++MM_NOTTTY=1
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=message/rfc822
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
++MM_HEADERS=
++Return-Path: <Marion.spahlholz@chello.at>
++Received: from marionharald ([213.47.119.62]) by viemta06.chello.at
++          (InterMail vK.4.03.01.00 201-232-122 license 9caa03a7df1d31c048ffcc0d31ac5855)
++          with SMTP id <20010112191934.DEQK23142.viemta06@marionharald>;
++          Fri, 12 Jan 2001 20:19:34 +0100
++Message-ID: <00b301c07ccd$7e71c8e0$3e772fd5@telekabel.at>
++From: "Marion Spahlholz" <Marion.spahlholz@chello.at>
++To: "Peter Ipser" <peter.ipser@chello.at>
++Cc: "Rudolf Meyer" <rudolf.meyer@chello.at>,
++	"Martina Fitzka" <tini@yline.com>,
++	=?iso-8859-1?Q?Evelyn_L=F6wenrosen?= <evelyn.loewenrosen@chello.at>,
++	"Stephan Wright" <stephan.wright@chello.at>
++Subject: Fw: Das ist aber lieb geschrieben!
++Date: Fri, 12 Jan 2001 20:25:59 +0100
++MIME-Version: 1.0
++Content-Type: multipart/mixed;
++	boundary="----=_NextPart_000_00B0_01C07CD5.E0149F20"
++X-Priority: 3
++X-MSMail-Priority: Normal
++X-Mailer: Microsoft Outlook Express 5.50.4133.2400
++X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
++
++MM_NOTTTY=1
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=multipart/mixed ; boundary = "----=_NextPart_000_00B0_01C07CD5.E0149F20"
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
++MM_HEADERS=
++Content-Type: text/plain;
++	charset="iso-8859-1"
++Content-Transfer-Encoding: 8bit
++
++MM_NOTTTY=1
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=text/plain ; charset = "iso-8859-1"
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
++MM_HEADERS=
++Content-Type: text/plain;
++	charset="iso-8859-1"
++Content-Transfer-Encoding: 8bit
++
++MM_NOTTTY=0
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=text/plain ; charset = "iso-8859-1"
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
++Command exit status: 0
++‡(­û‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@ˆƒ@
++Here is the environment:
++
++From: "Marion Spahlholz" <Marion.spahlholz@chello.at>
++To: "Peter Ipser" <peter.ipser@chello.at>
++Cc: "Rudolf Meyer" <rudolf.meyer@chello.at>,  "Martina Fitzka" <tini@yline.com>,  [** iso-8859-1 charset **] Evelyn Löwenrosen‡(­û‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@‡ƒ@ˆƒ@<evelyn.loewenrosen@chello.at>,  "Stephan Wright" <stephan.wright@chello.at>
++Subject: Fw: Das ist aber lieb geschrieben!
++Date: Fri, 12 Jan 2001 20:25:59 +0100
++MIME-Version: 1.0
++NEW PARAMETER: boundary VALUE: "----=_NextPart_000_00B0_01C07CD5.E0149F20"
++X-Priority: 3
++X-MSMail-Priority: Normal
++X-Mailer: Microsoft Outlook Express 5.50.4133.2400
++X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
++
++
++Here is the environment:
++
++Handling multipart as built-in here.  Boundary: ------=_NextPart_000_00B0_01C07CD5.E0149F20
++NEW PARAMETER: charset VALUE: "iso-8859-1"
++
++Here is the environment:
++
++Here is the environment:
++
++---Executing: xterm -title 'Fw: Das ist aber lieb geschrieben   (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )' -e  metamail -P -b -c 'text/plain ; charset = "iso-8859-1"' /tmp/MGsYu2s
++PWD=/home/mike/debian/metamail-2.7/src/metamail
++XAUTHORITY=/home/mike/.Xauthority
++WINDOWID=20971534
++MM_SUMMARY=attachment;  filename="Fortflanzung.gif"  (from "Marion Spahlholz" <Marion.spahlholz@chello.at> )
++MM_HEADERS=
++Content-Type: image/gif;
++	name="Fortflanzung.gif"
++Content-Transfer-Encoding: base64
++Content-Disposition: attachment;
++	filename="Fortflanzung.gif"
++
++MM_NOTTTY=1
++MM_QUIET=cat
++HOSTNAME=skair
++DEBFULLNAME=Michael Moerz
++MM_MAILER=unknown
++GDMSESSION=Gnome
++USER=mike
++MACHTYPE=i386-pc-linux-gnu
++DEBEMAIL=e9625136@stud3.tuwien.ac.at
++MAIL=/var/spool/mail/mike
++LANG=C
++DISPLAY=:0.0
++MM_USEPAGER=0
++LOGNAME=mike
++SHLVL=3
++SSH_AGENT_PID=1306
++SESSION_MANAGER=local/skair:/tmp/.ICE-unix/1263
++MM_CONTENTTYPE=image/gif ; name = "Fortflanzung.gif"
++USERNAME=mike
++SHELL=/bin/bash
++HOSTTYPE=i386
++CVSROOT=:pserver:mike@localhost:/home/repositories
++MM_DEBUG=1
++MM_NOASK=text,text/plain,text/richtext
++MM_RUNASROOT=0
++OSTYPE=linux-gnu
++HOME=/home/mike
++TERM=xterm
++SSH_AUTH_SOCK=/tmp/ssh-ApDG1263/agent.1263
++PATH=/home/mike/debian/metamail-2.7/src/metamail/.libs:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
++_=/usr/bin/printenv
+--- metamail-2.7.orig/src/metamail/environment.h
++++ metamail-2.7/src/metamail/environment.h
+@@ -0,0 +1,11 @@
++#ifndef METAMAIL_ENVIRONMENT_H
++#define METAMAIL_ENVIRONMENT_H 1
++
++#define ENVIRONMENT_TMPROOT_DEFAULT_LEN 5
++#define ENVIRONMENT_TMPROOT_DEFAULT "/tmp"
++
++void addToPath                      (char *);
++void initMailHeadersFromEnvironment ();
++void initVarsFromEnvironment        ();
++
++#endif /* METAMAIL_ENVIRONMENT_H */
+--- metamail-2.7.orig/src/metamail/Makefile.am
++++ metamail-2.7/src/metamail/Makefile.am
+@@ -0,0 +1,21 @@
++MAINTAINERCLEANFILES    = Makefile.in
++
++CFLAGS			= -lncurses
++
++INCLUDES                = -I$(top_builddir) -I$(top_builddir)/metamail \
++                        -I$(top_srcdir) -I$(top_srcdir)/metamail
++
++bin_PROGRAMS            = metamail mimencode mailto splitmail
++
++metamail_SOURCES	= metamail.c codes.c uue.c shared.c environment.c \
++mailcap.c tmpfile.c
++metamail_LDADD		= $(top_builddir)/metamail/libmetamail.la
++
++mimencode_SOURCES	= mimencode.c codes.c
++mimencode_LDADD		= $(top_builddir)/metamail/libmetamail.la
++
++mailto_SOURCES		= mailto.c codes.c shared.c
++mailto_LDADD		= $(top_builddir)/metamail/libmetamail.la
++
++splitmail_SOURCES	= splitmail.c shared.c
++splitmail_LDADD		= $(top_builddir)/metamail/libmetamail.la
+--- metamail-2.7.orig/src/metamail/tmpfile.h
++++ metamail-2.7/src/metamail/tmpfile.h
+@@ -0,0 +1,15 @@
++#ifndef METAMAIL_TMPFILE_H
++#define METAMAIL_TMPFILE_H 1
++
++/* create and remove tmpfiles */
++void MkTmpFileName( char* );
++void RmTmpFileName( char* );
++/* and cleanup after doing all kind of things */
++void CleanupTmpFiles( void );
++
++/* register and unregister tmpfiles */
++/* these functions should not be invoked directly (there are exceptions) */
++void AddTmpFileName( char* );
++void DelTmpFileName( char* );
++
++#endif /* METAMAIL_TMP_FILE_H */
+--- metamail-2.7.orig/src/metamail/Makefile.in
++++ metamail-2.7/src/metamail/Makefile.in
+@@ -0,0 +1,399 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++MAINTAINERCLEANFILES = Makefile.in
++
++CFLAGS = -lncurses
++
++INCLUDES = -I$(top_builddir) -I$(top_builddir)/metamail                         -I$(top_srcdir) -I$(top_srcdir)/metamail
++
++
++bin_PROGRAMS = metamail mimencode mailto splitmail
++
++metamail_SOURCES = metamail.c codes.c uue.c shared.c environment.c mailcap.c tmpfile.c
++
++metamail_LDADD = $(top_builddir)/metamail/libmetamail.la
++
++mimencode_SOURCES = mimencode.c codes.c
++mimencode_LDADD = $(top_builddir)/metamail/libmetamail.la
++
++mailto_SOURCES = mailto.c codes.c shared.c
++mailto_LDADD = $(top_builddir)/metamail/libmetamail.la
++
++splitmail_SOURCES = splitmail.c shared.c
++splitmail_LDADD = $(top_builddir)/metamail/libmetamail.la
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = ../../metamail/config.h
++CONFIG_CLEAN_FILES = 
++bin_PROGRAMS =  metamail$(EXEEXT) mimencode$(EXEEXT) mailto$(EXEEXT) \
++splitmail$(EXEEXT)
++PROGRAMS =  $(bin_PROGRAMS)
++
++
++DEFS = @DEFS@ -I. -I$(srcdir) -I../../metamail
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++metamail_OBJECTS =  metamail.$(OBJEXT) codes.$(OBJEXT) uue.$(OBJEXT) \
++shared.$(OBJEXT) environment.$(OBJEXT) mailcap.$(OBJEXT) \
++tmpfile.$(OBJEXT)
++metamail_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
++metamail_LDFLAGS = 
++mimencode_OBJECTS =  mimencode.$(OBJEXT) codes.$(OBJEXT)
++mimencode_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
++mimencode_LDFLAGS = 
++mailto_OBJECTS =  mailto.$(OBJEXT) codes.$(OBJEXT) shared.$(OBJEXT)
++mailto_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
++mailto_LDFLAGS = 
++splitmail_OBJECTS =  splitmail.$(OBJEXT) shared.$(OBJEXT)
++splitmail_DEPENDENCIES =  $(top_builddir)/metamail/libmetamail.la
++splitmail_LDFLAGS = 
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++DIST_COMMON =  Makefile.am Makefile.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++DEP_FILES =  .deps/codes.P .deps/environment.P .deps/mailcap.P \
++.deps/mailto.P .deps/metamail.P .deps/mimencode.P .deps/shared.P \
++.deps/splitmail.P .deps/tmpfile.P .deps/uue.P
++SOURCES = $(metamail_SOURCES) $(mimencode_SOURCES) $(mailto_SOURCES) $(splitmail_SOURCES)
++OBJECTS = $(metamail_OBJECTS) $(mimencode_OBJECTS) $(mailto_OBJECTS) $(splitmail_OBJECTS)
++
++all: all-redirect
++.SUFFIXES:
++.SUFFIXES: .S .c .lo .o .obj .s
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/metamail/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++mostlyclean-binPROGRAMS:
++
++clean-binPROGRAMS:
++	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
++
++distclean-binPROGRAMS:
++
++maintainer-clean-binPROGRAMS:
++
++install-binPROGRAMS: $(bin_PROGRAMS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	  else :; fi; \
++	done
++
++uninstall-binPROGRAMS:
++	@$(NORMAL_UNINSTALL)
++	list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	done
++
++# FIXME: We should only use cygpath when building on Windows,
++# and only if it is available.
++.c.obj:
++	$(COMPILE) -c `cygpath -w $<`
++
++.s.o:
++	$(COMPILE) -c $<
++
++.S.o:
++	$(COMPILE) -c $<
++
++mostlyclean-compile:
++	-rm -f *.o core *.core
++	-rm -f *.$(OBJEXT)
++
++clean-compile:
++
++distclean-compile:
++	-rm -f *.tab.c
++
++maintainer-clean-compile:
++
++.s.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.S.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++
++maintainer-clean-libtool:
++
++metamail$(EXEEXT): $(metamail_OBJECTS) $(metamail_DEPENDENCIES)
++	@rm -f metamail$(EXEEXT)
++	$(LINK) $(metamail_LDFLAGS) $(metamail_OBJECTS) $(metamail_LDADD) $(LIBS)
++
++mimencode$(EXEEXT): $(mimencode_OBJECTS) $(mimencode_DEPENDENCIES)
++	@rm -f mimencode$(EXEEXT)
++	$(LINK) $(mimencode_LDFLAGS) $(mimencode_OBJECTS) $(mimencode_LDADD) $(LIBS)
++
++mailto$(EXEEXT): $(mailto_OBJECTS) $(mailto_DEPENDENCIES)
++	@rm -f mailto$(EXEEXT)
++	$(LINK) $(mailto_LDFLAGS) $(mailto_OBJECTS) $(mailto_LDADD) $(LIBS)
++
++splitmail$(EXEEXT): $(splitmail_OBJECTS) $(splitmail_DEPENDENCIES)
++	@rm -f splitmail$(EXEEXT)
++	$(LINK) $(splitmail_LDFLAGS) $(splitmail_OBJECTS) $(splitmail_LDADD) $(LIBS)
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = src/metamail
++
++distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/metamail/Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am: install-binPROGRAMS
++install-exec: install-exec-am
++
++install-data-am:
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-binPROGRAMS
++uninstall: uninstall-am
++all-am: Makefile $(PROGRAMS)
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++	$(mkinstalldirs)  $(DESTDIR)$(bindir)
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
++		mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
++		clean-depend clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
++	-rm -f libtool
++
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-binPROGRAMS \
++		maintainer-clean-compile maintainer-clean-libtool \
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-am
++
++.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
++maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
++mostlyclean-compile distclean-compile clean-compile \
++maintainer-clean-compile mostlyclean-libtool distclean-libtool \
++clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
++distclean-tags clean-tags maintainer-clean-tags distdir \
++mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/src/metamail/mailcap.c
++++ metamail-2.7/src/metamail/mailcap.c
+@@ -0,0 +1,118 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++/* mailcap.c - contains functions to access and parse mailcap files
++    Authors:  Nathaniel S. Borenstein, Bellcore
++              Michael Moerz <mikem@debian.org>
++*/
++
++#include <metamail/common.h>
++
++#include "mailcap.h"
++#include "metamail.h"
++
++/* Only one or the other set up builtins gets used,
++  depending on whether or not we're in the middle of 
++          a multipart/alternative body part */
++struct MailcapEntry BuiltIns[] = {
++    {"text/*", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
++    {NULL, NULL, NULL, 0, 0, 0}};
++
++struct MailcapEntry BuiltInsAlternative[] = {
++    {"text/plain", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
++    {NULL, NULL, NULL, 0, 0, 0}};
++
++/** hmm, ... 
++*/
++int
++ProcessMailcapFiles(SquirrelFile) 
++char *SquirrelFile;
++{
++    char *s, *pathcopy = NULL;
++    char *path = getenv("MAILCAPS");
++    if (!path) {
++        uid_t uid = getuid();
++        struct passwd *p;
++        p = getpwuid(uid);
++	if (p) {
++	  path = XMALLOC(char, 5 + strlen(p->pw_dir) + strlen(STDPATH));
++	}
++        strcpy(path, p->pw_dir);
++        strcat(path, STDPATH);
++        pathcopy = path;
++    } else 
++    {
++        pathcopy = XMALLOC(char, 1+strlen(path));
++        strcpy(pathcopy, path);
++        path = pathcopy;
++    }
++    while(path) {
++        s = index(path, PATH_SEPARATOR);
++        if (s) *s++ = 0;
++        if (!ProcessMailcapFile(path, SquirrelFile)) return(0);
++        path = s;
++    }
++    if (pathcopy) XFREE(pathcopy);
++    return(-1);
++}
++
++int
++TryBuiltIns(SquirrelFile) 
++char *SquirrelFile;
++{
++  int i;
++  /* Last resort -- for sites that didn't bother putting a "text" line in 
++     their mailcap files... */
++  if (DoDebug) 
++    fprintf(stderr, "Looking for '%s' in built-in content-type handling "
++	    "settings.\n", ContentType);
++  for (i=0; BuiltIns[i].contenttype; ++i) {
++    if (!TryMailcapEntry(SquirrelFile ? BuiltInsAlternative[i] : BuiltIns[i], SquirrelFile))
++      return(0);
++  }
++  return(-1);
++}
++
++int
++ProcessMailcapFile(file, SquirrelFile)
++char *file, *SquirrelFile;
++{
++    struct MailcapEntry mc;
++    FILE *fp;
++    int res;
++
++    res = IsDirectory(file);
++    if (res) {
++	if (res == 1) {
++	    fprintf(stderr, "Mailcap path entry '%s' is a directory, should be a readable file.\n", file);
++	} else if (DoDebug) {
++	/* Quietly ignore non-existent mailcap files unless debugging */
++	    fprintf(stderr, "Mailcap path entry '%s' does not exist.\n", file);
++	}
++	return(-1);
++    }
++    fp = fopen(file, "r");
++    if (DoDebug) fprintf(stderr, "Looking for '%s' in mailcap file '%s'.\n", ContentType, file);
++    while (fp && !feof(fp)) {
++        mc.needtofree = 0;
++	if (GetMailcapEntry(fp, &mc)) {
++            if (!TryMailcapEntry(mc, SquirrelFile)) {
++                fclose(fp);
++                return(0);
++            }
++	}
++    }
++    if (fp) fclose(fp);
++    return(-1);
++}
+--- metamail-2.7.orig/src/metamail/codes.c
++++ metamail-2.7/src/metamail/codes.c
+@@ -0,0 +1,432 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++#include <metamail/common.h>
++
++extern char *index();
++static char basis_64[] =
++   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
++
++static char index_64[128] = {
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
++    52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1,-1,-1,-1,
++    -1, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
++    15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
++    -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
++    41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
++};
++
++#define char64(c)  (((c) < 0 || (c) > 127) ? -1 : index_64[(c)])
++
++/*
++char64(c)
++char c;
++{
++    char *s = (char *) index(basis_64, c);
++    if (s) return(s-basis_64);
++    return(-1);
++}
++*/
++
++/* the following gets a character, but fakes it properly into two chars if there's a newline character */
++static int InNewline=0;
++
++int nextcharin(infile, PortableNewlines)
++FILE *infile;
++int PortableNewlines;
++{
++    int c;
++
++#ifndef NEWLINE_CHAR
++    return(getc(infile));
++#else
++    if (!PortableNewlines) return(getc(infile));
++    if (InNewline) {
++        InNewline = 0;
++        return(10); /* LF */
++    }
++    c = getc(infile);
++    if (c == NEWLINE_CHAR) {
++        InNewline = 1;
++        return(13); /* CR */
++    }
++    return(c);
++#endif
++}
++
++to64(infile, outfile, PortableNewlines) 
++FILE *infile, *outfile;
++int PortableNewlines;
++{
++    int c1, c2, c3, ct=0;
++    InNewline = 0; /* always reset it */
++    while ((c1 = nextcharin(infile, PortableNewlines)) != EOF) {
++        c2 = nextcharin(infile, PortableNewlines);
++        if (c2 == EOF) {
++            output64chunk(c1, 0, 0, 2, outfile);
++        } else {
++            c3 = nextcharin(infile, PortableNewlines);
++            if (c3 == EOF) {
++                output64chunk(c1, c2, 0, 1, outfile);
++            } else {
++                output64chunk(c1, c2, c3, 0, outfile);
++            }
++        }
++        ct += 4;
++        if (ct > 71) {
++            putc('\n', outfile);
++            ct = 0;
++        }
++    }
++    if (ct) putc('\n', outfile);
++    fflush(outfile);
++}
++
++output64chunk(c1, c2, c3, pads, outfile)
++FILE *outfile;
++{
++    putc(basis_64[c1>>2], outfile);
++    putc(basis_64[((c1 & 0x3)<< 4) | ((c2 & 0xF0) >> 4)], outfile);
++    if (pads == 2) {
++        putc('=', outfile);
++        putc('=', outfile);
++    } else if (pads) {
++        putc(basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)], outfile);
++        putc('=', outfile);
++    } else {
++        putc(basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)], outfile);
++        putc(basis_64[c3 & 0x3F], outfile);
++    }
++}
++
++PendingBoundary(s, Boundaries, BoundaryCt)
++char *s;
++char **Boundaries;
++int *BoundaryCt;
++{
++    int i, len;
++
++    if (s[0] != '-' || s[1] != '-') return(0);
++
++
++    for (i=0; i < *BoundaryCt; ++i) {
++	len = strlen(Boundaries[i]);
++        if (!strncmp(s, Boundaries[i], len)) {
++            if (s[len] == '-' && s[len+1] == '-') *BoundaryCt = i;
++            return(1);
++        }
++    }
++    return(0);
++}
++
++/* If we're in portable newline mode, we have to convert CRLF to the 
++    local newline convention on output */
++
++static int CRpending = 0;
++
++#ifdef NEWLINE_CHAR
++almostputc(c, outfile, PortableNewlines)
++int c;
++FILE *outfile;
++int PortableNewlines;
++{
++    if (CRpending) {
++        if (c == 10) {
++            putc(NEWLINE_CHAR, outfile);
++            CRpending = 0;
++        } else {
++            putc(13, outfile);
++	    if (c != 13) {
++            	putc(c, outfile);
++		CRpending = 0;
++	    }
++        }
++    } else {
++        if (PortableNewlines && c == 13) {
++            CRpending = 1;
++        } else {
++            putc(c, outfile);
++        }
++    }
++}
++#else
++almostputc(c, outfile, PortableNewlines)
++int c;
++FILE *outfile;
++int PortableNewlines;
++{
++    putc(c, outfile);
++}
++#endif
++
++from64(infile, outfile, boundaries, boundaryct, PortableNewlines) 
++FILE *infile, *outfile;
++char **boundaries;
++int *boundaryct;
++int PortableNewlines;
++{
++    int c1, c2, c3, c4;
++    int newline = 1, DataDone = 0;
++
++    /* always reinitialize */
++    CRpending = 0;
++    while ((c1 = getc(infile)) != EOF) {
++        if (isspace(c1)) {
++            if (c1 == '\n') {
++                newline = 1;
++            } else {
++                newline = 0;
++            }
++            continue;
++        }
++        if (newline && boundaries && c1 == '-') {
++            char Buf[200];
++            /* a dash is NOT base 64, so all bets are off if NOT a boundary */
++            ungetc(c1, infile);
++            fgets(Buf, sizeof(Buf), infile);
++            if (boundaries
++                 && (Buf[0] == '-')
++                 && (Buf[1] == '-')
++                 && PendingBoundary(Buf, boundaries, boundaryct)) {
++                return;
++            }
++            fprintf(stderr, "Ignoring unrecognized boundary line: %s\n", Buf);
++            continue;
++        }
++        if (DataDone) continue;
++        newline = 0;
++        do {
++            c2 = getc(infile);
++        } while (c2 != EOF && isspace(c2));
++        do {
++            c3 = getc(infile);
++        } while (c3 != EOF && isspace(c3));
++        do {
++            c4 = getc(infile);
++        } while (c4 != EOF && isspace(c4));
++        if (c2 == EOF || c3 == EOF || c4 == EOF) {
++            fprintf(stderr, "Warning: base64 decoder saw premature EOF!\n");
++            return;
++        }
++        if (c1 == '=' || c2 == '=') {
++            DataDone=1;
++            continue;
++        }
++        c1 = char64(c1);
++        c2 = char64(c2);
++        almostputc(((c1<<2) | ((c2&0x30)>>4)), outfile, PortableNewlines);
++        if (c3 == '=') {
++            DataDone = 1;
++        } else {
++            c3 = char64(c3);
++            almostputc((((c2&0XF) << 4) | ((c3&0x3C) >> 2)), outfile, PortableNewlines);
++            if (c4 == '=') {
++                DataDone = 1;
++            } else {
++                c4 = char64(c4);
++                almostputc((((c3&0x03) <<6) | c4), outfile, PortableNewlines);
++            }
++        }
++    }
++    if (CRpending) putc(13, outfile); /* Don't drop a lone trailing char 13 */
++}
++
++static char basis_hex[] = "0123456789ABCDEF";
++static char index_hex[128] = {
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++     0, 1, 2, 3,  4, 5, 6, 7,  8, 9,-1,-1, -1,-1,-1,-1,
++    -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1,
++    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1
++};
++
++/* The following version generated complaints on Solaris. */
++/* #define hexchar(c)  (((c) < 0 || (c) > 127) ? -1 : index_hex[(c)])  */
++/*  Since we're no longer ever calling it with anything signed, this should work: */
++#define hexchar(c)  (((c) > 127) ? -1 : index_hex[(c)])
++
++/*
++hexchar(c)
++char c;
++{
++    char *s;
++    if (islower(c)) c = toupper(c);
++    s = (char *) index(basis_hex, c);
++    if (s) return(s-basis_hex);
++    return(-1);
++}
++*/
++
++toqp(infile, outfile) 
++FILE *infile, *outfile;
++{
++    int c, ct=0, prevc=255;
++    while ((c = getc(infile)) != EOF) {
++        if ((c < 32 && (c != '\n' && c != '\t'))
++             || (c == '=')
++             || (c >= 127)
++             /* Following line is to avoid single periods alone on lines,
++               which messes up some dumb smtp implementations, sigh... */
++             || (ct == 0 && c == '.')) {
++            putc('=', outfile);
++            putc(basis_hex[c>>4], outfile);
++            putc(basis_hex[c&0xF], outfile);
++            ct += 3;
++            prevc = 'A'; /* close enough */
++        } else if (c == '\n') {
++            if (prevc == ' ' || prevc == '\t') {
++                putc('=', outfile); /* soft & hard lines */
++                putc(c, outfile);
++            }
++            putc(c, outfile);
++            ct = 0;
++            prevc = c;
++        } else {
++            if (c == 'F' && prevc == '\n') {
++                /* HORRIBLE but clever hack suggested by MTR for sendmail-avoidance */
++                c = getc(infile);
++                if (c == 'r') {
++                    c = getc(infile);
++                    if (c == 'o') {
++                        c = getc(infile);
++                        if (c == 'm') {
++                            c = getc(infile);
++                            if (c == ' ') {
++                                /* This is the case we are looking for */
++                                fputs("=46rom", outfile);
++                                ct += 6;
++                            } else {
++                                fputs("From", outfile);
++                                ct += 4;
++                            }
++                        } else {
++                            fputs("Fro", outfile);
++                            ct += 3;
++                        }
++                    } else {
++                        fputs("Fr", outfile);
++                        ct += 2;
++                    }
++                } else {
++                    putc('F', outfile);
++                    ++ct;
++                }
++                ungetc(c, infile);
++                prevc = 'x'; /* close enough -- printable */
++            } else { /* END horrible hack */
++                putc(c, outfile);
++                ++ct;
++                prevc = c;
++            }
++        }
++        if (ct > 72) {
++            putc('=', outfile);
++            putc('\n', outfile);
++            ct = 0;
++            prevc = '\n';
++        }
++    }
++    if (ct) {
++        putc('=', outfile);
++        putc('\n', outfile);
++    }
++}
++
++fromqp(infile, outfile, boundaries, boundaryct) 
++FILE *infile, *outfile;
++char **boundaries;
++int *boundaryct;
++{
++    unsigned int c1, c2;
++    int sawnewline = 1, neednewline = 0;
++    /* The neednewline hack is necessary because the newline leading into 
++      a multipart boundary is part of the boundary, not the data */
++
++    while ((c1 = getc(infile)) != EOF) {
++        if (sawnewline && boundaries && (c1 == '-')) {
++            char Buf[200];
++            unsigned char *s;
++
++            ungetc(c1, infile);
++            fgets(Buf, sizeof(Buf), infile);
++            if (boundaries
++                 && (Buf[0] == '-')
++                 && (Buf[1] == '-')
++                 && PendingBoundary(Buf, boundaries, boundaryct)) {
++                return;
++            }
++            /* Not a boundary, now we must treat THIS line as q-p, sigh */
++            if (neednewline) {
++                putc('\n', outfile);
++                neednewline = 0;
++            }
++            for (s=(unsigned char *) Buf; *s; ++s) {
++                if (*s == '=') {
++                    if (!*++s) break;
++                    if (*s == '\n') {
++                        /* ignore it */
++                        sawnewline = 1;
++                    } else {
++                        c1 = hexchar(*s);
++                        if (!*++s) break;
++                        c2 = hexchar(*s);
++                        putc(c1<<4 | c2, outfile);
++                    }
++                } else {
++#ifdef MSDOS
++                    if (*s == '\n')
++                        putc('\r', outfile);	/* insert CR for binary-mode write */
++#endif
++                    putc(*s, outfile);
++                }
++            }
++        } else {
++            if (neednewline) {
++                putc('\n', outfile);
++                neednewline = 0;
++            }
++            if (c1 == '=') {
++                sawnewline = 0;
++                c1 = getc(infile);
++                if (c1 == '\n') {
++                    /* ignore it */
++                    sawnewline = 1;
++                } else {
++                    c2 = getc(infile);
++                    c1 = hexchar(c1);
++                    c2 = hexchar(c2);
++                    putc(c1<<4 | c2, outfile);
++                    if (c2 == '\n') sawnewline = 1;
++                }
++            } else {
++                if (c1 == '\n') {
++                    sawnewline = 1;
++                    neednewline = 1;
++                } else {
++                    sawnewline = 0;
++                    putc(c1, outfile);
++                }
++            }
++        }
++    }
++    if (neednewline) {
++        putc('\n', outfile);
++        neednewline = 0;
++    }    
++}
+--- metamail-2.7.orig/src/metamail/metamail.h
++++ metamail-2.7/src/metamail/metamail.h
+@@ -0,0 +1,62 @@
++#ifndef METAMAIL_H
++#define METAMAIL_H
++
++#include <metamail/common.h>
++#include <metamail/patchlevel.h>
++
++BEGIN_C_DECLS
++
++#define CATCOMMAND  "cat"
++#define CATTEMPLATE "cat %s"
++#define METAMAIL    "metamail"
++
++#define WRITE_BINARY	"w"
++
++#define CMDSIZE 1200            /* Maximum size of command to execute */
++
++#define LINE_BUF_SIZE       2000
++
++//static char *nomem = "Out of memory!";
++extern char *mmversion;
++extern char *NoAskDefault;
++extern char *QuietDefault;
++extern char *tmproot;
++
++#define ENCODING_NONE 0
++#define ENCODING_BASE64 1
++#define ENCODING_QUOTEDPRINTABLE 2
++#define ENCODING_8BIT 3
++#define ENCODING_UUENCODE -1	/* non-standard */
++
++// for mailto.c (cutted and pasted ere)
++#define MINCHUNKSIZE 20000      /* Better be enough to hold the headers, or we
++				   die! */
++#define MAX_LINELENGTH  2000
++
++struct NoAskItem {
++    char *type;
++    struct NoAskItem *next;
++};
++
++extern char             *mailheaders;
++extern char             *MailerName;
++extern char             *ContentType;
++extern int               Quiet;
++extern struct NoAskItem *FirstNoAskItem;
++extern struct NoAskItem *FirstQuietItem;
++extern int               TransparentMode;
++extern int               RunAsRootOK;
++extern int               DoDebug;
++extern int               YankMode;
++extern int               MightAskBeforeExecuting;
++extern int               DefinitelyNotTty;
++extern int               MustNotBeTty;
++extern int               MaybePageOutput;
++
++END_C_DECLS
++
++#endif /* METAMAIL_H */
++
++
++
++
+--- metamail-2.7.orig/src/metamail/uue.c
++++ metamail-2.7/src/metamail/uue.c
+@@ -0,0 +1,124 @@
++#include <stdio.h>
++
++/*
++ * hack to metamail to decode uuencoded bodyparts
++ * Written by Keith Moore, February 1992
++ */
++
++uueget (ptr, outfp, n)
++char *ptr;
++FILE *outfp;
++{
++    unsigned char c1, c2, c3;
++    unsigned char p0, p1, p2, p3;
++
++    p0 = (ptr[0] - ' ') & 0x3F;
++    p1 = (ptr[1] - ' ') & 0x3F;
++    p2 = (ptr[2] - ' ') & 0x3F;
++    p3 = (ptr[3] - ' ') & 0x3F;
++    
++    c1 = p0 << 2 | p1 >> 4;
++    c2 = p1 << 4 | p2 >> 2;
++    c3 = p2 << 6 | p3;
++
++    if (n >= 1)
++	putc (c1, outfp);
++    if (n >= 2)
++	putc (c2, outfp);
++    if (n >= 3)
++	putc (c3, outfp);
++}
++
++
++getline (buf, size, fp)
++char *buf;
++int size;
++FILE *fp;
++{
++    int c;
++    char *ptr = buf;
++
++    for (c = 0; c < size; ++c)
++	buf[c] = ' ';
++    do {
++	c = getc (fp);
++	if (c == EOF) {
++	    *ptr = '\0';
++	    return (ptr == buf) ? -1 : 0;
++	}
++	else if (c == '\n' || c == '\r') {
++	    *ptr = '\0';
++	    return 0;
++	}
++	else if (ptr == buf && c == '>') /* ">From" line hack */
++	    continue;
++	else if (size > 0) {
++	    *ptr++ = c;
++	    size--;
++	}
++    } while (1);
++    return
++(0); /* shut lint up */
++}
++
++
++fromuue (infp, outfp, boundaries, ctptr)
++FILE *infp, *outfp;
++char **boundaries;
++int *ctptr;
++{
++    char buf[63];
++
++    while (1) {
++	if (getline (buf, sizeof buf, infp) < 0) {
++	    fprintf (stderr, "Premature EOF!\n");
++	    return;
++	}
++	if (strncmp (buf, "begin", 5) == 0)
++	    break;
++	else if (buf[0] == '-' && buf[1] == '-') {
++	    if (boundaries && PendingBoundary (buf, boundaries, ctptr))
++		return;
++	}
++    }	
++    while (1) {
++	if (getline (buf, sizeof buf, infp) < 0) {
++	    fprintf (stderr, "Premature EOF!\n");
++	    return;
++	}
++	else if (strncmp (buf, "end", 5) == 0)
++	    break;
++	else if (buf[0] == '-' && buf[1] == '-') {
++	    if (boundaries && PendingBoundary (buf, boundaries, ctptr)) {
++		fprintf (stderr, "premature end of x-uue body part\n");
++		return;
++	    }
++	    else {
++		fprintf (stderr, "ignoring invalid boundary marker\n");
++		continue;
++	    }
++        }
++        else if (*buf == '\0') continue;
++	else {
++	    int length = (*buf - ' ');
++	    if (*buf == '`')
++		length = 0;
++	    if (length < 0 || length > 63) {
++		fprintf (stderr, "fromuue: illegal length (%d)\n",
++			 length);
++	    }
++/* Nathan Maman recommends commenting out the next two lines */
++	    else if (length == 0)
++		break;
++	    else {
++		char *ptr = buf + 1;
++		while (length > 0) {
++		    uueget (ptr, outfp, length);
++		    length -= 3;
++		    ptr += 4;
++		}
++	    }
++	}
++    }
++}
++
+--- metamail-2.7.orig/src/metamail/shared.c
++++ metamail-2.7/src/metamail/shared.c
+@@ -0,0 +1,120 @@
++#include <stdio.h>
++#include <ctype.h>
++#include <config.h>
++#include <stdlib.h>  /* malloc(3) and realloc(3) */
++#ifdef SYSV
++#include <unistd.h>
++#include <sys/utsname.h>
++#endif
++
++char **Exceptions;
++int *NeedsPortableNewlines;
++int ExceptionsAlloced = 0, ExceptionsUsed = 0;
++
++ExceptionalNewline(contenttype, needsportable)
++char *contenttype;
++int needsportable;
++{
++    char *s;
++    if (ExceptionsAlloced == 0) {
++        ExceptionsAlloced = 25;
++        Exceptions = (char **) malloc(ExceptionsAlloced * sizeof(char *));
++        NeedsPortableNewlines = (int *) malloc(ExceptionsAlloced * sizeof(int));
++        if (!Exceptions || !NeedsPortableNewlines) return(-1);
++    }
++    if (ExceptionsUsed >= ExceptionsAlloced) {
++        ExceptionsAlloced += 25;
++        Exceptions = (char **) realloc(Exceptions, ExceptionsAlloced * sizeof(char *));
++        NeedsPortableNewlines = (int *) realloc(NeedsPortableNewlines, ExceptionsAlloced * sizeof(int));
++        if (!Exceptions || !NeedsPortableNewlines) return(-1);
++    }
++    s = malloc(1+strlen(contenttype));
++    if (!s) return(-1);
++    strcpy(s, contenttype);
++    Exceptions[ExceptionsUsed] = s;
++    for (; *s; ++s) {
++        if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
++    }
++    NeedsPortableNewlines[ExceptionsUsed] = needsportable;
++    ++ExceptionsUsed;
++    return(0);
++}
++
++DoesNeedPortableNewlines(ctype)
++char *ctype;
++{
++    int i;
++
++    /* First, handle the customization/override case */
++    for (i=0; i<ExceptionsUsed; ++i) {
++        if (!lc2strcmp(ctype, Exceptions[i])) {
++             return(NeedsPortableNewlines[i]);
++        }
++    }
++    /* But for most folks, the simple defaults will always suffice */
++    if (!lc2strncmp(ctype, "text", 4)) {
++        return(1);
++    }
++    /* The following two are weird; message & multipart should never be encoded, but they really are line-oriented, so if they ARE encoded (and for PEM, it is even legitimate) they should use portable newlines */
++    if (!lc2strncmp(ctype, "message", 7)) {
++        return(1);
++    }
++    if (!lc2strncmp(ctype, "multipart", 9)) {
++        return(1);
++    }
++    return(0);
++}
++
++lc2strncmp(s1, s2, len)
++char *s1, *s2;
++int len;
++{
++    if (!s1 || !s2) return (-1);
++    while (*s1 && *s2 && len > 0) {
++	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
++	++s1; ++s2; --len;
++    }
++    if (len <= 0) return(0);
++    return((*s1 == *s2) ? 0 : -1);
++}
++
++lc2strcmp(s1, s2)
++char *s1, *s2;
++{
++    if (!s1 || !s2) return (-1);
++    while (*s1 && *s2) {
++	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
++	++s1; ++s2;
++    }
++    return((*s1 == *s2) ? 0 : -1);
++}
++
++char *getmyname() {
++    static int initialized = 0;
++#ifdef SYSV
++    static struct utsname u;
++    static char *hostname = u.nodename;
++#else
++    static char hostname[60];
++#endif
++    if (!initialized) {
++#ifdef AMIGA
++        strcpy(hostname, myAddress);
++#else
++#ifdef SYSV
++    if (uname(&u) == -1) {
++        hostname = "UNKNOWN.SITE.NAME";
++    }
++#else
++#ifdef MSDOS
++    strcpy(hostname, "UNKNOWN.SITE.NAME");
++#else
++        gethostname(hostname, sizeof(hostname));
++#endif /* MSDOS */
++#endif /* SYSV */
++#endif /* AMIGA */
++        initialized = 1;
++    }
++    return(hostname);
++}
++
+--- metamail-2.7.orig/src/metamail/metamail.c
++++ metamail-2.7/src/metamail/metamail.c
+@@ -0,0 +1,2223 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++/****************************************************** 
++    Metamail -- A tool to help diverse mail readers 
++                cope with diverse multimedia mail formats.
++
++    Author:  Nathaniel S. Borenstein, Bellcore
++
++ ******************************************************* */
++
++#include <metamail/common.h>
++#include <metamail/patchlevel.h>
++#include <metamail/dlist.h>
++
++#include "metamail.h"
++#include "metamail_default.h"
++#include "environment.h" /* for initializing global variables to default or
++			    environment variables and for manipulating 
++			    environment variables */
++#include "mailcap.h" /* mailcap file(s) parsing functions */
++
++
++char fileToDelete[NAME_MAX];
++
++char *FindParam();
++
++FILE *InputFP = NULL;
++
++/* mike extensions */
++int nDebug = 0;
++/* exts end */
++
++int MightAskBeforeExecuting = 1,
++    DefinitelyNotTty = 0,
++    MustNotBeTty = 0,
++    MaybePageOutput = 0,
++    MustPageOutput = 0,
++    EatLeadingNewlines = 0,
++    PrintSomeHeaders = 1,
++    DoInBackground = 0,
++    Quiet = 0,
++    TransparentMode = 0,
++    DeleteSourceFileWhenDone = 0,
++    Is822Format = 1,
++    DoDebug = 0,
++    CParamsAlloced = 0,
++    CParamsUsed = 0,
++    YankMode = 0,
++    UsingStandardInput = 0,
++    PrintingMode = 0,
++    JustWriteFiles = 0,
++    ProcessingErrors = 0;
++
++int RunAsRootOK = 0;
++
++char *ContentType = NULL,
++    *ContentEncoding = NULL,
++    *MailerName = "unknown",
++    *MailSubject = "Mail message",
++    *MailFrom = "unknown sender",
++    *MailSummary = "non-text mail message",
++    *mailheaders = NULL,
++    **CParams = NULL,
++    **CParamValues = NULL,
++    *JunkParameter = NULL;
++
++int EncodingCode = ENCODING_NONE;
++
++struct part {
++    char *ctype;
++    char *fname;
++    struct part *next;
++};
++
++struct NoAskItem *FirstNoAskItem = NULL, 
++  *FirstQuietItem = NULL;
++
++void PrintHeader();
++void ConsumeRestOfPart();
++void ParseContentParameters();
++
++sigtype cleanup();
++
++char *Cleanse(s) /* no leading or trailing space, all lower case */
++char *s;
++{
++    char *tmp, *news;
++    
++    /* strip leading white space */
++    while (*s && isspace((unsigned char) *s)) ++s;
++    news = s;
++    /* put in lower case */
++    for (tmp=s; *tmp; ++tmp) {
++        if (isupper((unsigned char) *tmp)) *tmp = 
++					     tolower((unsigned char) *tmp);
++    }
++    /* strip trailing white space */
++    while (tmp > news && *--tmp && isspace((unsigned char) *tmp)) *tmp = 0;
++    return(news);
++}
++
++char *UnquoteString(s)
++char *s;
++{
++    char *ans, *t;
++
++    if (*s != '"') return(s);
++    ans = XMALLOC(char, 1+strlen(s)); //malloc(1+strlen(s));
++    ++s;
++    t = ans;
++    while (*s) {
++        if (*s == '\\') {
++            *t++ = *++s;
++        } else if (*s == '"') {
++            break;
++        } else {
++            *t++ = *s;
++        }
++        ++s;
++    }
++    *t = 0;
++    return(ans);
++}
++
++sigtype
++cleanup(signum) 
++int signum;
++{
++    RestoreTtyState();
++    signal(signum, SIG_DFL);
++    kill(getpid(), signum);
++}
++
++char **Boundaries = NULL;
++int BoundaryCt = 0, BoundaryAlloc = 0;
++struct nextfile {
++    char *filename;
++    struct nextfile *next;
++} *FileQueue=NULL, *LastInQueue = NULL;
++
++void
++ResetGlobals() {
++    CParamsAlloced = 0;
++    CParamsUsed = 0;
++
++    ContentType = NULL;
++    ContentEncoding = NULL;
++    MailSubject = "Mail message";
++    MailFrom = "unknown sender";
++    MailSummary = "non-text mail message";
++    initMailHeadersFromEnvironment();
++    CParams = NULL;
++    CParamValues = NULL;
++    JunkParameter = NULL;
++}
++
++
++/** initializes signalhandlers to cleanup function */
++void
++initSignalHandlers() {
++    signal(SIGINT,  cleanup);
++    signal(SIGILL,  cleanup);
++    signal(SIGTRAP, cleanup);
++    signal(SIGIOT,  cleanup);
++    signal(SIGFPE,  cleanup);
++    signal(SIGSEGV, cleanup);
++    signal(SIGTERM, cleanup);
++#ifdef SIGXCPU
++    signal(SIGXCPU, cleanup);
++#endif
++}
++
++/** the main function for metamail */
++main(argc, argv)
++int argc;
++char **argv;
++{
++    int retcode = 0;
++
++    initSignalHandlers;
++    addToPath(AUXPATH);           /* add additional dirs to PATH */
++    fileToDelete[0] = 0;
++
++    ProcessArguments(argc, argv); /* calls ExitWithError on error */
++
++    if (MaybePageOutput) {
++        /* Want to send stderr to pager too, sigh... */
++        fflush(stderr);
++        close(2);
++        dup2(1, 2);
++    }
++
++    retcode = HandleMessage(NULL, 0);
++    if (! UsingStandardInput) {
++        fclose(InputFP);
++    }
++    if (fileToDelete[0]) {
++        RmTmpFileName(fileToDelete);
++        fileToDelete[0] = 0;
++    }
++
++    while (FileQueue) {
++        InputFP = fopen(FileQueue->filename, "r");
++        if (DoDebug) printf("Trying to open input file: %s\n",
++			    FileQueue->filename);
++        if (!InputFP) ExitWithError("Can't read input file");
++        if (DeleteSourceFileWhenDone) {
++            strcpy(fileToDelete, FileQueue->filename);
++        }
++        ResetGlobals();
++        retcode |= HandleMessage(NULL, 0);
++        if (! UsingStandardInput) {
++            fclose(InputFP);
++        }
++        if (fileToDelete[0]) {
++            RmTmpFileName(fileToDelete);
++            fileToDelete[0] = 0;
++        }
++        FileQueue = FileQueue->next;
++    }
++    if (MustPageOutput) PauseForUser();
++    if (DoDebug) fprintf(stderr, "end of metamail\n");
++    CleanupTmpFiles();
++    exit(ProcessingErrors? -1 : retcode);
++}
++
++void
++QueueNextFile(fname)
++char *fname;
++{
++    struct nextfile *tmp = XMALLOC( struct nextfile, 1);
++    tmp->filename = fname;
++    tmp->next = NULL;
++    if (FileQueue) {
++        LastInQueue->next = tmp;
++        LastInQueue = tmp;
++    } else {
++        FileQueue = tmp;
++        LastInQueue = tmp;
++    }
++}
++
++HandleMessage(SquirrelFile, nestingdepth)
++char *SquirrelFile;
++/* SquirrelFile, if non-NULL, is a place to save a recognized body instead of executing it. */
++int nestingdepth;
++{
++    char *boundary;
++    int FileWriteOnly = JustWriteFiles;
++
++    if (FileWriteOnly) {
++        if (!lc2strncmp(ContentType, "message/", 8)
++             || !lc2strncmp(ContentType, "multipart/", 10)) {
++            FileWriteOnly = 0; /* only leaf data */
++        }
++    }
++    if (Is822Format) {
++	if (Read822Prefix(SquirrelFile?0:1, nestingdepth)) {
++	    return -1;
++	}
++    } else /* this property is not recursive for multipart or message */
++      Is822Format = 1;
++
++    PrepareMessage();
++    if (!FileWriteOnly && !ProcessMailcapFiles(SquirrelFile)) return(0);
++	
++    if (!lc2strcmp(ContentType, "message")
++         || !lc2strcmp(ContentType, "message/rfc822")) { 
++        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
++        ContentType = NULL; /* reset default */
++        ContentEncoding = NULL; /* reset default */
++        return(HandleMessage(NULL, nestingdepth+1)); /* simple recursion */
++    }
++
++    boundary = FindParam("boundary");
++    if (!boundary) boundary =JunkParameter; /* backward compatibility hack */
++    if (!lc2strncmp(ContentType, "multipart", 9)) { 
++      if (!boundary) {
++	  fprintf(stderr, "Warning: No boundary for multipart data, treating as unrecognized format.\n");
++      } else {
++        char *LineBuf, NewSquirrelFile[TMPNAME_MAX];
++        char *subtype = NULL;
++        int currct, result, IsAlternative, WroteSquirrelFile, boundarylen;
++
++        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
++        if (boundary[0] == '"') {
++            boundary=UnquoteString(boundary);
++        }
++        subtype = index(ContentType, '/');
++        if (subtype) {
++            ++subtype;
++            subtype = Cleanse(subtype);
++        } else subtype = "mixed";
++
++        if (!MaybePageOutput && !DoInBackground) 
++	  DoInBackground = strcmp(subtype, "parallel") ? 0 : 1;
++
++        IsAlternative = strcmp(subtype, "alternative") ? 0 : 1;
++        if (IsAlternative) {
++            MkTmpFileName(NewSquirrelFile);
++            WroteSquirrelFile = 0;
++        }
++        LineBuf = XMALLOC(char, LINE_BUF_SIZE);
++        sprintf(LineBuf, "--%s", boundary);
++        strcpy(boundary, LineBuf);
++        boundarylen = strlen(boundary);
++        if (BoundaryCt >= BoundaryAlloc) {
++            BoundaryAlloc += 5;
++            if (Boundaries) 
++	        Boundaries = XREALLOC(char *, Boundaries, BoundaryAlloc);
++            else 
++	        Boundaries = XMALLOC(char *, BoundaryAlloc);
++        }
++        Boundaries[BoundaryCt++] = boundary;
++        if (DoDebug) printf("Handling multipart as built-in here.  Boundary: %s\n", boundary);
++        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
++            if (!strncmp(LineBuf, boundary, boundarylen)
++                 && ((LineBuf[boundarylen] == '\n')
++                      || (LineBuf[boundarylen] == '-'
++                           && LineBuf[boundarylen+1] == '-'
++                           && LineBuf[boundarylen+2] == '\n'))) {
++                break;
++            }
++        }
++        XFREE(LineBuf);
++        currct = BoundaryCt;
++        while(currct == BoundaryCt) {
++            if (!strcmp(subtype, "digest")) {
++                ContentType = "message/rfc822";
++            } else {
++                ContentType = NULL; /* reset default */
++            }
++            ContentEncoding = NULL; /* reset default */
++            if (IsAlternative) {
++                result = HandleMessage(NewSquirrelFile, nestingdepth+1);
++            } else{
++                result = HandleMessage(NULL, nestingdepth+1);
++            }
++            if (result) {
++                /* Need to consume the rest of the part */
++                ConsumeRestOfPart(NULL);
++            } else {
++                ++WroteSquirrelFile;
++            }
++        }
++        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
++            we must throw it away.*/
++        if (BoundaryCt > 0) {
++            ConsumeRestOfPart(NULL);
++        }
++        if (IsAlternative) {
++            if (WroteSquirrelFile) {
++                int retcode; 
++                char Cmd[TMPNAME_MAX + 15];
++                sprintf(Cmd, "%s %s", METAMAIL, NewSquirrelFile);
++                fflush(stdout); fflush(stderr);
++                retcode = system(Cmd);
++                RmTmpFileName(NewSquirrelFile);
++                return(retcode);
++            } else {
++                printf("Cannot handle any part of multipart/alternative message\n");
++            }
++        }
++	return(0);
++      }
++    } /* End of multipart handling */
++    if (!FileWriteOnly && !TryBuiltIns(SquirrelFile)) return(0);
++    if (!SquirrelFile) { /* Very last resort -- unrecognized types */
++        char Fname[NAME_MAX], *suggestedname, SugBuf[NAME_MAX];
++        FILE *fp;
++        int ans = 0, octetstream, ecode=0;
++        int JustMadeTheFile=0;
++
++        Fname[0] = 0;
++
++        suggestedname = FindParam("name");
++        if (!suggestedname) {
++            MkTmpFileName(SugBuf);
++            suggestedname = SugBuf;
++            JustMadeTheFile=1;
++        }
++        if (strlen(suggestedname) > NAME_MAX - 50)
++             suggestedname[NAME_MAX - 50] = '\0';
++        if (suggestedname[0] == '"')
++                suggestedname=UnquoteString(suggestedname);
++ 
++        octetstream = ! lc2strcmp(ContentType, "application/octet-stream");
++        if (MightAskBeforeExecuting && !DefinitelyNotTty && !MustNotBeTty) {
++            if (FileWriteOnly) {
++                printf("\nThis message contains '%s`-format data.\n", ContentType);
++            } else if (octetstream) {
++                printf("This message contains raw digital data, which can either be viewed as text\nor written to a file.\n");
++            } else {
++                printf("\nThis message contains data in an unrecognized format, %s,\nwhich can either be viewed as text or written to a file.\n", ContentType);
++            }
++            while (!ans) {
++                if (FileWriteOnly) {
++                    ans = 2;
++                } else {
++                    printf("\nWhat do you want to do with the %s data?\n1 -- See it as text\n2 -- Write it to a file\n3 -- Just skip it\n4 -- Give another content type\n\n", octetstream ? "raw" : ContentType);
++                    fgets(Fname, sizeof(Fname), stdin);
++                    ans = atoi(Fname);
++                }
++                switch(ans) {
++                    case 1:
++                        TranslateInputToOutput(InputFP, stdout, EncodingCode, "text");
++                        return(0);
++                    case 2:
++                        {
++                        int needname = 1;
++                        while (needname) {
++                            needname = 0;
++                            printf("Please enter the name of a file to which the data should be written\n(Default: %s) > ", suggestedname);
++                            fflush(stdout);
++                            fgets(Fname, sizeof(Fname), stdin);
++                            Fname[strlen(Fname) - 1] = '\0'; /* bogus newline */
++                            if (!Fname[0])
++			      strcpy(Fname, suggestedname);
++
++                            if (Fname[0] == '~' && Fname[1] == '/') {
++                                char Fname2[NAME_MAX];
++                                int uid = getuid();
++                                struct passwd *p;
++                                p = getpwuid(uid);
++                                if (!p) {
++				  strcpy( Fname, suggestedname );
++				  printf("Cannot figure out what ~ means, using temporary file %s instead\n", Fname);
++                                } else {
++                                    strcpy(Fname2, p->pw_dir);
++                                    strcat(Fname2, "/");
++                                    strcat(Fname2, Fname + 2);
++                                    strcpy(Fname, Fname2);
++                                }
++                            }
++
++			    if ( strcmp( Fname, suggestedname ) ) 
++			      RmTmpFileName( suggestedname );
++			    else  /* remove from tmp list (should persist) */
++			      DelTmpFileName( suggestedname ); 
++			    
++			    
++			    if (DoDebug) fprintf(stderr, "pre access");
++
++                            if (!JustMadeTheFile && access(Fname, F_OK) == 0) {
++                                char *s, AnsBuf[50];
++                                int overwriteans = -1;
++                                do {
++                                    printf("File %s exists.  Do you want to overwrite it (y/n) ?\n", Fname);
++                                    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
++                                    if (!s) {
++                                        overwriteans = 0;
++                                    } else {
++                                        while (s && *s && isspace((unsigned char) *s)) ++s;
++                                        if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') {
++                                            overwriteans = 1;
++                                        } else if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
++                                            overwriteans=0;
++                                        }
++                                    }
++                                    if (overwriteans == -1) printf("Please answer yes or no.\n");
++                                } while (overwriteans == -1);
++                                if (overwriteans == 0) needname = 1;
++                            }
++                        }
++                        }
++                        break;
++                    case 3:
++                        ConsumeRestOfPart(NULL);
++                        return(0);
++                        break;
++		    case 4:
++		      {
++			char *savedContentType = ContentType;
++			ContentType = malloc(64);
++			printf("Please enter new content type> ");
++			fflush(stdout);
++			fgets(ContentType, 64, stdin);
++			ContentType[strlen(ContentType) - 1] = '\0'; /* bogus newline */
++			if (!ProcessMailcapFiles(SquirrelFile)) { 
++			  free(savedContentType); 
++			  return(0); 
++			}
++			printf("\nNo matching mailcap entry found.\n");
++			free(ContentType);
++			ContentType = savedContentType;
++			ans = 0;
++			break;
++		      }
++                    default:
++                        ans = 0;
++                        break;
++                }
++            }
++        } else {
++            int ct = 0;
++            char *slash = rindex(suggestedname, '/');
++            if (slash)  {
++                ++slash;
++            } else {
++                slash = suggestedname;
++            }
++            do {
++                if (ct) {
++                    sprintf(Fname, "%s/%d-%s", tmproot, ct, slash);
++                } else {
++                    sprintf(Fname, "%s/%s", tmproot, slash);
++                }
++                ++ct;
++            } while (access(Fname, F_OK) == 0);
++            if (FileWriteOnly) {
++                printf("\nThis message contains '%s`-format data.\n", ContentType);
++            } else if (octetstream) {
++                printf("\nThis message contains raw digital data,");
++            } else {
++                printf("\nThis message contains data in an unrecognized format, %s,", ContentType);
++            }
++            printf("\nwhich is being decoded and written to the file named \"%s\".\nIf you do not want this data, you probably should delete that file.\n", Fname);
++        }
++        if (Fname[0] == 0 || Fname[0] == '\n') {
++            ConsumeRestOfPart(NULL);
++        } else {
++            fp = fopen(Fname, WRITE_BINARY);
++            if (!fp) ExitWithError("Cannot open temporary file");
++            TranslateInputToOutput(InputFP, fp, EncodingCode, ContentType);
++            ecode = fclose(fp);
++            if (ecode) {
++                printf("Could not write file %s\n", Fname);
++            } else {
++                printf("Wrote file %s\n", Fname);
++            }
++        }
++        if (!DefinitelyNotTty && MaybePageOutput && BoundaryCt > 0) PauseForUser();
++        return(ecode);
++    }
++    return(-1); /* Unrecognized, really */
++}
++
++ProcessArguments(argc, argv)
++int argc;
++char **argv;
++{
++  int i;
++  char *SourceFileName = NULL;
++
++  initVarsFromEnvironment(); /* init global vars from environment */
++
++    for (i=1; i<argc; ++i) {
++	if (argv[i][0] == '-') {
++	    switch (argv[i][1]) {
++		case '\0':
++		    /* Not really necessary, but.... */
++		    SourceFileName = NULL;
++		    UsingStandardInput = 1;
++		    break;
++		case 'b':
++		    Is822Format = 0;
++		    break;
++		case 'B':
++		    DoInBackground = 1;
++		    break;
++                case 'c':
++		    if (++i >= argc) usage();
++		    ContentType = XMALLOC(char, 1+strlen(argv[i]));
++                    strcpy(ContentType,argv[i]);
++                    /* strip leading white space */
++                    while (*ContentType && isspace((unsigned char) *ContentType)) ++ContentType;
++                    StripTrailingSpace(ContentType);
++                    ParseContentParameters(ContentType);
++                    break;
++                case 'd':
++		    MightAskBeforeExecuting = 0;
++		    break;
++		case 'e':
++		    EatLeadingNewlines = 1;
++		    break;
++		case 'E':
++		    if (++i >= argc) usage();
++		    ContentEncoding = argv[i];
++		    break;
++		case 'f':
++		    if (++i >= argc) usage();
++		    MailFrom = argv[i];
++                    break;
++                case 'h':
++                    {
++                    FILE *tmpfp;
++                    PrintingMode = 1;
++                    MightAskBeforeExecuting = 0;
++		    //#ifdef AMIGA
++		    //		    freopen("prt:", "w", stdout);
++		    //#else
++                    /* Want to make all of stdout go to printer, and this 
++                      is easier than changing every output statement,
++                      at least on UNIX... */
++                    tmpfp = popen(LPRCOMMAND, "w");
++                    if (!tmpfp) {
++                        ExitWithError("Cannot execute lpr command");
++                    }
++                    fflush(stdout);
++                    close(1);
++                    dup2(fileno(tmpfp), 1);
++		    //#endif
++                    break;
++                    }
++		case 'm':
++		    if (++i >= argc) usage();
++		    MailerName = argv[i];
++		    break;
++		case 'p':
++		    MaybePageOutput = 1;
++		    break;
++		case 'P':
++                    MaybePageOutput = 1;
++                    MustPageOutput = 1;
++		    break;
++		case 'r':
++		    RunAsRootOK = 1;
++                    break;
++                case 'R':
++#ifdef RESET_PROGRAM
++                    system(RESET_PROGRAM);
++                    if (DoDebug) printf("Executed reset\n");
++#else
++                    fprintf(stderr, "metamail warning: -R flag not supported on this system\n");
++#endif
++                    break;
++		case 's':
++		    if (++i >= argc) usage();
++		    MailSubject = argv[i];
++		    break;
++                case 'T':
++                    TransparentMode = 0;
++                    break;
++                case 'w':
++                    JustWriteFiles = 1;
++                    break;
++                case 'q':
++                    Quiet = 1;
++		    PrintSomeHeaders = 0;
++		    break;
++		case 'x':
++                    DefinitelyNotTty = 1;
++                    MustNotBeTty = 1;
++		    break;
++                case 'y':
++                    YankMode = 1;
++                    break;
++		case 'z':
++		    DeleteSourceFileWhenDone = 1;
++		    break;
++		default:
++		    usage();
++	    }
++	} else {
++	    if (SourceFileName) {
++                QueueNextFile(argv[i]);
++	    } else {
++		SourceFileName = argv[i];
++	    }
++	}
++    }
++    if (TransparentMode) {
++        RunInNewWindow(argv, argc, &SourceFileName);
++    }
++    if (MaybePageOutput && DoInBackground) {
++	MustNotBeTty = 1;
++        /*fprintf(stderr, "metamail: -B is incompatible with -p, -P, and MM_USEPAGER\n");
++        usage(); */
++    }
++    if (!Is822Format && !ContentType) {
++	fprintf(stderr, "metamail:  -b requires -c.\n");
++	usage();
++    }
++    if (DeleteSourceFileWhenDone && !SourceFileName) {
++	fprintf(stderr, "metamail:  -z requires -f.\n");
++	usage();
++    }
++    if (!RunAsRootOK && (getuid() == 0 || geteuid() == 0)) {
++	fprintf(stderr, "You can not run MetaMail as root unless you use -r or set MM_RUNASROOT.\n");
++	usage();
++    }
++    if (SourceFileName) {
++        InputFP = fopen(SourceFileName, "r");
++        if (DoDebug) printf("Trying to open input file: %s\n", SourceFileName);
++        if (!InputFP) ExitWithError("Can't read input file");
++        if (DeleteSourceFileWhenDone) {
++            strcpy(fileToDelete, SourceFileName);
++        }
++    } else {  /* input on stdin */
++        UsingStandardInput = 1;
++        if (MustNotBeTty) {
++            InputFP = stdin;
++/*            MaybePageOutput = 1; */ /* This messed up safe-tcl -- nsb 9/21/93 */
++            MightAskBeforeExecuting = 0;
++        } else {
++            int newfd = dup(0);
++            FILE *newfp;
++            if (newfd > 0) {
++                InputFP = fdopen(newfd, "r");
++                if (InputFP 
++                     && ((newfp = fopen("/dev/tty", "r")) != NULL)
++                     && !dup2(fileno(newfp), 0)) {
++                    DefinitelyNotTty = 0;
++                } else {
++                    InputFP = stdin;
++                    DefinitelyNotTty = 1;
++                    MaybePageOutput = 0;
++                }
++            }
++        }
++    }
++    if (DefinitelyNotTty && MaybePageOutput) {
++        RunInNewWindow(argv, argc, &SourceFileName);
++    }
++    if (DefinitelyNotTty) {
++        MaybePageOutput = 0;	/* Disable pager if I/O has been redirected */
++    }
++    return(0);
++}
++
++usage() {
++    fprintf(stderr, "Usage:  metamail [-b] [-B] [-d] [-e] [-h] [-r] [-R] [-p]  [-P] [-x] [-y] [-z] [-c content-type] [-E content-transfer-encoding] [-f from-name] [-m mailername] [-s subject] [message-file-name]\n");
++    ExitWithError(NULL);
++}
++
++RunInNewWindow(argv, argc, SourceFileNamePtr)
++char **argv, **SourceFileNamePtr;
++int argc;
++{
++    char *FullCmd, TmpName[TMPNAME_MAX];
++    int i, createdfile=0;
++    if (!*SourceFileNamePtr) {
++        char *LineBuf;
++        FILE *fptmp;
++
++        LineBuf = XMALLOC(char, LINE_BUF_SIZE);
++        /* Create it, ugh.  Also needs to affect later command. */
++        MkTmpFileName(TmpName);
++	DelTmpFileName(TmpName);
++        DeleteSourceFileWhenDone = 1;
++        fptmp = fopen(TmpName, WRITE_BINARY);
++        if (!fptmp) ExitWithError("Can't open temporary file\n");
++        while (fgets(LineBuf, LINE_BUF_SIZE, stdin)) {
++            fputs(LineBuf, fptmp);
++        }
++        XFREE(LineBuf);
++        fclose(fptmp);
++        *SourceFileNamePtr = TmpName;
++        createdfile = 1;
++    }
++    FullCmd = XMALLOC(char, CMDSIZE);
++    if (TransparentMode) {
++        /* In transparent mode, we want to produce stdout that is what we get in, and do EVERYTHING externally in a terminal window.  This is to make the truly brain-dead mailers like mailtool happy. I am NOT happy about having to do this.  */
++        /* So, first we copy everything to stdout */
++        sprintf(FullCmd, CATTEMPLATE, *SourceFileNamePtr);
++        system(FullCmd); /* Cheesy way to do it */
++        fflush(stdout); fflush(stderr);
++    }
++    /* Then we run ourselves in a terminal window */
++    MailSummary = "Metamail"; /* for window label */
++    CreateNewWindowPrefix(FullCmd);
++    strcat(FullCmd, METAMAIL);
++    strcat(FullCmd, " -P ");
++    if (TransparentMode) strcat(FullCmd, "-T ");
++    for (i=1; i<argc; ++i) {
++        if (strncmp(argv[i], "-x", 2)
++             && strncmp(argv[i], "-B", 2)
++             && strncmp(argv[i], "-d", 2)) {
++            strcat(FullCmd, "\"");
++            strcat(FullCmd, argv[i]);
++            strcat(FullCmd, "\" ");
++        }
++    }
++    if (createdfile) {
++        strcat(FullCmd, "-z ");
++        strcat(FullCmd, *SourceFileNamePtr);
++    }
++    if (!MightAskBeforeExecuting) {
++        strcat(FullCmd, " -d ");
++        /* The special hack for -d is HORRIBLE, but xterm screws up with the -d option in the middle of the command line! */
++    }
++    if (DoInBackground) strcat(FullCmd, " &");
++    DefinitelyNotTty = 0;
++    SetUpEnvironment();
++    if (DoDebug) fprintf(stderr, "Executing %s\n", FullCmd);
++    fflush(stdout); fflush(stderr);
++    exit(system(FullCmd));
++}
++
++
++static char *ThingsToSkip[] = {
++    "csh ",
++    "sh ",
++    "ksh ",
++    NULL
++};
++
++char *ShortCommand(progname)
++char *progname;
++{
++    int i;
++    char *s, *oldprogname;
++    static char FullProgName[500];
++
++eatmore:
++    while (*progname && (*progname == '(' || isspace((unsigned char) *progname))) {
++        ++progname;
++    }
++    oldprogname = progname;
++    for (i = 0; oldprogname == progname && ThingsToSkip[i]; ++i) {
++        if (!strncmp(progname, ThingsToSkip[i], strlen(ThingsToSkip[i]))) {
++            progname += strlen(ThingsToSkip[i]);
++        }
++    }
++    if (*progname == '-') {
++        ++progname;
++        while (*progname && !isspace((unsigned char) *progname)) ++progname;
++    }
++    if (progname != oldprogname) goto eatmore;
++    strcpy(FullProgName, progname);
++    s = index(FullProgName, ' ');
++    if (s) *s = 0;
++    s = rindex(FullProgName, '/');
++    if (s) {
++	return(s+1);
++    } else {
++	return(FullProgName);
++    }
++}    
++
++TryMailcapEntry(mc, SquirrelFile)
++struct MailcapEntry mc;
++char *SquirrelFile;
++{
++    StripTrailingSpace(mc.contenttype);
++    if (DoDebug) fprintf(stderr, "Trying mailcap entry for '%s'.\n", mc.contenttype);
++    if (PrintingMode && !mc.printcommand) return(-1);
++    if (CtypeMatch(ContentType, mc.contenttype) && PassesTest(&mc)) {
++        if (SquirrelFile) {
++            return(SaveSquirrelFile(SquirrelFile));
++        } else {
++            char TmpFileName[TMPNAME_MAX];
++            MkTmpFileName(TmpFileName);
++            return(ExecuteMailcapEntry(mc, TmpFileName, ContentType));
++        }
++    }
++    if (mc.needtofree) {
++        XFREE(mc.contenttype);
++        XFREE(mc.command);
++    }
++    return(-1);
++}
++
++SaveSquirrelFile(SquirrelFile)
++char *SquirrelFile;
++{
++    int j;
++    FILE *outfp;
++
++    if (DoDebug) printf("saving to file %s\n", SquirrelFile);
++
++    outfp = fopen(SquirrelFile, WRITE_BINARY);
++    if (!outfp) {
++        fprintf(stderr, "Cannot open %s to squirrel away a portion of a multipart/alternative\n", SquirrelFile);
++        return(-1);
++    }
++    fprintf(outfp, "Content-type: %s", ContentType);
++    for (j=0; j<CParamsUsed; ++j) {
++        fprintf(outfp, " ; ");
++        fprintf(outfp, "%s", CParams[j]);
++        fprintf(outfp, " = ");
++        fprintf(outfp, "%s", CParamValues[j]);
++    }
++    fprintf(outfp, "\n\n"); 
++    TranslateInputToOutput(InputFP, outfp, EncodingCode, ContentType);
++    if (fclose(outfp)) {
++        ExitWithError("fclose failed");
++    }
++    return(0);
++}
++
++ExecuteMailcapEntry(mc, TmpFileName, ThisContentType)
++char *TmpFileName, *ThisContentType;
++struct MailcapEntry mc;
++{
++    int resultcode=0, DidExecute, UsedTmpFileName;
++    struct part *PartsWritten=NULL;
++    char *s, *cmd;
++
++    cmd = XMALLOC(char, CMDSIZE);
++    if (PrintingMode && !mc.printcommand) return(-1);
++    BuildCommand(cmd, PrintingMode ? mc.printcommand : mc.command, TmpFileName, &UsedTmpFileName, &PartsWritten);
++    if (DoDebug) fprintf(stderr, "Match!  Built command %s.\n", cmd);
++    if (mc.copiousoutput && MaybePageOutput) {
++        strcat(cmd, " | ");
++        s = getenv("METAMAIL_PAGER");
++        if (s && strncmp(s, "metamail", 8)) {
++            /* If METAMAIL_PAGER is set to "metamail" we override it */
++            strcat(cmd, s);
++            if (!strncmp(s, "less", 4) && strncmp(s+5, "-r", 2)) {
++                fprintf(stderr, "Warning:  'less' without '-r' behaves badly for some mail types,\n\tnotably richtext.\n");
++            }
++        } else {
++            strcat(cmd, "more");
++        }
++    }
++    if (!DefinitelyNotTty) {
++        SaveTtyState();
++    }
++    if (!NeedToAskBeforeExecuting(ThisContentType)
++         || OKToRun(ThisContentType, cmd, mc.label)) {
++        char *FullCmd;
++        int ReallyNotTty;
++	//#ifndef NO_RLIMITS
++        /* Limit size of core dumps */
++        //struct rlimit rlp;
++
++        //rlp.rlim_cur = 0;
++        //rlp.rlim_max = 0;
++        //setrlimit(RLIMIT_CORE, &rlp); 
++	//#endif
++        FullCmd = XMALLOC(char, CMDSIZE);
++        ReallyNotTty = DefinitelyNotTty;
++        if (mc.needsterminal
++             && DefinitelyNotTty) {
++            int j;
++            sprintf(cmd, " %s -P -b -c '%s", METAMAIL, ThisContentType);
++            for (j=0; j<CParamsUsed; ++j) {
++                strcat(cmd, " ; ");
++                strcatquoting(cmd, CParams[j]);
++                strcat(cmd, " = ");
++                strcatquoting(cmd, CParamValues[j]);
++            }
++            strcat(cmd, "' ");
++            strcat(cmd, TmpFileName);
++            CreateNewWindowPrefix(FullCmd);
++            strcat(FullCmd, cmd);
++            DefinitelyNotTty = 0; /* For recursive call */
++        } else {
++            strcpy(FullCmd, cmd);
++        }
++        DidExecute = 0;
++        if (UsedTmpFileName || PartsWritten) {
++            int isempty;
++            if (PartsWritten) {
++                isempty = 0;
++            } else {
++                isempty = WriteTmpFile(TmpFileName, ThisContentType);
++            }
++            if (!isempty || strncmp(ThisContentType, "text", 4)) {
++                if (DoInBackground && !PartsWritten && !mc.needsterminal) {
++                    char TmpCmd[CMDSIZE];
++                    sprintf(TmpCmd, "(%s; rm %s) &", FullCmd, TmpFileName);
++                    DefinitelyNotTty = 1; /* in background */
++                    SetUpEnvironment();
++                    resultcode = ExecuteCommand(TmpCmd, 1);
++		    DelTmpFileName(TmpFileName); /* an rm ... was already added
++						    to the executing cmd */
++                    ++DidExecute;
++                } else {
++                    SetUpEnvironment();
++                    resultcode = ExecuteCommand(FullCmd, 1);
++                    RmTmpFileName(TmpFileName);
++                    ++DidExecute;
++                }
++            } else { /* empty text part, hack to not say "more" */
++                RmTmpFileName(TmpFileName);
++            }
++        } else {
++            FILE *tmpfp;
++            SetUpEnvironment();
++            (void) ExecuteCommand(FullCmd, 0);
++            tmpfp = popen(FullCmd, WRITE_BINARY);
++            TranslateInputToOutput(InputFP, tmpfp, EncodingCode, ThisContentType);
++            resultcode = tmpfp ? pclose(tmpfp) : -1;
++            ++DidExecute;
++        }
++        DefinitelyNotTty = ReallyNotTty;
++        if (!DefinitelyNotTty && DidExecute) {
++            RestoreTtyState();
++            if (mc.copiousoutput && MaybePageOutput && BoundaryCt > 0) PauseForUser();
++        }
++        if (!resultcode) {
++            XFREE(FullCmd);
++        } else {
++            fprintf(stderr, "Command failed: %s\n", FullCmd);
++            if (MaybePageOutput && BoundaryCt > 0) PauseForUser();
++            ++ProcessingErrors;
++        }
++    } else {
++        /* user does not want to execute command */
++        if (!DefinitelyNotTty) {
++            RestoreTtyState();
++        }
++        if (DoDebug) fprintf(stderr, "Not executing command.\n");
++        if (!PartsWritten) ConsumeRestOfPart(NULL);
++    }
++    if (PartsWritten) {
++        struct part *tp;
++        char HeadFile[NAME_MAX];
++
++        while (PartsWritten) {
++            tp=PartsWritten->next;
++            XFREE(PartsWritten->ctype);
++            strcpy(HeadFile, PartsWritten->fname);
++            strcat(HeadFile, "H");
++            RmTmpFileName(HeadFile);
++            RmTmpFileName(PartsWritten->fname);
++            XFREE(PartsWritten->fname);
++            XFREE(PartsWritten);
++            PartsWritten=tp;
++        }
++    }
++    if (!DefinitelyNotTty) {
++        RestoreTtyState();
++    }
++    XFREE(cmd);
++    return(0);
++}
++
++PassesTest(mc)
++struct MailcapEntry *mc;
++{
++    int result;
++    char *cmd, TmpFileName[TMPNAME_MAX];
++
++    if (!mc->testcommand) return(1);
++    MkTmpFileName(TmpFileName);
++    cmd = XMALLOC(char, CMDSIZE);
++    BuildCommand(cmd, mc->testcommand, TmpFileName, NULL, NULL);
++    if (DoDebug) printf("Executing test command: %s\n", cmd);
++    result = system(cmd);
++    XFREE(cmd);
++    return(!result);
++}
++
++char *
++GetCommand(s, t)
++char *s, **t;
++{
++    char *s2;
++    int quoted = 0;
++    s2 = XMALLOC(char, strlen(s)*2+1); /* absolute max, if all % signs */
++    *t = s2;
++    while (s && *s) {
++	if (quoted) {
++            if (*s == '%') *s2++ = '%'; /* Quote through next level, ugh! */
++
++            *s2++ = *s++;
++	    quoted = 0;
++	} else {
++	    if (*s == ';') {
++                *s2 = 0;
++		return(++s);
++	    }
++	    if (*s == '\\') {
++		quoted = 1;
++		++s;
++	    } else {
++		*s2++ = *s++;
++	    }
++	}
++    }
++    *s2 = 0;
++    return(NULL);
++}	
++
++GetMailcapEntry(fp, mc)
++FILE *fp;
++struct MailcapEntry *mc;
++{
++    int rawentryalloc = 2000, len;
++    char *rawentry, *s, *t, *LineBuf;
++
++    LineBuf = XMALLOC(char, LINE_BUF_SIZE);
++    rawentry = XMALLOC(char, 1 + rawentryalloc);
++    *rawentry = 0;
++    while (fgets(LineBuf, LINE_BUF_SIZE, fp)) {
++	if (LineBuf[0] == '#') continue;
++        len = strlen(LineBuf);
++        if (len == 0) continue;
++        if (LineBuf[len-1] == '\n') LineBuf[--len] = 0;
++	if ((len + strlen(rawentry)) > rawentryalloc) {
++	    rawentryalloc += 2000;
++	    rawentry = realloc(rawentry, rawentryalloc+1);
++	}
++	if (LineBuf[len-1] == '\\') {
++            LineBuf[len-1] = 0;
++	    strcat(rawentry, LineBuf);
++	} else {
++	    strcat(rawentry, LineBuf);
++	    break;
++	}
++    }
++    XFREE(LineBuf);
++    for (s=rawentry; *s && isspace((unsigned char) *s); ++s) ;
++    if (!*s) {
++	/* totally blank entry -- quietly ignore */
++	XFREE(rawentry);
++	return(0);
++    }
++    s = index(rawentry, ';');
++    if (!s) {
++	fprintf(stderr, "metamail: Ignoring invalid mailcap entry: %s\n", rawentry);
++	XFREE(rawentry);
++	return(0);
++    }
++    *s++ = 0;
++    mc->needsterminal = 0;
++    mc->copiousoutput = 0;
++    mc->needtofree = 1;
++    mc->testcommand = NULL;
++    mc->label = NULL;
++    mc->printcommand = NULL;
++    mc->contenttype = XMALLOC(char, 1+strlen(rawentry));
++    strcpy(mc->contenttype, rawentry);
++    t = GetCommand(s, &mc->command);
++    if (!t) {
++        XFREE(rawentry);
++        return(1);
++    }
++    while (s && *s && isspace((unsigned char) *s)) ++s;
++    s = t;
++    while (s) {
++	char *arg, *eq;
++
++        t = GetCommand(s, &arg);
++/*        if (t) *t++ = 0; */
++        eq = index(arg, '=');
++        if (eq) *eq++ = 0;
++	if (*arg) {
++	    arg = Cleanse(arg);
++	    if (!strcmp(arg, "needsterminal")) {
++		mc->needsterminal = 1;
++	    } else if (!strcmp(arg, "copiousoutput")) {
++		mc->copiousoutput = 1;
++	    } else if (eq && !strcmp(arg, "test")) {
++		mc->testcommand = eq;
++	    } else if (eq && !strcmp(arg, "description")) {
++		mc->label = eq;
++	    } else if (eq && !strcmp(arg, "label")) { 
++		mc->label = eq; /* bogus old name for description */
++	    } else if (eq && !strcmp(arg, "print")) {
++		mc->printcommand = eq;
++	    } else if (eq && !strcmp(arg, "textualnewlines")) {
++		ExceptionalNewline(mc->contenttype, atoi(eq));
++	    } else if (strcmp(arg, "notes")) { /* IGNORE notes field */
++		if (*arg && DoDebug) fprintf(stderr, "metamail: Ignoring mailcap flag: %s\n", arg);
++	    }
++	}
++	s = t;
++    }
++    XFREE(rawentry);
++    return(1);
++}
++
++ExitWithError(txt)
++char *txt;
++{
++    if (txt) fprintf(stderr, "metamail: %s\n", txt);
++    exit(-1);
++}
++
++char *
++FreshHeaderCopy(s)
++char *s;
++{
++    char *t, *newcopy;
++    int len;
++
++    while (s && *s && isspace((unsigned char) *s) && *s != '\n') ++s;
++    t = index(s, '\n');
++    while (t && (*(t+1) == ' ' || *(t+1) == '\t')) {
++        t = index(t+1, '\n');
++    }
++    len = t ? (t-s+1) : (strlen(s)+1);
++    newcopy = XMALLOC(char, len+3); /* two extra bytes for a bizarre bug caused
++                                       by the fact that FindParam calls
++				       FreshHeaderCopy and sometimes tacks on
++				       "--".
++				    */
++    strncpy(newcopy, s, len);
++    newcopy[len] = 0;
++    return(newcopy);
++}
++
++Read822Prefix(PrintHeads, nestingdepth)
++int PrintHeads, nestingdepth;
++{
++    int SawNewline = 1, bytes = 0, alloced = 1000, HasEncodedChars=0;
++    int c, oldbytes;
++    char *s, *t, *tmp;
++
++    if (!PrintSomeHeaders) PrintHeads = 0;
++    mailheaders = XMALLOC(char, alloced+1);
++    strcpy(mailheaders, "MM_HEADERS=\n");
++    bytes = 12;
++yankagain:
++    t = mailheaders + bytes;
++    oldbytes = bytes-1; /* a hack for YankMode */
++    while ((c = getc(InputFP)) != EOF) {
++        if (++bytes >= alloced) {
++            alloced += 1000;
++            mailheaders = realloc(mailheaders, alloced);
++            t = mailheaders + bytes - 1;
++        }
++        if (c == '\n') {
++            if (SawNewline) break;
++            SawNewline = 1;
++        } else SawNewline = 0;
++        *t++ = c;
++    }
++    *t = 0;
++    --bytes;
++    if (c == EOF) {
++	if (nestingdepth) {
++	    fprintf(stderr, "metamail: Incomplete multipart message -- unexpected EOF\n");
++/*            exit(ProcessingErrors); */
++        } else {
++            if (YankMode) {
++/*                ExitWithError("Could not extract a MIME message from the  body\n"); */
++		fprintf(stderr, "metamail: Could not extract a MIME message from the body\n");
++            } else {
++		fprintf(stderr, "metamail: Could not find end of mail headers.\n");
++/*                ExitWithError("Could not find end of mail headers"); */
++            }
++	}
++	BoundaryCt=0;
++	return -1;
++    }
++    for (s=mailheaders+oldbytes; *s; ++s) {
++        if (*s == '\n' && (*(s+1) != ' ') && (*(s+1) != '\t')) {
++	    if (!ContentType && !lc2strncmp(s, "\ncontent-type:", 14)) {
++		char *dum;
++                ContentType = FreshHeaderCopy(s+14);
++		/* Eliminate white space embedded in content-type */
++		while (1) {
++		    dum = index(ContentType, '/');
++		    if (!dum) break;
++		    if (isspace(*(dum-1))) {
++			for (--dum; *dum; ++dum) {
++			    *dum = *(dum+1);
++			}
++		    } else if (isspace(*++dum)) {
++			for ( ; *dum; ++dum) {
++			    *dum = *(dum+1);
++			}
++		    } else {
++			break;
++		    }
++		}
++                StripTrailingSpace(ContentType);
++                ParseContentParameters(ContentType);
++                if (PrintHeads) maybephead(s+1);
++            } else if (!ContentEncoding && !lc2strncmp(s, "\ncontent-transfer-encoding:", 27)) {
++                ContentEncoding = FreshHeaderCopy(s+27);
++                if (PrintHeads) maybephead(s+1);
++            } else if (!lc2strncmp(s, "\nsubject:", 9)) {
++                if (PrintHeads) maybephead(s+1);
++                MailSubject = FreshHeaderCopy(s+9);
++            } else if (!lc2strncmp(s, "\nfrom:", 6)) {
++                if (PrintHeads) maybephead(s+1);
++                MailFrom = FreshHeaderCopy(s+6);
++            } else if (!lc2strncmp(s, "\ncontent-description:", 4)) {
++                if(PrintHeads) maybephead(s+1);
++                MailSubject = FreshHeaderCopy(s+21);
++            } else {
++                /* Print any with encoded variables */
++                char *dum = s;
++                while (dum) {
++                    dum = index(dum, '?');
++                    if (dum && *++dum == '=') break;
++                }
++                if (dum) {
++                    char *nl = s+1;
++                    while (nl) {
++                        nl = index(nl, '\n');
++                        if (nl && !isspace((unsigned char) *++nl)) break;
++                    }
++                    if (nl && nl > dum) ++HasEncodedChars;
++                }
++                if (HasEncodedChars) {
++                    phead(s+1);
++                } else if (PrintHeads) {
++                    maybephead(s+1);
++                }
++            }
++        }
++    }
++    /* Ugly, but effective */
++    if (YankMode && !ContentType) {
++        goto yankagain;
++    }
++    if (PrintHeads) printf("\n");
++    if (!ContentType) {
++        ContentType = "text/plain";
++        CParamsUsed=0;
++    }
++    for (tmp=ContentType; *tmp; ++tmp) {
++        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++    }
++    return 0;
++}
++
++PrepareMessage() {
++    int c;
++
++    EncodingCode = ENCODING_NONE;
++    if (ContentEncoding) {
++        /* strip leading white space */
++        while (*ContentEncoding && isspace((unsigned char) *ContentEncoding)) ++ContentEncoding;
++        StripTrailingSpace(ContentEncoding);
++        if (!lc2strcmp(ContentEncoding, "base64")) {
++            EncodingCode = ENCODING_BASE64;
++        } else if (!lc2strcmp(ContentEncoding, "quoted-printable")) {
++            EncodingCode = ENCODING_QUOTEDPRINTABLE;
++        } else if (!lc2strncmp (ContentEncoding, "x-uue", 5)) {
++            fprintf (stderr, "WARNING:  Using nonstandard %s encoding, trying uuencode algorithm.\n", ContentEncoding);
++ 	    EncodingCode = ENCODING_UUENCODE;
++        } else {
++            if (lc2strcmp(ContentEncoding, "none")
++                 && !lc2strcmp(ContentEncoding, "8bit")
++                 && !lc2strcmp(ContentEncoding, "7bit")) {
++                fprintf(stderr, "Ignoring unrecognized Content-Transfer-Encoding value: %s\n", ContentEncoding);
++            }
++        }
++    }
++    if (EatLeadingNewlines) {
++        while ((c = getc(InputFP)) != EOF) {
++            if (c != '\n') {
++                ungetc(c, InputFP);
++                break;
++            }
++        }
++    }
++    SetUpEnvironment();  
++}
++
++SetUpEnvironment() { 
++    int i, j, environsize;
++    char **newenviron, *mailervar, *summaryvar, *ctypevar, *s;
++    static char ttyenv[15], debugenv[15], *noaskenv, pagerenv[15], *quietenv, rootenv[25];
++
++    /* Hack to make the code look similar for unix & dos */
++#define putenv(var)        newenviron[i++] = var;
++    for (environsize=0; environ[environsize]; ++environsize) {
++	;
++    }
++    newenviron = XMALLOC(char *, 17+environsize);
++    mailervar = XMALLOC(char, 13+strlen(MailerName));
++    sprintf(mailervar, "MM_MAILER=%s", MailerName);
++    summaryvar = XMALLOC(char, 26 + strlen(MailFrom) + strlen(MailSubject));
++    sprintf(summaryvar, "MM_SUMMARY=%s (from %s)", MailSubject, MailFrom);
++    MailSummary = summaryvar+11;
++    EliminateNastyChars(MailSummary);
++    i = 0;
++    if (ContentType) {
++        int ctypelen = 22+strlen(ContentType);
++        for (j=0; j<CParamsUsed; ++j) {
++            ctypelen += 6 + strlen(CParams[j]) + strlen(CParamValues[j]);
++        }
++        ctypevar = XMALLOC(char, ctypelen);
++        for (s=ContentType; *s; ++s) {
++            if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
++        }
++        while (isspace((unsigned char) *--s)) *s = 0;
++        sprintf(ctypevar, "MM_CONTENTTYPE=%s", ContentType);
++        for (j=0; j<CParamsUsed; ++j) {
++            strcat(ctypevar, " ; ");
++            strcat(ctypevar, CParams[j]);
++            strcat(ctypevar, " = ");
++            strcat(ctypevar, CParamValues[j]);
++        }
++        putenv(ctypevar);
++    }
++    putenv(mailheaders ? mailheaders : "MM_HEADERS=unknown");
++    putenv(mailervar);
++    putenv(summaryvar);
++    sprintf(ttyenv, "MM_NOTTTY=%d", DefinitelyNotTty);
++    putenv(ttyenv);
++    sprintf(debugenv, "MM_DEBUG=%d", DoDebug);
++    putenv(debugenv);
++    s = getenv("MM_QUIET");
++    if (!s) s = QuietDefault;
++    quietenv = XMALLOC(char, 15 + strlen(s));
++    if (Quiet) {
++        strcpy(quietenv, "MM_QUIET=1");
++    } else {
++        sprintf(quietenv, "MM_QUIET=%s", s);
++    }
++    putenv(quietenv);
++    s = getenv("MM_NOASK");
++    if (!s) s = NoAskDefault;
++    noaskenv = XMALLOC(char, 15 + strlen(s));
++    if (MightAskBeforeExecuting) {
++        sprintf(noaskenv, "MM_NOASK=%s", s);
++    } else {
++        strcpy(noaskenv, "MM_NOASK=1");
++    }
++    putenv(noaskenv);
++    s = getenv("MM_RUNASROOT");
++    if (!s) s = "0";
++    sprintf(rootenv, "MM_RUNASROOT=%s", s);
++    putenv(rootenv);
++    sprintf(pagerenv, "MM_USEPAGER=%d", MaybePageOutput);
++    putenv(pagerenv);
++    for (j=0; j<environsize; ++j) {
++        if (strncmp(environ[j], "MM_", 3) || !strncmp(environ[j], "MM_CHARSET", 10)) {
++            putenv(environ[j]);
++        }
++    }
++    newenviron[i] = NULL;
++    environ = newenviron;
++    if (DoDebug) {
++        printf("Here is the environment:\n\n");
++        system("printenv");
++    }
++}
++
++
++OKToRun(ctype, progname, label)
++char *ctype, *progname, *label;
++{
++    char AnsBuf[100], *s;
++
++    if (DoInBackground) return(1);
++    if (DefinitelyNotTty || MustNotBeTty) return(1);
++    while (1) {
++        printf("\n");
++        if (label) {
++            printf("This message contains %s.\nDo you want to view it using the '%s' command (y/n) [y] ? ", label, ShortCommand(progname));
++        } else {
++            printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
++        }
++        s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
++        if (!s) return(0); /* EOF */
++	while (s && *s && isspace((unsigned char) *s)) ++s;
++	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
++	if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
++	    return(0);
++	}
++	printf("Please answer yes or no.\n");
++    }
++}
++
++EliminateNastyChars(s)
++char *s;
++{
++    if (s) for( ; *s ;++s) {
++        if (isalnum((unsigned char) *s)) continue;
++	if (index(" ,.;:/?\\|[]{}()*&^%#@-_=+~<>\"", *s)) continue;
++	if (*s == '\'' || *s == '`') {
++	    *s = '"';
++	} else {
++	    *s = ' ';
++	}
++    }
++}
++
++StripTrailingSpace(s)
++char *s;
++{
++    char *t = s+strlen(s) -1;
++    while (isspace((unsigned char) *t) && (t >= s)) *t-- = 0;
++}
++
++static char *KeyHeads=NULL;
++static char **KeyHeadList;
++static int KeyKeep = 0;
++
++void setKeyHeads()
++{
++    char *s;
++    int numkeys = 0;
++
++    if ((KeyHeads = getenv("KEYHEADS")) != 0) {
++        for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
++    } else if ((KeyHeads = getenv("KEYIGNHEADS")) != 0) {
++	for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
++	KeyKeep = 1;
++    } else {
++	static char khtmp[] = "to:cc:subject:from:content-description:date";
++	KeyHeads = khtmp;
++    }
++    for (s=KeyHeads; *s; ++s) if (*s == ':') ++numkeys;
++    numkeys += 2;
++    KeyHeadList = XMALLOC(char *, numkeys);
++    numkeys = 0;
++    KeyHeadList[0] = KeyHeads;
++    for(s=KeyHeads; *s; ++s) {
++	if (*s == ':') {
++	    *s = '\0';
++	    KeyHeadList[++numkeys] = s+1;
++	}
++    }
++    KeyHeadList[++numkeys] = NULL;
++}
++
++/* find the first colon in a header line which appears before any spaces or control characters */
++char *
++findcolon(hdr)
++char *hdr;
++{
++    while (*hdr && !isspace(*hdr) && !iscntrl(*hdr))
++	if (*hdr == ':') return hdr;
++	else hdr++;
++    return 0;
++}
++
++/* check the header given to see if it matches any in the KeyHeadList */
++maybephead(hdr)
++char *hdr;
++{
++    char *s;
++    int numkeys=0;
++
++    if (!KeyHeads) setKeyHeads();
++
++    s = findcolon(hdr);
++    if (s) {
++	int len = s - hdr;
++        for (numkeys=0; KeyHeadList[numkeys]; ++numkeys) {
++            if (!strcmp(KeyHeadList[numkeys], "*")
++                 || !lc2strncmp(hdr, KeyHeadList[numkeys], len)) {
++		if (!KeyKeep) phead(hdr);
++		return;
++            }
++        }
++	if (KeyKeep) phead(hdr);
++	return;
++    }
++    if (!strncmp(hdr, "From ", 5) || !strncmp(hdr, ">From ", 6)) {
++	for (numkeys = 0; KeyHeadList[numkeys]; ++numkeys) {
++	    if (!strcmp(KeyHeadList[numkeys], "*")
++		 || !lc2strncmp(">from", KeyHeadList[numkeys], 5)) {
++		if (!KeyKeep) phead(hdr);
++		return;
++	    }
++	}
++	if (KeyKeep) phead(hdr);
++    }
++}
++
++/* This next routine prints out a mail header, and needs to deal with the new extended charset headers. */
++phead(s)
++char *s;
++{
++    char *t = s;
++
++    while (1) {
++	t = index(t, '\n');
++	if (!t) break;
++        if (!isspace((unsigned char) *(t+1))) {
++            *t = 0;
++	    break;
++	} else ++t;
++    }
++    PrintHeader(s, 1);
++    printf("\n");
++    if (t) *t = '\n';
++}
++
++static char PrevCharset[100] = "us-ascii";
++
++/* This is the part that actually handles the charset issues */
++void PrintHeader(s, ShowLeadingWhitespace)
++char *s;
++int ShowLeadingWhitespace;
++{
++    char *charset, *encoding, *txt, *txtend, TmpFile[TMPNAME_MAX];
++    int ecode = ENCODING_NONE, CorrectedCharset = 0;
++    FILE *fp;
++
++    while (*s && (*s != '=')) {
++        if (isspace((unsigned char) *s)) {
++            if (ShowLeadingWhitespace) {
++                putchar(' ');
++            }
++        } else {
++            putchar(*s);
++            if (!CorrectedCharset) {
++                CorrectedCharset = 1;
++                strcpy(PrevCharset, "us-ascii");
++            }
++        }
++        if (!ShowLeadingWhitespace) {
++            /* Only at most one leading space is ignored */
++            ShowLeadingWhitespace = 1;
++        }
++        ++s;
++    }
++    if (!*s) return;
++    if (*(s+1) != '?') {
++        putchar('=');
++        PrintHeader(++s, 1);
++        return;
++    }
++    charset = s+2;
++    encoding = index(charset, '?');
++    if (!encoding) {
++        putchar('=');
++        PrintHeader(++s,1);
++        return;
++    }
++    txt = index(encoding+1, '?');
++    if (!txt) {
++        putchar('=');
++        PrintHeader(++s, 1);
++        return;
++    }
++    txtend = txt;
++    do {
++        txtend = index(txtend+1, '?');
++    } while(txtend && (*(txtend+1) != '='));
++    if (!txtend) {
++        putchar('=');
++        PrintHeader(++s, 1);
++    }
++    /* Proper parse! Ready to dissect... */
++    *encoding = 0;
++    *txt = 0;
++    *txtend = 0;
++    if ((*(encoding+1) == 'q') || (*(encoding+1) == 'Q')) {
++        ecode = ENCODING_QUOTEDPRINTABLE;
++    } else if ((*(encoding+1) == 'b') || (*(encoding+1) == 'B')) {
++        ecode = ENCODING_BASE64;
++    } else {
++        fprintf(stderr, "Bad encoding value in non-ASCII header string: %s\n", encoding+1);
++    }
++    if (lc2strcmp(charset, PrevCharset)) {
++        char *s2, *charsetinuse;
++
++        strncpy(PrevCharset, charset, sizeof(PrevCharset));
++        PrevCharset[sizeof(PrevCharset) - 1] = '\0';
++        for (s2=PrevCharset; *s2; ++s2) {
++            if (isupper((unsigned char) *s2)) *s2 = tolower((unsigned char) *s2);
++        }
++        charsetinuse = getenv("MM_CHARSET");
++        if (!charsetinuse || lc2strcmp(charsetinuse, PrevCharset)) {
++            printf("[** %s charset **] ", charset);
++        }
++    }
++    if (ecode == ENCODING_NONE) {
++        printf("%s", txt+1);
++    } else {
++        /* What follows is REALLY bogus, but all my encoding stuff is pipe-oriented right now... */
++        MkTmpFileName(TmpFile);
++        fp = fopen(TmpFile, WRITE_BINARY);
++        if (!fp) {
++            fprintf(stderr, "Could not open temporary file\n");
++        } else {
++            char *t;
++            for (t=txt+1; *t; ++t) {
++                if (*t == '_') {
++                    putc(' ', fp);
++                } else if (*t == '\n') {
++                    putc(' ', fp);
++                } else {
++                    putc(*t, fp);
++                }
++            }
++            fclose(fp);
++            fp = fopen(TmpFile, "r");
++            if (!fp) {
++                fprintf(stderr, "Could not open temporary file\n");
++            } else {
++                TranslateInputToOutput(fp, stdout, ecode, "text");
++                fclose(fp);
++            }
++            RmTmpFileName(TmpFile);
++        }
++    }
++    *encoding = '?';
++    *txt = '?';
++    *txtend = '?';
++    PrintHeader(txtend + 2, 0);
++}
++
++BuildCommand(Buf, controlstring, TmpFileName, UsedTmpFileName, PartsWritten)
++char *Buf, *controlstring, *TmpFileName;
++int *UsedTmpFileName;
++struct part **PartsWritten;
++{
++    char *from, *to, *s, *p, *tmp;
++    int prefixed = 0, UsedBigFile=0, UsedLittleFiles=0, numparts=0;
++    struct part *firstpart=NULL, *thispart=NULL, *tmppart=NULL;
++
++    if (UsedTmpFileName) *UsedTmpFileName = 0;
++    if (PartsWritten) *PartsWritten = NULL;
++    for (from=controlstring, to=Buf; *from; ++from) {
++        if (prefixed) {
++            prefixed = 0;
++            switch(*from) {
++                case '%':
++                    *to++ = '%';
++                    break;
++                case 'n':
++                case 'F':
++		    if (!PartsWritten) {
++			fprintf(stderr, "metamail: Bad mailcap \"test\" clause: %s\n", controlstring);
++			ExitWithError("%%n and %%F may not be used in \"test\" clauses.  Execution terminated.");
++		    }
++                    if (UsedBigFile) {
++                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
++                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
++                    }
++                    if (!UsedLittleFiles) {
++                        /* Set up parts */
++                        char *LineBuf, *boundary, TmpFileNameBuf[TMPNAME_MAX];
++                        char *oldct, *oldce, *newct;
++                        int currct, boundarylen, newctlen, j;
++                        int oldcparmsused, oldcparamsalloced;
++                        char **oldcparams, **oldcparamvalues;
++                        FILE *headfp;
++
++                        LineBuf = XMALLOC(char, LINE_BUF_SIZE);
++                        boundary = FindParam("boundary");
++			if (!boundary) {
++			    fprintf(stderr, "Bad message format: This multipart message has no boundary parameter,\n");
++			    fprintf(stderr, "but the mailcap entry for %s uses %%F or %%n.\n\n", ContentType);
++			    ExitWithError("A change to the mailcap file might make this message viewable.");
++                        }
++                        if (boundary[0] == '"') {
++                            boundary=UnquoteString(boundary);
++                        }
++                        sprintf(LineBuf, "--%s", boundary);
++                        strcpy(boundary, LineBuf);
++                        boundarylen = strlen(boundary);
++                        if (BoundaryCt >= BoundaryAlloc) {
++                            BoundaryAlloc += 5;
++                            if (Boundaries) {
++                                Boundaries = XREALLOC(char *, Boundaries,
++						      BoundaryAlloc);
++                            } else {
++                                Boundaries = XMALLOC(char *, BoundaryAlloc);
++                            }
++                        }
++                        Boundaries[BoundaryCt++] = boundary;
++                        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
++                            if (!strncmp(LineBuf, boundary, boundarylen)
++                                 && ((LineBuf[boundarylen] == '\n')
++                                      || (LineBuf[boundarylen] == '-'
++                                           && LineBuf[boundarylen+1] == '-'
++                                           && LineBuf[boundarylen+2] == '\n'))) {
++                                break;
++                            }
++                        }
++                        XFREE(LineBuf);
++                        currct = BoundaryCt;
++                        oldct=ContentType;
++                        oldce=ContentEncoding;
++                        oldcparmsused = CParamsUsed;
++                        oldcparamsalloced = CParamsAlloced;
++                        oldcparams = CParams;
++                        oldcparamvalues = CParamValues;
++                        CParams = NULL;
++                        CParamValues = NULL;
++                        CParamsUsed = 0;
++                        CParamsAlloced = 0;
++                        while(currct == BoundaryCt) {
++                            tmppart = XMALLOC(struct part, 1);
++                            if (firstpart) {
++                                thispart->next = tmppart;
++                                thispart = tmppart;
++                            } else {
++                                firstpart = thispart = tmppart;
++                            }
++                            tmppart->next = NULL;
++                            ContentType=NULL;
++                            ContentEncoding=NULL;
++                            Read822Prefix(0,0);
++                            PrepareMessage();
++                            newctlen=5+strlen(ContentType);
++                            for (j=0; j<CParamsUsed; ++j) {
++                                newctlen += 11+strlen(CParams[j]) + strlen(CParamValues[j]);
++                            }
++                            newct= XMALLOC(char, newctlen);
++                            strcpy(newct, "'");
++                            strcat(newct, ContentType);
++                            for (j=0; j<CParamsUsed; ++j) {
++                                strcat(newct, "; ");
++                                strcat(newct, CParams[j]);
++                                if (CParamValues[j][0] == '\"') {
++                                    strcat(newct, " = ");
++                                    strcat(newct, CParamValues[j]);
++                                } else {
++                                    strcat(newct, " = \"");
++                                    strcat(newct, CParamValues[j]);
++                                    strcat(newct, "\"");
++                                }
++                            }
++                            strcat(newct, "'");
++                            thispart->ctype = newct;
++                            MkTmpFileName(TmpFileNameBuf);
++                            thispart->fname = XMALLOC(char,
++						     1+strlen(TmpFileNameBuf));
++                            strcpy(thispart->fname, TmpFileNameBuf);
++                            WriteTmpFile(thispart->fname, thispart->ctype);
++                            strcat(TmpFileNameBuf, "H");
++                            headfp = fopen(TmpFileNameBuf, "w");
++                            if (headfp) {
++                                fputs(mailheaders+12, headfp);
++                                /* The +12 gets rid of MM_HEADERS=\n */
++                                fclose(headfp);
++                            }
++                            ++numparts;
++                        }
++                        ContentType=oldct;
++                        ContentEncoding=oldce;
++                        CParamsUsed = oldcparmsused;
++                        CParamsAlloced = oldcparamsalloced;
++                        CParams = oldcparams;
++                        CParamValues = oldcparamvalues;
++                        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
++                            we must throw it away.*/
++                        if (BoundaryCt > 0) {
++                            ConsumeRestOfPart(NULL);
++                        }
++                        *PartsWritten = firstpart;
++                        UsedLittleFiles=1;
++                    }
++                    if (*from == 'n') {
++                        char numbuf[10];
++                        sprintf(numbuf, "%d", numparts);
++                        strcpy(to, numbuf);
++                        to += strlen(numbuf);
++                    } else { /* %F */
++                        for (tmppart = firstpart; tmppart != NULL; tmppart = tmppart->next) {
++                            sprintf(to, "%s %s ", tmppart->ctype, tmppart->fname);
++                            to += (strlen(tmppart->ctype) + strlen(tmppart->fname) + 2);
++                        }
++                    }
++                    break;
++                case 's':
++                    if (UsedLittleFiles) {
++                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
++                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
++                    }
++                    if (TmpFileName) {
++                        strcpy(to, TmpFileName);
++                        to += strlen(TmpFileName);
++                        if (UsedTmpFileName) ++(*UsedTmpFileName);
++                    }
++                    UsedBigFile = 1;
++                    break;
++                case '{':
++                    s = index(from, '}');
++                    if (!s) {
++                        fprintf(stderr, "Ignoring ill-formed parameter reference in mailcap file: %s\n", from);
++                        break;
++                    }
++                    ++from;
++                    *s = 0;
++                    /* put in lower case */
++                    for (tmp=from; *tmp; ++tmp) {
++                        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++                    }
++                    p = FindParam(from);
++                    if (p && p[0] == '"') {
++                        p=UnquoteString(p);
++                    }
++                    if (!p) p = "";
++                    *to++ = '\'';
++                    strcpynoquotes(to, p);
++                    to += strlen(p);
++                    *to++ = '\'';
++                    *s = '}'; /* restore */
++                    from = s;
++                    break;
++                case 't':
++                    /* type/subtype */
++                    strcpynoquotes(to, ContentType);
++                    to += strlen(ContentType);
++                    break;
++                default:
++                    fprintf(stderr, "Ignoring unrecognized format code in mailcap file: %%%c\n", *from);
++                    break;
++            }
++        } else if (*from == '%') {
++            prefixed = 1;
++        } else {
++            *to++ = *from;
++        }
++    }
++    *to = 0;
++}
++
++strcpynoquotes(t,f)
++char *t, *f;
++{
++    static char *badchars="|<>%*?\"`'";
++
++    while (*f) {
++        if (index(badchars, *f)) *t++ = ' '; else *t++ = *f;
++        ++f;
++    }
++}
++
++WriteTmpFile(fname, ctype)
++char *fname;
++char *ctype;
++{
++    FILE *fpout;
++    int retval = 0;
++
++    fpout = fopen(fname, WRITE_BINARY);
++    if (!fpout) {
++        perror("WriteTmpFile");
++        metamail_fatal("Can't create temporary file: ", fname);
++    }
++    TranslateInputToOutput(InputFP, fpout, EncodingCode, ctype);
++    if (ftell(fpout) == 0) retval = 1;
++    if (fclose(fpout)) ExitWithError("Can't write temporary file");
++    return(retval);
++}
++
++
++TranslateInputToOutput(InputFP, OutputFP, Ecode, ctype)
++FILE *InputFP, *OutputFP;
++int Ecode;
++char *ctype;
++{
++    int InMultipart = BoundaryCt > 0 ? 1 : 0;
++
++    switch(Ecode) {
++        case ENCODING_BASE64:
++            from64(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt, DoesNeedPortableNewlines(ctype));
++            break;
++        case ENCODING_QUOTEDPRINTABLE:
++            fromqp(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt);
++            break;
++ 	case ENCODING_UUENCODE:
++ 	    fromuue(InputFP, OutputFP, InMultipart ? Boundaries: NULL, &BoundaryCt);
++ 	    break;
++        default:
++            ConsumeRestOfPart(OutputFP);
++    }
++    if (UsingStandardInput && feof(InputFP) && !freopen("/dev/tty", "r", stdin)) {
++        fprintf(stderr, "Warning: Cannot freopen /dev/tty to stdin");
++    } else InputFP = stdin;
++}
++
++CreateNewWindowPrefix(Prefix)
++char *Prefix;
++{
++    char *override = getenv("TERMINAL_CMD");
++    if (override) {
++        strcpy(Prefix, override);
++    } else if (getenv("DISPLAY")) {
++        /* X11 */
++        strcpy(Prefix, "xterm -title '");
++        strcat(Prefix, MailSummary);
++        strcat(Prefix, "' -e ");
++    } else if (getenv("WINDOW_PARENT")) {
++        /* SunView */
++        strcpy(Prefix, "shelltool ");
++    } else if (getenv("WMHOST")) {
++        /* old Andrew WM */
++        strcpy(Prefix, "h19 ");
++    } else {
++        /* last resort is to look for /dev/tty */
++        if (!freopen("/dev/tty", "r", stdin)){
++            ExitWithError("Don't know how to create a terminal window");
++        }
++        InputFP = stdin;
++        fprintf(stderr, "Warning, reopened /dev/tty, could be strange.\n");
++        Prefix[0] = 0;
++    }
++}
++
++int HasSavedTtyState=0;
++
++SaveTtyState() {
++    /* Bogus -- would like a good portable way to reset the terminal state here */
++  ioctl(fileno(stdin), TCGETA, &MyTtyStateIn);
++  ioctl(fileno(stdout), TCGETA, &MyTtyStateOut);
++
++  HasSavedTtyState = 1;
++  }
++
++RestoreTtyState() {
++    if (HasSavedTtyState) {
++        ioctl(fileno(stdout), TCSETA, &MyTtyStateOut);
++        ioctl(fileno(stdin), TCSETA, &MyTtyStateIn);
++    }
++}
++
++NeedToAskBeforeExecuting(type)
++char *type;
++{
++    struct NoAskItem *nai;
++    if (!MightAskBeforeExecuting || DoInBackground) return(0);
++    for (nai = FirstNoAskItem; nai; nai = nai->next) {
++        if (CtypeMatch(type, nai->type)) return(0);
++    }
++    return(1);
++}
++
++NeedToBeQuiet(cmd)
++char *cmd;
++{
++    struct NoAskItem *nai;
++    for (nai = FirstQuietItem; nai; nai = nai->next) {
++        if (!lc2strcmp(nai->type, cmd)) return(1);
++    }
++    return(0);
++}
++
++CtypeMatch(ctype, pat)
++char *ctype, *pat;
++{
++    int len;
++    char pat2[200];
++
++    if (!lc2strcmp(ctype, pat)) {
++        return(1); /* exact match, case-insensitive */
++    }
++    if (index(pat, '/') == NULL) {
++        /* implicit wildcard */
++        strcpy(pat2, pat);
++        strcat(pat2, "/*");
++        pat = pat2;
++    }
++    len = strlen(pat);
++    if ((pat[--len] == '*')
++         && (pat[--len] == '/')
++         && (!lc2strncmp(ctype, pat, len))
++         && ((ctype[len] == '/') || (ctype[len] == '\0'))){
++        /* wildcard match */
++        return(1);
++    }
++    return(0);
++}
++
++ExecuteCommand(cmd, really)
++char *cmd;
++int really;
++{
++    int code;
++    if (!Quiet || DoDebug) {
++        if (!NeedToBeQuiet(ShortCommand(cmd))) {
++            printf("---Executing: %s\n", DoDebug ? cmd : ShortCommand(cmd));
++        } else if (EatLeadingNewlines) {
++            printf("\n");
++        } 
++        fflush(stdout);
++    }
++    if (really) {
++        fflush(stdout); fflush(stderr);
++        code = system(cmd);
++        if (DoDebug) printf("Command exit status: %d\n", code);
++        return(code);
++    }
++    return(0);
++}
++
++void
++ConsumeRestOfPart(outfp)
++FILE *outfp;
++{
++    char *Buf;
++    int c;
++
++    if (BoundaryCt <= 0) {
++        while ((c=getc(InputFP)) != EOF) {
++            if (outfp) putc(c, outfp);
++        }
++        return;
++    }
++    Buf = XMALLOC(char, LINE_BUF_SIZE);
++    while (fgets(Buf, LINE_BUF_SIZE, InputFP)) {
++        if ((BoundaryCt > 0)
++             && (Buf[0] == '-')
++             && (Buf[1] == '-')
++             && PendingBoundary(Buf, Boundaries, &BoundaryCt)) {
++            break;
++        }
++        if (outfp) fputs(Buf, outfp);
++    }
++    XFREE(Buf);
++}
++
++char *paramend(s)
++char *s;
++{
++    int inquotes=0;
++    while (*s) {
++        if (inquotes) {
++            if (*s == '"') {
++                inquotes = 0;
++            } else if (*s == '\\') {
++                ++s; /* skip a char */
++            }
++        } else if (*s == ';') {
++            return(s);
++        } else if (*s == '"') {
++            inquotes = 1;
++        }
++        ++s;
++    }
++    return(NULL);
++}        
++
++void
++ParseContentParameters(ct)
++char *ct;
++{
++    char *s, *t, *eq;
++
++    CParamsUsed = 0;
++    s = index(ct, ';');
++    if (!s) return;
++    *s++ = 0;
++    do {
++        t = paramend(s);
++        if (t) *t++ = 0;
++        eq = index(s, '=');
++        if (!eq) {
++            fprintf(stderr, "Ignoring unparsable content-type parameter: '%s'\n", s);
++            JunkParameter=Cleanse(s);
++        } else {
++            if (CParamsUsed >= CParamsAlloced) {
++                CParamsAlloced += 10;
++                if (CParams) {
++                    CParams = XREALLOC(char *, CParams, 1+CParamsAlloced);
++                    CParamValues = XREALLOC(char *, CParamValues, 
++					    1+CParamsAlloced);
++                } else {
++                    CParams = XMALLOC(char*, 1+CParamsAlloced);
++                    CParamValues = XMALLOC(char *, 1+CParamsAlloced);
++                }
++            }
++            *eq++ = 0;
++            s = Cleanse(s);
++            CParams[CParamsUsed] = s;
++            /* strip leading white space */
++            while (*eq && isspace((unsigned char) *eq)) ++eq;
++            /* strip trailing white space */
++            StripTrailingSpace(eq);
++            CParamValues[CParamsUsed++] = eq; 
++            if (DoDebug) printf("NEW PARAMETER: %s VALUE: %s\n", s, eq);
++        }
++        s = t;
++    } while (t);
++}
++
++char *FindParam(s)
++char *s;
++{
++    int i;
++    for (i=0; i<CParamsUsed; ++i) {
++        if (!strcmp(s, CParams[i])) {
++            return(CParamValues[i]);
++        }
++    }
++    return(NULL);
++}
++
++strcatquoting(s1, s2)
++char *s1;
++char *s2;
++{
++    strcat(s1, s2);
++#ifdef NOTDEF
++    while (*s1) ++s1;
++    while (*s2) {
++        if (*s2 == '\"' || *s2 == '\\') *s1++ = '\\';
++        *s1++ = *s2++;
++    }
++    *s1 = '\0';
++#endif
++}
++
++PauseForUser() {
++    if (DefinitelyNotTty || MustNotBeTty) return;	
++
++    fflush(stdout);
++    SaveTtyState();
++    if (StartRawStdin() != -1) {
++        printf("--Press any key to go on.--");
++    } else {
++        printf("Press RETURN to go on.\n");
++    }
++    fflush(stdout);
++    getchar();
++    RestoreTtyState();
++    printf("\n");
++}
++
++StartRawStdin() {
++    struct termio   orterm, fterm;
++    ioctl(0, TCGETA, &orterm);	/* get current (i.e. cooked) termio */
++    fterm = orterm;		/* get termio to modify */
++
++    fterm.c_lflag &= ~ICANON;	/* clear ICANON giving raw mode */
++    fterm.c_cc[VMIN] = 1;	/* set MIN char count to 1 */
++    fterm.c_cc[VTIME] = 0;	/* set NO time limit */
++    return ioctl(0, TCSETAW, &fterm);	/* modify termio for raw mode */
++}
++
++
++int IsDirectory(fname)
++char *fname;
++{
++    struct stat stbuf;
++    if (stat(fname, &stbuf)) {
++	return(-1);
++    }
++    return (((stbuf.st_mode & S_IFMT) == S_IFDIR) ? 1 : 0);
++}
++
+--- metamail-2.7.orig/src/metamail/metamail.old
++++ metamail-2.7/src/metamail/metamail.old
+@@ -0,0 +1,2756 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++/****************************************************** 
++    Metamail -- A tool to help diverse mail readers 
++                cope with diverse multimedia mail formats.
++
++    Author:  Nathaniel S. Borenstein, Bellcore
++
++ ******************************************************* */
++
++#include <stdio.h>
++#include <ctype.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include "../config.h"
++#include <patchlevel.h>
++#include "dlist.h"
++
++#ifdef BORLAND
++#define F_OK 0
++extern unsigned _stklen = 16384;
++extern char *mktemp(char *);
++#define WRITE_BINARY	"w"
++#else /* BORLAND */
++#ifdef MICROSOFT
++#include <malloc.h>
++#include <stdlib.h>
++#include <time.h>
++#include <signal.h>
++#define F_OK 0
++#else
++#include <pwd.h>
++#include <sys/time.h>
++#include <sys/types.h>
++#include <sys/file.h>
++#include <signal.h>
++#ifndef AMIGA
++#ifdef SYSV
++#include <termio.h>
++#include <unistd.h>
++#else /* SYSV */
++#include <sgtty.h>
++#endif /* SYSV */
++#endif /* AMIGA */
++#endif /* MICROSOFT */
++#endif /* BORLAND */
++
++#if defined(SYSV) && !defined(linux)
++#define LPRTEMPLATE "lp %s"
++#define LPRCOMMAND "lp"
++#else
++#define LPRTEMPLATE "lpr %s"
++#define LPRCOMMAND "lpr"
++#endif
++#ifdef MSDOS
++#define CATCOMMAND  "cat"
++#define CATTEMPLATE "cat %s"
++#define METAMAIL    "metamail"
++#define TMPFILE_NAME_SIZE   128
++#define MAX_FILE_NAME_SIZE 128
++#define WRITE_BINARY	"wb"
++#else /* MSDOS */
++#ifdef AMIGA
++extern char *MkRmScript();
++#ifndef F_OK
++#define F_OK (0)
++#endif
++#define CATCOMMAND  "Type"
++#define CATTEMPLATE "Type %s"
++#define METAMAIL    "metamail <*"
++#define TMPFILE_NAME_SIZE     50
++#define MAX_FILE_NAME_SIZE 256
++#define WRITE_BINARY	"w"
++#else /* AMIGA */
++extern char **environ, *gets();
++#define CATCOMMAND  "cat"
++#define CATTEMPLATE "cat %s"
++#define METAMAIL    "metamail"
++#define TMPFILE_NAME_SIZE   1000
++#define MAX_FILE_NAME_SIZE 1000
++#define WRITE_BINARY	"w"
++#endif /* AMIGA */
++#endif /* MSDOS */
++
++#ifndef NO_RLIMITS
++#include <sys/resource.h>
++#endif
++
++#define CMDSIZE 1200 /* Maximum size of command to execute */
++
++#define LINE_BUF_SIZE       2000
++#ifndef MICROSOFT
++extern char *malloc();
++extern char *realloc();
++#endif
++extern char *getenv();
++extern char *index();
++extern char *rindex();
++char fileToDelete[MAX_FILE_NAME_SIZE];
++
++char *FindParam();
++extern FILE *popen();
++static char *nomem = "Out of memory!";
++static char *mmversion = MM_VERSTRING;
++static char *NoAskDefault = "text,text/plain,text/richtext";
++static char *QuietDefault = CATCOMMAND;
++static char *tmproot="";
++
++struct MailcapEntry {
++    char *contenttype;
++    char *command;
++    char *testcommand;
++    int needsterminal;
++    int copiousoutput;
++    int needtofree;
++    char *label;
++    char *printcommand;
++};
++
++FILE *InputFP = NULL;
++
++int MightAskBeforeExecuting = 1,
++    DefinitelyNotTty = 0,
++    MustNotBeTty = 0,
++    MaybePageOutput = 0,
++    MustPageOutput = 0,
++    EatLeadingNewlines = 0,
++    PrintSomeHeaders = 1,
++    DoInBackground = 0,
++    Quiet = 0,
++    TransparentMode = 0,
++    DeleteSourceFileWhenDone = 0,
++    Is822Format = 1,
++    DoDebug = 0,
++    CParamsAlloced = 0,
++    CParamsUsed = 0,
++    YankMode = 0,
++    UsingStandardInput = 0,
++    PrintingMode = 0,
++    JustWriteFiles = 0,
++    ProcessingErrors = 0;
++
++char *ContentType = NULL,
++    *ContentEncoding = NULL,
++    *MailerName = "unknown",
++    *MailSubject = "Mail message",
++    *MailFrom = "unknown sender",
++    *MailSummary = "non-text mail message",
++    *mailheaders = NULL,
++    **CParams = NULL,
++    **CParamValues = NULL,
++    *JunkParameter = NULL;
++
++DList* TmpNameListTail;
++
++#define ENCODING_NONE 0
++#define ENCODING_BASE64 1
++#define ENCODING_QUOTEDPRINTABLE 2
++#define ENCODING_8BIT 3
++#define ENCODING_UUENCODE -1	/* non-standard */
++int EncodingCode = ENCODING_NONE;
++
++struct part {
++    char *ctype;
++    char *fname;
++    struct part *next;
++};
++
++struct NoAskItem {
++    char *type;
++    struct NoAskItem *next;
++} *FirstNoAskItem = NULL,
++  *FirstQuietItem = NULL;
++
++#ifdef MICROSOFT
++/* Need a function prototype for TryMailcapEntry because without it MSC
++ * passes a pointer to the structure rather than the structure itself.
++ */
++TryMailcapEntry(struct MailcapEntry mc, char *SquirrelFile);
++#endif
++
++void PrintHeader();
++void ConsumeRestOfPart();
++void ParseContentParameters();
++
++void CleanupTmpFiles();
++
++sigtype cleanup();
++
++char *Cleanse(s) /* no leading or trailing space, all lower case */
++char *s;
++{
++    char *tmp, *news;
++    
++    /* strip leading white space */
++    while (*s && isspace((unsigned char) *s)) ++s;
++    news = s;
++    /* put in lower case */
++    for (tmp=s; *tmp; ++tmp) {
++        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++    }
++    /* strip trailing white space */
++    while (tmp > news && *--tmp && isspace((unsigned char) *tmp)) *tmp = 0;
++    return(news);
++}
++
++char *UnquoteString(s)
++char *s;
++{
++    char *ans, *t;
++
++    if (*s != '"') return(s);
++    ans = malloc(1+strlen(s));
++    if (!ans) ExitWithError(nomem);
++    ++s;
++    t = ans;
++    while (*s) {
++        if (*s == '\\') {
++            *t++ = *++s;
++        } else if (*s == '"') {
++            break;
++        } else {
++            *t++ = *s;
++        }
++        ++s;
++    }
++    *t = 0;
++    return(ans);
++}
++
++sigtype
++cleanup(signum) 
++int signum;
++{
++    RestoreTtyState();
++#if defined(MSDOS) || defined(AMIGA)
++    exit(signum);
++#else
++    signal(signum, SIG_DFL);
++    kill(getpid(), signum);
++#endif
++}
++
++char **Boundaries = NULL;
++int BoundaryCt = 0, BoundaryAlloc = 0;
++struct nextfile {
++    char *filename;
++    struct nextfile *next;
++} *FileQueue=NULL, *LastInQueue = NULL;
++
++void
++ResetGlobals() {
++    CParamsAlloced = 0;
++    CParamsUsed = 0;
++
++    ContentType = NULL;
++    ContentEncoding = NULL;
++    MailSubject = "Mail message";
++    MailFrom = "unknown sender";
++    MailSummary = "non-text mail message";
++    mailheaders = getenv("MM_HEADERS");
++    if (mailheaders) {
++        char *s;
++        s = malloc(15+strlen(mailheaders));
++        if (!s) ExitWithError(nomem);
++        sprintf(s, "MM_HEADERS=%s", mailheaders);
++        mailheaders = s;
++    }
++    CParams = NULL;
++    CParamValues = NULL;
++    JunkParameter = NULL;
++}
++
++void modpath(auxpath)
++char *auxpath;
++{
++    if (auxpath && *auxpath) {
++        static char *newpath = 0;
++	char *oldpath = newpath;
++        char *path = getenv("PATH");
++
++	if (!path) path = "";	/* give a default if no current path */
++	newpath = malloc(7 + strlen(path) + strlen(auxpath));
++        if (!newpath) ExitWithError(nomem);
++        sprintf(newpath, "PATH=%s:%s", auxpath, path);
++        putenv(newpath);
++	if (oldpath) free(oldpath); 	/* free up any old allocated PATH */
++    }
++}
++
++main(argc, argv)
++int argc;
++char **argv;
++{
++    int retcode;
++
++    modpath(AUXPATH);
++#ifndef MSDOS
++    signal(SIGINT, cleanup);
++#ifndef AMIGA
++    signal(SIGILL, cleanup);
++    signal(SIGTRAP, cleanup);
++    signal(SIGIOT, cleanup);
++    signal(SIGFPE, cleanup);
++#ifndef linux
++    signal(SIGEMT, cleanup);
++    signal(SIGBUS, cleanup);
++#endif
++    signal(SIGSEGV, cleanup);
++    signal(SIGTERM, cleanup);
++#endif
++#endif
++#ifdef SIGXCPU
++    signal(SIGXCPU, cleanup);
++#endif
++    tmproot = getenv("METAMAIL_TMPDIR");
++    if (!tmproot) tmproot="/tmp";
++    mailheaders = getenv("MM_HEADERS");
++    if (mailheaders) {
++        char *s;
++        s = malloc(15+strlen(mailheaders));
++        if (!s) ExitWithError(nomem);
++        sprintf(s, "MM_HEADERS=%s", mailheaders);
++        mailheaders = s;
++    }
++    fileToDelete[0] = 0;
++    ProcessArguments(argc, argv); /* calls ExitWithError on error */
++#if !defined(AMIGA) && !defined(MSDOS)
++    if (MaybePageOutput) {
++        /* Want to send stderr to pager too, sigh... */
++        fflush(stderr);
++        close(2);
++        dup2(1, 2);
++    }
++#endif
++    retcode = HandleMessage(NULL, 0);
++    if (! UsingStandardInput) {
++        fclose(InputFP);
++    }
++    if (fileToDelete[0]) {
++        unlink(fileToDelete);
++        fileToDelete[0] = 0;
++    }
++    while (FileQueue) {
++        InputFP = fopen(FileQueue->filename, "r");
++        if (DoDebug) printf("Trying to open input file: %s\n", FileQueue->filename);
++        if (!InputFP) ExitWithError("Can't read input file");
++        if (DeleteSourceFileWhenDone) {
++            strcpy(fileToDelete, FileQueue->filename);
++        }
++        ResetGlobals();
++        retcode |= HandleMessage(NULL, 0);
++        if (! UsingStandardInput) {
++            fclose(InputFP);
++        }
++        if (fileToDelete[0]) {
++            unlink(fileToDelete);
++            fileToDelete[0] = 0;
++        }
++        FileQueue = FileQueue->next;
++    }
++    if (MustPageOutput) PauseForUser();
++    CleanupTmpFiles();
++    exit(ProcessingErrors? -1 : retcode);
++}
++
++void
++QueueNextFile(fname)
++char *fname;
++{
++    struct nextfile *tmp = (struct nextfile *) malloc(sizeof (struct nextfile));
++    if (!tmp) ExitWithError(nomem);
++    tmp->filename = fname;
++    tmp->next = NULL;
++    if (FileQueue) {
++        LastInQueue->next = tmp;
++        LastInQueue = tmp;
++    } else {
++        FileQueue = tmp;
++        LastInQueue = tmp;
++    }
++}
++
++HandleMessage(SquirrelFile, nestingdepth)
++char *SquirrelFile;
++/* SquirrelFile, if non-NULL, is a place to save a recognized body instead of executing it. */
++int nestingdepth;
++{
++    char *boundary;
++    int FileWriteOnly = JustWriteFiles;
++
++    if (FileWriteOnly) {
++        if (!lc2strncmp(ContentType, "message/", 8)
++             || !lc2strncmp(ContentType, "multipart/", 10)) {
++            FileWriteOnly = 0; /* only leaf data */
++        }
++    }
++    if (Is822Format) {
++	if (Read822Prefix(SquirrelFile?0:1, nestingdepth)) {
++	    return -1;
++	}
++    } else Is822Format = 1; /* this property is not recursive for multipart or message */
++    PrepareMessage();
++    if (!FileWriteOnly && !ProcessMailcapFiles(SquirrelFile)) return(0);
++    if (!lc2strcmp(ContentType, "message")
++         || !lc2strcmp(ContentType, "message/rfc822")) { 
++        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
++        ContentType = NULL; /* reset default */
++        ContentEncoding = NULL; /* reset default */
++        return(HandleMessage(NULL, nestingdepth+1)); /* simple recursion */
++    }
++    boundary = FindParam("boundary");
++    if (!boundary) boundary =JunkParameter; /* backward compatibility hack */
++    if (!lc2strncmp(ContentType, "multipart", 9)) { 
++      if (!boundary) {
++	  fprintf(stderr, "Warning: No boundary for multipart data, treating as unrecognized format.\n");
++      } else {
++        char *LineBuf, NewSquirrelFile[TMPFILE_NAME_SIZE];
++        char *subtype = NULL;
++        int currct, result, IsAlternative, WroteSquirrelFile, boundarylen;
++
++        if (SquirrelFile) return(SaveSquirrelFile(SquirrelFile));
++        if (boundary[0] == '"') {
++            boundary=UnquoteString(boundary);
++        }
++        subtype = index(ContentType, '/');
++        if (subtype) {
++            ++subtype;
++            subtype = Cleanse(subtype);
++        } else subtype = "mixed";
++#ifndef MSDOS
++        if (!MaybePageOutput && !DoInBackground) DoInBackground = strcmp(subtype, "parallel") ? 0 : 1;
++#endif
++
++        IsAlternative = strcmp(subtype, "alternative") ? 0 : 1;
++        if (IsAlternative) {
++            MkTmpFileName(NewSquirrelFile);
++            WroteSquirrelFile = 0;
++        }
++        LineBuf = malloc(LINE_BUF_SIZE);
++        if (!LineBuf) ExitWithError(nomem);
++        sprintf(LineBuf, "--%s", boundary);
++        strcpy(boundary, LineBuf);
++        boundarylen = strlen(boundary);
++        if (BoundaryCt >= BoundaryAlloc) {
++            BoundaryAlloc += 5;
++            if (Boundaries) {
++                Boundaries = (char **) realloc(Boundaries, BoundaryAlloc*sizeof(char *));
++            } else {
++                Boundaries = (char **) malloc(BoundaryAlloc*sizeof(char *));
++            }
++            if (!Boundaries) ExitWithError(nomem);
++        }
++        Boundaries[BoundaryCt++] = boundary;
++        if (DoDebug) printf("Handling multipart as built-in here.  Boundary: %s\n", boundary);
++        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
++            if (!strncmp(LineBuf, boundary, boundarylen)
++                 && ((LineBuf[boundarylen] == '\n')
++                      || (LineBuf[boundarylen] == '-'
++                           && LineBuf[boundarylen+1] == '-'
++                           && LineBuf[boundarylen+2] == '\n'))) {
++                break;
++            }
++        }
++        free(LineBuf);
++        currct = BoundaryCt;
++        while(currct == BoundaryCt) {
++            if (!strcmp(subtype, "digest")) {
++                ContentType = "message/rfc822";
++            } else {
++                ContentType = NULL; /* reset default */
++            }
++            ContentEncoding = NULL; /* reset default */
++            if (IsAlternative) {
++                result = HandleMessage(NewSquirrelFile, nestingdepth+1);
++            } else{
++                result = HandleMessage(NULL, nestingdepth+1);
++            }
++            if (result) {
++                /* Need to consume the rest of the part */
++                ConsumeRestOfPart(NULL);
++            } else {
++                ++WroteSquirrelFile;
++            }
++        }
++        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
++            we must throw it away.*/
++        if (BoundaryCt > 0) {
++            ConsumeRestOfPart(NULL);
++        }
++        if (IsAlternative) {
++            if (WroteSquirrelFile) {
++                int retcode; 
++                char Cmd[TMPFILE_NAME_SIZE + 15];
++                sprintf(Cmd, "%s %s", METAMAIL, NewSquirrelFile);
++                fflush(stdout); fflush(stderr);
++                retcode = system(Cmd);
++#ifdef MSDOS
++                retcode = 0;
++#endif
++                unlink(NewSquirrelFile);
++                return(retcode);
++            } else {
++                printf("Cannot handle any part of multipart/alternative message\n");
++            }
++        }
++	return(0);
++      }
++    } /* End of multipart handling */
++    if (!FileWriteOnly && !TryBuiltIns(SquirrelFile)) return(0);
++    if (!SquirrelFile) { /* Very last resort -- unrecognized types */
++        char Fname[MAX_FILE_NAME_SIZE], *suggestedname, SugBuf[MAX_FILE_NAME_SIZE];
++        FILE *fp;
++        int ans = 0, octetstream, ecode=0;
++        suggestedname = FindParam("name");
++        if (!suggestedname) {
++            MkTmpFileName(SugBuf);
++            suggestedname = SugBuf;
++        } else if (suggestedname[0] == '"') {
++            suggestedname=UnquoteString(suggestedname);
++        }
++        octetstream = ! lc2strcmp(ContentType, "application/octet-stream");
++        if (MightAskBeforeExecuting
++             && !DefinitelyNotTty && !MustNotBeTty) {
++            if (FileWriteOnly) {
++                printf("\nThis message contains '%s`-format data.\n", ContentType);
++            } else if (octetstream) {
++                printf("This message contains raw digital data, which can either be viewed as text\nor written to a file.\n");
++            } else {
++                printf("\nThis message contains data in an unrecognized format, %s,\nwhich can either be viewed as text or written to a file.\n", ContentType);
++            }
++            while (!ans) {
++                if (FileWriteOnly) {
++                    ans = 2;
++                } else {
++                    printf("\nWhat do you want to do with the %s data?\n1 -- See it as text\n2 -- Write it to a file\n3 -- Just skip it\n\n", octetstream ? "raw" : ContentType);
++                    fgets(Fname, sizeof(Fname), stdin);
++                    ans = atoi(Fname);
++                }
++                switch(ans) {
++                    case 1:
++                        TranslateInputToOutput(InputFP, stdout, EncodingCode, "text");
++                        return(0);
++                    case 2:
++                        {
++                        int needname = 1;
++                        while (needname) {
++                            needname = 0;
++                            printf("Please enter the name of a file to which the data should be written\n(Default: %s) > ", suggestedname);
++                            fflush(stdout);
++                            fgets(Fname, sizeof(Fname), stdin);
++                            Fname[strlen(Fname) - 1] = '\0'; /* bogus newline */
++#if !defined(AMIGA) && !defined(MSDOS)
++                            if (!Fname[0]) strcpy(Fname, suggestedname);
++                            if (Fname[0] == '~' && Fname[1] == '/') {
++                                char Fname2[1000];
++                                int uid = getuid();
++                                struct passwd *p;
++                                p = getpwuid(uid);
++                                if (!p) {
++                                    MkTmpFileName(Fname);
++                                    printf("Cannot figure out what ~ means, using temporary file %s instead\n", Fname);
++                                } else {
++                                    strcpy(Fname2, p->pw_dir);
++                                    strcat(Fname2, "/");
++                                    strcat(Fname2, Fname + 2);
++                                    strcpy(Fname, Fname2);
++                                }
++                            }
++#endif
++                            if (access(Fname, F_OK) == 0) {
++                                char *s, AnsBuf[50];
++                                int overwriteans = -1;
++                                do {
++                                    printf("File %s exists.  Do you want to overwrite it (y/n) ?\n", Fname);
++                                    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
++                                    if (!s) {
++                                        overwriteans = 0;
++                                    } else {
++                                        while (s && *s && isspace((unsigned char) *s)) ++s;
++                                        if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') {
++                                            overwriteans = 1;
++                                        } else if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
++                                            overwriteans=0;
++                                        }
++                                    }
++                                    if (overwriteans == -1) printf("Please answer yes or no.\n");
++                                } while (overwriteans == -1);
++                                if (overwriteans == 0) needname = 1;
++                            }
++                        }
++                        }
++                        break;
++                    case 3:
++                        ConsumeRestOfPart(NULL);
++                        return(0);
++                        break;
++                    default:
++                        ans = 0;
++                        break;
++                }
++            }
++        } else {
++            int ct = 0;
++            char *slash = rindex(suggestedname, '/');
++#ifdef AMIGA
++	    if (slash == NULL) {
++                slash = rindex(suggestedname, ':');
++            }
++#endif
++            if (slash)  {
++                ++slash;
++            } else {
++                slash = suggestedname;
++            }
++            do {
++                if (ct) {
++#ifdef AMIGA
++                    sprintf(Fname, "T:%d-%s", ct, slash);
++                } else {
++                    sprintf(Fname, "T:%s", slash);
++#else
++                    sprintf(Fname, "%s/%d-%s", tmproot, ct, slash);
++                } else {
++                    sprintf(Fname, "%s/%s", tmproot, slash);
++#endif
++                }
++                ++ct;
++            } while (access(Fname, F_OK) == 0);
++            if (FileWriteOnly) {
++                printf("\nThis message contains '%s`-format data.\n", ContentType);
++            } else if (octetstream) {
++                printf("\nThis message contains raw digital data,");
++            } else {
++                printf("\nThis message contains data in an unrecognized format, %s,", ContentType);
++            }
++            printf("\nwhich is being decoded and written to the file named \"%s\".\nIf you do not want this data, you probably should delete that file.\n", Fname);
++        }
++        if (Fname[0] == 0 || Fname[0] == '\n') {
++            ConsumeRestOfPart(NULL);
++        } else {
++            fp = fopen(Fname, WRITE_BINARY);
++            if (!fp) ExitWithError("Cannot open temporary file");
++            TranslateInputToOutput(InputFP, fp, EncodingCode, ContentType);
++            ecode = fclose(fp);
++            if (ecode) {
++                printf("Could not write file %s\n", Fname);
++            } else {
++                printf("Wrote file %s\n", Fname);
++            }
++        }
++        if (!DefinitelyNotTty && MaybePageOutput && BoundaryCt > 0) PauseForUser();
++        return(ecode);
++    }
++    return(-1); /* Unrecognized, really */
++}
++
++ProcessArguments(argc, argv)
++int argc;
++char **argv;
++{
++    int i, RunAsRootOK = 0;
++    char *SourceFileName = NULL, *NoAskStr, *QuietStr;
++
++    QuietStr = getenv("MM_QUIET");
++    if (!QuietStr) {
++        QuietStr=QuietDefault;
++    }
++    if (!strcmp(QuietStr, "1")) {
++        Quiet = 1;
++    } else {
++        struct NoAskItem *qitem;
++        char *s, *tmp;
++        char *QuietCopy;
++
++        Quiet = 0;
++        QuietCopy = malloc(1+strlen(QuietStr));
++        if (!QuietCopy) ExitWithError(nomem);
++        strcpy(QuietCopy, QuietStr);
++        for (tmp=QuietCopy; *tmp; ++tmp) {
++            if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++        }
++        do {
++            s = index(QuietCopy, ',');
++            if (s) *s++ = 0;
++            qitem = (struct NoAskItem *) malloc(sizeof (struct NoAskItem));
++            if (!qitem) ExitWithError(nomem);
++            qitem->next = FirstQuietItem;
++            qitem->type = QuietCopy;
++            FirstQuietItem = qitem;
++            QuietCopy = s;
++        } while (QuietCopy);
++    }
++    if (getenv("MM_TRANSPARENT")) {
++        TransparentMode = atoi(getenv("MM_TRANSPARENT")); /* Will not propogate recursively */
++    }
++    if (getenv("MM_RUNASROOT")) {
++        RunAsRootOK = atoi(getenv("MM_RUNASROOT"));
++    }
++    if (getenv("MM_YANKMODE")) {
++        YankMode = atoi(getenv("MM_YANKMODE")); /* Will not propogate recursively */
++    }
++    if (getenv("MM_DEBUG")) {
++        DoDebug = atoi(getenv("MM_DEBUG"));
++    }
++    if (DoDebug) printf("Metamail Version %s, debugging turned on.\n", mmversion);
++    NoAskStr = getenv("MM_NOASK");
++    if (!NoAskStr) NoAskStr = NoAskDefault;
++    if (!strcmp(NoAskStr, "1")) {
++        MightAskBeforeExecuting = 0;
++    } else {
++        struct NoAskItem *nai;
++        char *s, *tmp;
++        char *NoAskCopy;
++
++        NoAskCopy = malloc(1+strlen(NoAskStr));
++        if (!NoAskCopy) ExitWithError(nomem);
++        strcpy(NoAskCopy, NoAskStr);
++        for (tmp=NoAskCopy; *tmp; ++tmp) {
++            if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++        }
++        do {
++            s = index(NoAskCopy, ',');
++            if (s) *s++ = 0;
++            nai = (struct NoAskItem *) malloc(sizeof (struct NoAskItem));
++            if (!nai) ExitWithError(nomem);
++            nai->next = FirstNoAskItem;
++            nai->type = NoAskCopy;
++            FirstNoAskItem = nai;
++            NoAskCopy = s;
++        } while (NoAskCopy);
++    }
++    MailerName = getenv("MM_MAILER");
++    if (!MailerName) MailerName = "unknown";
++    if (getenv("MM_USEPAGER")) {
++        MaybePageOutput = atoi(getenv("MM_USEPAGER"));
++    }
++    if ((getenv("MM_NOTTTY") && ((atoi(getenv("MM_NOTTTY"))) != 0))) {
++        MustNotBeTty = 1;
++    }
++    if (MustNotBeTty
++         || !isatty(0)
++         || !isatty(1)) {
++        DefinitelyNotTty = 1;
++    }
++    for (i=1; i<argc; ++i) {
++	if (argv[i][0] == '-') {
++	    switch (argv[i][1]) {
++		case '\0':
++		    /* Not really necessary, but.... */
++		    SourceFileName = NULL;
++		    UsingStandardInput = 1;
++		    break;
++		case 'b':
++		    Is822Format = 0;
++		    break;
++		case 'B':
++#ifdef MSDOS
++                    fprintf(stderr, "metamail warning: -B flag not supported on this system\n");
++#else
++		    DoInBackground = 1;
++#endif
++		    break;
++                case 'c':
++		    if (++i >= argc) usage();
++		    ContentType = malloc(1+strlen(argv[i]));
++		    if (!ContentType) ExitWithError(nomem);
++                    strcpy(ContentType,argv[i]);
++                    /* strip leading white space */
++                    while (*ContentType && isspace((unsigned char) *ContentType)) ++ContentType;
++                    StripTrailingSpace(ContentType);
++                    ParseContentParameters(ContentType);
++                    break;
++                case 'd':
++		    MightAskBeforeExecuting = 0;
++		    break;
++		case 'e':
++		    EatLeadingNewlines = 1;
++		    break;
++		case 'E':
++		    if (++i >= argc) usage();
++		    ContentEncoding = argv[i];
++		    break;
++		case 'f':
++		    if (++i >= argc) usage();
++		    MailFrom = argv[i];
++                    break;
++                case 'h':
++                    {
++                    FILE *tmpfp;
++                    PrintingMode = 1;
++                    MightAskBeforeExecuting = 0;
++#ifdef AMIGA
++		    freopen("prt:", "w", stdout);
++#else
++                    /* Want to make all of stdout go to printer, and this 
++                      is easier than changing every output statement,
++                      at least on UNIX... */
++                    tmpfp = popen(LPRCOMMAND, "w");
++                    if (!tmpfp) {
++                        ExitWithError("Cannot execute lpr command");
++                    }
++                    fflush(stdout);
++                    close(1);
++                    dup2(fileno(tmpfp), 1);
++#endif
++                    break;
++                    }
++		case 'm':
++		    if (++i >= argc) usage();
++		    MailerName = argv[i];
++		    break;
++		case 'p':
++		    MaybePageOutput = 1;
++		    break;
++		case 'P':
++                    MaybePageOutput = 1;
++                    MustPageOutput = 1;
++		    break;
++		case 'r':
++#ifdef MSDOS
++                    fprintf(stderr, "metamail warning: -r flag not supported on this system\n");
++#else
++		    RunAsRootOK = 1;
++#endif
++                    break;
++                case 'R':
++#ifdef RESET_PROGRAM
++                    system(RESET_PROGRAM);
++                    if (DoDebug) printf("Executed reset\n");
++#else
++                    fprintf(stderr, "metamail warning: -R flag not supported on this system\n");
++#endif
++                    break;
++		case 's':
++		    if (++i >= argc) usage();
++		    MailSubject = argv[i];
++		    break;
++                case 'T':
++                    TransparentMode = 0;
++                    break;
++                case 'w':
++                    JustWriteFiles = 1;
++                    break;
++                case 'q':
++                    Quiet = 1;
++		    PrintSomeHeaders = 0;
++		    break;
++		case 'x':
++                    DefinitelyNotTty = 1;
++                    MustNotBeTty = 1;
++		    break;
++                case 'y':
++                    YankMode = 1;
++                    break;
++		case 'z':
++		    DeleteSourceFileWhenDone = 1;
++		    break;
++		default:
++		    usage();
++	    }
++	} else {
++	    if (SourceFileName) {
++                QueueNextFile(argv[i]);
++	    } else {
++		SourceFileName = argv[i];
++	    }
++	}
++    }
++    if (TransparentMode) {
++        RunInNewWindow(argv, argc, &SourceFileName);
++    }
++    if (MaybePageOutput && DoInBackground) {
++	MustNotBeTty = 1;
++        /*fprintf(stderr, "metamail: -B is incompatible with -p, -P, and MM_USEPAGER\n");
++        usage(); */
++    }
++    if (!Is822Format && !ContentType) {
++	fprintf(stderr, "metamail:  -b requires -c.\n");
++	usage();
++    }
++    if (DeleteSourceFileWhenDone && !SourceFileName) {
++	fprintf(stderr, "metamail:  -z requires -f.\n");
++	usage();
++    }
++#if !defined(AMIGA) && !defined(MSDOS)
++    if (!RunAsRootOK && (getuid() == 0 || geteuid() == 0)) {
++	fprintf(stderr, "You can not run MetaMail as root unless you use -r or set MM_RUNASROOT.\n");
++	usage();
++    }
++#endif
++    if (SourceFileName) {
++        InputFP = fopen(SourceFileName, "r");
++        if (DoDebug) printf("Trying to open input file: %s\n", SourceFileName);
++        if (!InputFP) ExitWithError("Can't read input file");
++        if (DeleteSourceFileWhenDone) {
++            strcpy(fileToDelete, SourceFileName);
++        }
++    } else {  /* input on stdin */
++        UsingStandardInput = 1;
++        if (MustNotBeTty) {
++            InputFP = stdin;
++/*            MaybePageOutput = 1; */ /* This messed up safe-tcl -- nsb 9/21/93 */
++            MightAskBeforeExecuting = 0;
++        } else {
++#if defined(MSDOS) || defined(AMIGA)
++            InputFP = stdin;
++            DefinitelyNotTty = 1;
++            MaybePageOutput = 0;
++#else
++            int newfd = dup(0);
++            FILE *newfp;
++            if (newfd > 0) {
++                InputFP = fdopen(newfd, "r");
++                if (InputFP 
++                     && ((newfp = fopen("/dev/tty", "r")) != NULL)
++                     && !dup2(fileno(newfp), 0)) {
++                    DefinitelyNotTty = 0;
++                } else {
++                    InputFP = stdin;
++                    DefinitelyNotTty = 1;
++                    MaybePageOutput = 0;
++                }
++            }
++#endif
++        }
++    }
++    if (DefinitelyNotTty && MaybePageOutput) {
++        RunInNewWindow(argv, argc, &SourceFileName);
++    }
++    if (DefinitelyNotTty) {
++        MaybePageOutput = 0;	/* Disable pager if I/O has been redirected */
++    }
++    return(0);
++}
++
++usage() {
++    fprintf(stderr, "Usage:  metamail [-b] [-B] [-d] [-e] [-h] [-r] [-R] [-p]  [-P] [-x] [-y] [-z] [-c content-type] [-E content-transfer-encoding] [-f from-name] [-m mailername] [-s subject] [message-file-name]\n");
++    ExitWithError(NULL);
++}
++
++RunInNewWindow(argv, argc, SourceFileNamePtr)
++char **argv, **SourceFileNamePtr;
++int argc;
++{
++    char *FullCmd, TmpName[TMPFILE_NAME_SIZE];
++    int i, createdfile=0;
++    if (!*SourceFileNamePtr) {
++        char *LineBuf;
++        FILE *fptmp;
++
++        LineBuf = malloc(LINE_BUF_SIZE);
++        if (!LineBuf) ExitWithError(nomem);
++        /* Create it, ugh.  Also needs to affect later command. */
++        MkTmpFileName(TmpName);
++        DeleteSourceFileWhenDone = 1;
++        fptmp = fopen(TmpName, WRITE_BINARY);
++        if (!fptmp) ExitWithError("Can't open temporary file\n");
++        while (fgets(LineBuf, LINE_BUF_SIZE, stdin)) {
++            fputs(LineBuf, fptmp);
++        }
++        free(LineBuf);
++        fclose(fptmp);
++        *SourceFileNamePtr = TmpName;
++        createdfile = 1;
++    }
++    FullCmd = malloc(CMDSIZE);
++    if (!FullCmd) ExitWithError(nomem);
++    if (TransparentMode) {
++        /* In transparent mode, we want to produce stdout that is what we get in, and do EVERYTHING externally in a terminal window.  This is to make the truly brain-dead mailers like mailtool happy. I am NOT happy about having to do this.  */
++        /* So, first we copy everything to stdout */
++        sprintf(FullCmd, CATTEMPLATE, *SourceFileNamePtr);
++        system(FullCmd); /* Cheesy way to do it */
++        fflush(stdout); fflush(stderr);
++    }
++    /* Then we run ourselves in a terminal window */
++    MailSummary = "Metamail"; /* for window label */
++    CreateNewWindowPrefix(FullCmd);
++    strcat(FullCmd, METAMAIL);
++    strcat(FullCmd, " -P ");
++    if (TransparentMode) strcat(FullCmd, "-T ");
++    for (i=1; i<argc; ++i) {
++        if (strncmp(argv[i], "-x", 2)
++             && strncmp(argv[i], "-B", 2)
++             && strncmp(argv[i], "-d", 2)) {
++            strcat(FullCmd, "\"");
++            strcat(FullCmd, argv[i]);
++            strcat(FullCmd, "\" ");
++        }
++    }
++    if (createdfile) {
++        strcat(FullCmd, "-z ");
++        strcat(FullCmd, *SourceFileNamePtr);
++    }
++    if (!MightAskBeforeExecuting) {
++        strcat(FullCmd, " -d ");
++        /* The special hack for -d is HORRIBLE, but xterm screws up with the -d option in the middle of the command line! */
++    }
++    if (DoInBackground) strcat(FullCmd, " &");
++    DefinitelyNotTty = 0;
++    SetUpEnvironment();
++    if (DoDebug) fprintf(stderr, "Executing %s\n", FullCmd);
++    fflush(stdout); fflush(stderr);
++#ifdef MSDOS
++    system(FullCmd);
++    exit(0);	/* system() returns random number under MS-DOS */
++#else
++    exit(system(FullCmd));
++#endif
++}
++
++/* Only one or the other set up builtins gets used,
++  depending on whether or not we're in the middle of 
++          a multipart/alternative body part */
++struct MailcapEntry BuiltIns[] = {
++    {"text/*", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
++    {NULL, NULL, NULL, 0, 0, 0}};
++
++struct MailcapEntry BuiltInsAlternative[] = {
++    {"text/plain", CATTEMPLATE, NULL, 0, 1, 0, "plain text", LPRTEMPLATE},
++    {NULL, NULL, NULL, 0, 0, 0}};
++
++ProcessMailcapFiles(SquirrelFile) 
++char *SquirrelFile;
++{
++    char *s, *pathcopy = NULL;
++#ifdef MICROSOFT
++    /* For the Microsoft compiler, we use the library function _searchenv
++     * to find the mailcap file.  It will search all the directories
++     * listed in the given environment variable (PATH in this case), then
++     * construct a path to the file if it finds it.
++     */
++    /* BOGUS -- this only finds the FIRST mailcap file, we want ALL mailcap files */
++    char path[128];
++
++    _searchenv("mailcap", "PATH", path);
++    if (path[0])
++        if (!ProcessMailcapFile(path, SquirrelFile)) return(0);
++    return(-1);
++#else /* MICROSOFT */
++#ifdef BORLAND
++    char *path = getenv("MAILCAPS");
++    if (!path)
++       path = STDPATH;
++#else /* BORLAND */
++#ifdef AMIGA
++    char *path = STDPATH;
++#else /* AMIGA */
++    char *path = getenv("MAILCAPS");
++    if (!path) {
++        int uid = getuid();
++        struct passwd *p;
++        p = getpwuid(uid);
++        if (p) path = malloc(5+strlen(p->pw_dir) + sizeof(STDPATH));
++        if (!p || !path) ExitWithError(nomem);
++        strcpy(path, p->pw_dir);
++        strcat(path, STDPATH);
++        pathcopy = path;
++    } else 
++#endif /* AMIGA */
++#endif /* BORLAND */
++    {
++        pathcopy = malloc(1+strlen(path));
++        if (!pathcopy) ExitWithError(nomem);
++        strcpy(pathcopy, path);
++        path = pathcopy;
++    }
++    while(path) {
++        s = index(path, PATH_SEPARATOR);
++        if (s) *s++ = 0;
++        if (!ProcessMailcapFile(path, SquirrelFile)) return(0);
++        path = s;
++    }
++    if (pathcopy) free(pathcopy);
++    return(-1);
++#endif /* MICROSOFT */
++}
++
++TryBuiltIns(SquirrelFile) 
++char *SquirrelFile;
++{
++    int i;
++    /* Last resort -- for sites that didn't bother putting a "text" line in their mailcap files... */
++    if (DoDebug) fprintf(stderr, "Looking for '%s' in built-in content-type handling settings.\n", ContentType);
++    for (i=0; BuiltIns[i].contenttype; ++i) {
++        if (!TryMailcapEntry(SquirrelFile ? BuiltInsAlternative[i] : BuiltIns[i], SquirrelFile))    return(0);
++    }
++    return(-1);
++}
++
++ProcessMailcapFile(file, SquirrelFile)
++char *file, *SquirrelFile;
++{
++    struct MailcapEntry mc;
++    FILE *fp;
++    int res;
++
++    res = IsDirectory(file);
++    if (res) {
++	if (res == 1) {
++	    fprintf(stderr, "Mailcap path entry '%s' is a directory, should be a readable file.\n", file);
++	} else if (DoDebug) {
++	/* Quietly ignore non-existent mailcap files unless debugging */
++	    fprintf(stderr, "Mailcap path entry '%s' does not exist.\n", file);
++	}
++	return(-1);
++    }
++    fp = fopen(file, "r");
++    if (DoDebug) fprintf(stderr, "Looking for '%s' in mailcap file '%s'.\n", ContentType, file);
++    while (fp && !feof(fp)) {
++        mc.needtofree = 0;
++	if (GetMailcapEntry(fp, &mc)) {
++            if (!TryMailcapEntry(mc, SquirrelFile)) {
++                fclose(fp);
++                return(0);
++            }
++	}
++    }
++    if (fp) fclose(fp);
++    return(-1);
++}
++
++static char *ThingsToSkip[] = {
++    "csh ",
++    "sh ",
++    "ksh ",
++    NULL
++};
++
++char *ShortCommand(progname)
++char *progname;
++{
++    int i;
++    char *s, *oldprogname;
++    static char FullProgName[500];
++
++eatmore:
++    while (*progname && (*progname == '(' || isspace((unsigned char) *progname))) {
++        ++progname;
++    }
++    oldprogname = progname;
++    for (i = 0; oldprogname == progname && ThingsToSkip[i]; ++i) {
++        if (!strncmp(progname, ThingsToSkip[i], strlen(ThingsToSkip[i]))) {
++            progname += strlen(ThingsToSkip[i]);
++        }
++    }
++    if (*progname == '-') {
++        ++progname;
++        while (*progname && !isspace((unsigned char) *progname)) ++progname;
++    }
++    if (progname != oldprogname) goto eatmore;
++    strcpy(FullProgName, progname);
++    s = index(FullProgName, ' ');
++    if (s) *s = 0;
++    s = rindex(FullProgName, '/');
++    if (s) {
++	return(s+1);
++    } else {
++	return(FullProgName);
++    }
++}    
++
++TryMailcapEntry(mc, SquirrelFile)
++struct MailcapEntry mc;
++char *SquirrelFile;
++{
++    StripTrailingSpace(mc.contenttype);
++    if (DoDebug) fprintf(stderr, "Trying mailcap entry for '%s'.\n", mc.contenttype);
++    if (PrintingMode && !mc.printcommand) return(-1);
++    if (CtypeMatch(ContentType, mc.contenttype) && PassesTest(&mc)) {
++        if (SquirrelFile) {
++            return(SaveSquirrelFile(SquirrelFile));
++        } else {
++            char TmpFileName[TMPFILE_NAME_SIZE];
++            MkTmpFileName(TmpFileName);
++            return(ExecuteMailcapEntry(mc, TmpFileName, ContentType));
++        }
++    }
++    if (mc.needtofree) {
++        free(mc.contenttype);
++        free(mc.command);
++    }
++    return(-1);
++}
++
++SaveSquirrelFile(SquirrelFile)
++char *SquirrelFile;
++{
++    int j;
++    FILE *outfp;
++
++    if (DoDebug) printf("saving to file %s\n", SquirrelFile);
++
++    outfp = fopen(SquirrelFile, WRITE_BINARY);
++    if (!outfp) {
++        fprintf(stderr, "Cannot open %s to squirrel away a portion of a multipart/alternative\n", SquirrelFile);
++        return(-1);
++    }
++    fprintf(outfp, "Content-type: %s", ContentType);
++    for (j=0; j<CParamsUsed; ++j) {
++        fprintf(outfp, " ; ");
++        fprintf(outfp, CParams[j]);
++        fprintf(outfp, " = ");
++        fprintf(outfp, CParamValues[j]);
++    }
++    fprintf(outfp, "\n\n"); 
++    TranslateInputToOutput(InputFP, outfp, EncodingCode, ContentType);
++    if (fclose(outfp)) {
++        ExitWithError("fclose failed");
++    }
++    return(0);
++}
++
++ExecuteMailcapEntry(mc, TmpFileName, ThisContentType)
++char *TmpFileName, *ThisContentType;
++struct MailcapEntry mc;
++{
++    int resultcode=0, DidExecute, UsedTmpFileName;
++    struct part *PartsWritten=NULL;
++    char *s, *cmd;
++
++    cmd = malloc(CMDSIZE);
++    if (!cmd) ExitWithError(nomem);
++    if (PrintingMode && !mc.printcommand) return(-1);
++    BuildCommand(cmd, PrintingMode ? mc.printcommand : mc.command, TmpFileName, &UsedTmpFileName, &PartsWritten);
++    if (DoDebug) fprintf(stderr, "Match!  Built command %s.\n", cmd);
++    if (mc.copiousoutput && MaybePageOutput) {
++        strcat(cmd, " | ");
++        s = getenv("METAMAIL_PAGER");
++        if (s && strncmp(s, "metamail", 8)) {
++            /* If METAMAIL_PAGER is set to "metamail" we override it */
++            strcat(cmd, s);
++#ifndef AMIGA
++            if (!strncmp(s, "less", 4) && strncmp(s+5, "-r", 2)) {
++                fprintf(stderr, "Warning:  'less' without '-r' behaves badly for some mail types,\n\tnotably richtext.\n");
++            }
++#endif
++        } else {
++            strcat(cmd, "more");
++        }
++    }
++    if (!DefinitelyNotTty) {
++        SaveTtyState();
++    }
++    if (!NeedToAskBeforeExecuting(ThisContentType)
++         || OKToRun(ThisContentType, cmd, mc.label)) {
++        char *FullCmd;
++        int ReallyNotTty;
++#ifndef NO_RLIMITS
++        /* Limit size of core dumps */
++        struct rlimit rlp;
++
++        rlp.rlim_cur = 0;
++        rlp.rlim_max = 0;
++        setrlimit(RLIMIT_CORE, &rlp); 
++#endif
++        FullCmd = malloc(CMDSIZE);
++        if (!FullCmd) ExitWithError(nomem);
++        ReallyNotTty = DefinitelyNotTty;
++        if (mc.needsterminal
++             && DefinitelyNotTty) {
++            int j;
++            sprintf(cmd, " %s -P -b -c '%s", METAMAIL, ThisContentType);
++            for (j=0; j<CParamsUsed; ++j) {
++                strcat(cmd, " ; ");
++                strcatquoting(cmd, CParams[j]);
++                strcat(cmd, " = ");
++                strcatquoting(cmd, CParamValues[j]);
++            }
++            strcat(cmd, "' ");
++            strcat(cmd, TmpFileName);
++            CreateNewWindowPrefix(FullCmd);
++            strcat(FullCmd, cmd);
++            DefinitelyNotTty = 0; /* For recursive call */
++        } else {
++            strcpy(FullCmd, cmd);
++        }
++        DidExecute = 0;
++        if (UsedTmpFileName || PartsWritten) {
++            int isempty;
++            if (PartsWritten) {
++                isempty = 0;
++            } else {
++                isempty = WriteTmpFile(TmpFileName, ThisContentType);
++            }
++            if (!isempty || strncmp(ThisContentType, "text", 4)) {
++                if (DoInBackground && !PartsWritten && !mc.needsterminal) {
++#ifdef AMIGA
++                    char TmpCmd[80], TmpScriptName[40];
++                    sprintf(TmpCmd, "run execRmScript %s",
++                            MkRmScript(FullCmd, TmpFileName, TmpScriptName));
++#else
++                    char TmpCmd[CMDSIZE];
++                    sprintf(TmpCmd, "(%s; rm %s) &", FullCmd, TmpFileName);
++#endif
++                    DefinitelyNotTty = 1; /* in background */
++                    SetUpEnvironment();
++                    resultcode = ExecuteCommand(TmpCmd, 1);
++                    ++DidExecute;
++                } else {
++                    SetUpEnvironment();
++                    resultcode = ExecuteCommand(FullCmd, 1);
++                    unlink(TmpFileName);
++                    ++DidExecute;
++                }
++            } else { /* empty text part, hack to not say "more" */
++                unlink(TmpFileName);
++            }
++        } else {
++            FILE *tmpfp;
++            SetUpEnvironment();
++            (void) ExecuteCommand(FullCmd, 0);
++            tmpfp = popen(FullCmd, WRITE_BINARY);
++            TranslateInputToOutput(InputFP, tmpfp, EncodingCode, ThisContentType);
++            resultcode = tmpfp ? pclose(tmpfp) : -1;
++            ++DidExecute;
++        }
++        DefinitelyNotTty = ReallyNotTty;
++        if (!DefinitelyNotTty && DidExecute) {
++            RestoreTtyState();
++            if (mc.copiousoutput && MaybePageOutput && BoundaryCt > 0) PauseForUser();
++        }
++        if (!resultcode) {
++            free(FullCmd);
++        } else {
++            fprintf(stderr, "Command failed: %s\n", FullCmd);
++            if (MaybePageOutput && BoundaryCt > 0) PauseForUser();
++            ++ProcessingErrors;
++        }
++    } else {
++        /* user does not want to execute command */
++        if (!DefinitelyNotTty) {
++            RestoreTtyState();
++        }
++        if (DoDebug) fprintf(stderr, "Not executing command.\n");
++        if (!PartsWritten) ConsumeRestOfPart(NULL);
++    }
++    if (PartsWritten) {
++        struct part *tp;
++        char HeadFile[MAX_FILE_NAME_SIZE];
++
++        while (PartsWritten) {
++            tp=PartsWritten->next;
++            free(PartsWritten->ctype);
++            strcpy(HeadFile, PartsWritten->fname);
++            strcat(HeadFile, "H");
++            unlink(HeadFile);
++            unlink(PartsWritten->fname);
++            free(PartsWritten->fname);
++            free(PartsWritten);
++            PartsWritten=tp;
++        }
++    }
++    if (!DefinitelyNotTty) {
++        RestoreTtyState();
++    }
++    free(cmd);
++    return(0);
++}
++
++PassesTest(mc)
++struct MailcapEntry *mc;
++{
++    int result;
++    char *cmd, TmpFileName[TMPFILE_NAME_SIZE];
++
++    if (!mc->testcommand) return(1);
++    MkTmpFileName(TmpFileName);
++    cmd = malloc(CMDSIZE);
++    if (!cmd) ExitWithError(nomem);
++    BuildCommand(cmd, mc->testcommand, TmpFileName, NULL, NULL);
++    if (DoDebug) printf("Executing test command: %s\n", cmd);
++    result = system(cmd);
++#ifdef MSDOS
++    result = 0;	    /* system doesn't return a valid exit code on MS-DOS */
++                    /* note that this makes the test feature useless... */
++#endif
++    free(cmd);
++    return(!result);
++}
++
++char *
++GetCommand(s, t)
++char *s, **t;
++{
++    char *s2;
++    int quoted = 0;
++    s2 = malloc(strlen(s)*2+1); /* absolute max, if all % signs */
++    if (!s2) ExitWithError(nomem);
++    *t = s2;
++    while (s && *s) {
++	if (quoted) {
++            if (*s == '%') *s2++ = '%'; /* Quote through next level, ugh! */
++
++            *s2++ = *s++;
++	    quoted = 0;
++	} else {
++	    if (*s == ';') {
++                *s2 = 0;
++		return(++s);
++	    }
++	    if (*s == '\\') {
++		quoted = 1;
++		++s;
++	    } else {
++		*s2++ = *s++;
++	    }
++	}
++    }
++    *s2 = 0;
++    return(NULL);
++}	
++
++GetMailcapEntry(fp, mc)
++FILE *fp;
++struct MailcapEntry *mc;
++{
++    int rawentryalloc = 2000, len;
++    char *rawentry, *s, *t, *LineBuf;
++
++    LineBuf = malloc(LINE_BUF_SIZE);
++    if (!LineBuf) ExitWithError(nomem);
++    rawentry = malloc(1 + rawentryalloc);
++    if (!rawentry) ExitWithError(nomem);
++    *rawentry = 0;
++    while (fgets(LineBuf, LINE_BUF_SIZE, fp)) {
++	if (LineBuf[0] == '#') continue;
++        len = strlen(LineBuf);
++        if (len == 0) continue;
++        if (LineBuf[len-1] == '\n') LineBuf[--len] = 0;
++	if ((len + strlen(rawentry)) > rawentryalloc) {
++	    rawentryalloc += 2000;
++	    rawentry = realloc(rawentry, rawentryalloc+1);
++	    if (!rawentry) ExitWithError(nomem);
++	}
++	if (LineBuf[len-1] == '\\') {
++            LineBuf[len-1] = 0;
++	    strcat(rawentry, LineBuf);
++	} else {
++	    strcat(rawentry, LineBuf);
++	    break;
++	}
++    }
++    free(LineBuf);
++    for (s=rawentry; *s && isspace((unsigned char) *s); ++s) ;
++    if (!*s) {
++	/* totally blank entry -- quietly ignore */
++	free(rawentry);
++	return(0);
++    }
++    s = index(rawentry, ';');
++    if (!s) {
++	fprintf(stderr, "metamail: Ignoring invalid mailcap entry: %s\n", rawentry);
++	free(rawentry);
++	return(0);
++    }
++    *s++ = 0;
++    mc->needsterminal = 0;
++    mc->copiousoutput = 0;
++    mc->needtofree = 1;
++    mc->testcommand = NULL;
++    mc->label = NULL;
++    mc->printcommand = NULL;
++    mc->contenttype = malloc(1+strlen(rawentry));
++    if (!mc->contenttype) ExitWithError(nomem);
++    strcpy(mc->contenttype, rawentry);
++    t = GetCommand(s, &mc->command);
++    if (!t) {
++        free(rawentry);
++        return(1);
++    }
++    while (s && *s && isspace((unsigned char) *s)) ++s;
++    s = t;
++    while (s) {
++	char *arg, *eq;
++
++        t = GetCommand(s, &arg);
++/*        if (t) *t++ = 0; */
++        eq = index(arg, '=');
++        if (eq) *eq++ = 0;
++	if (*arg) {
++	    arg = Cleanse(arg);
++	    if (!strcmp(arg, "needsterminal")) {
++		mc->needsterminal = 1;
++	    } else if (!strcmp(arg, "copiousoutput")) {
++		mc->copiousoutput = 1;
++	    } else if (eq && !strcmp(arg, "test")) {
++		mc->testcommand = eq;
++	    } else if (eq && !strcmp(arg, "description")) {
++		mc->label = eq;
++	    } else if (eq && !strcmp(arg, "label")) { 
++		mc->label = eq; /* bogus old name for description */
++	    } else if (eq && !strcmp(arg, "print")) {
++		mc->printcommand = eq;
++	    } else if (eq && !strcmp(arg, "textualnewlines")) {
++		ExceptionalNewline(mc->contenttype, atoi(eq));
++	    } else if (strcmp(arg, "notes")) { /* IGNORE notes field */
++		if (*arg && DoDebug) fprintf(stderr, "metamail: Ignoring mailcap flag: %s\n", arg);
++	    }
++	}
++	s = t;
++    }
++    free(rawentry);
++    return(1);
++}
++
++ExitWithError(txt)
++char *txt;
++{
++    if (txt) fprintf(stderr, "metamail: %s\n", txt);
++    exit(-1);
++}
++
++char *
++FreshHeaderCopy(s)
++char *s;
++{
++    char *t, *newcopy;
++    int len;
++
++    while (s && *s && isspace((unsigned char) *s) && *s != '\n') ++s;
++    t = index(s, '\n');
++    while (t && (*(t+1) == ' ' || *(t+1) == '\t')) {
++        t = index(t+1, '\n');
++    }
++    len = t ? (t-s+1) : (strlen(s)+1);
++    newcopy = malloc(len+3);/* two extra bytes for a bizarre bug caused by the fact that FindParam calls FreshHeaderCopy and sometimes tacks on "--". */
++    if (!newcopy) ExitWithError(nomem);
++    strncpy(newcopy, s, len);
++    newcopy[len] = 0;
++    return(newcopy);
++}
++
++Read822Prefix(PrintHeads, nestingdepth)
++int PrintHeads, nestingdepth;
++{
++    int SawNewline = 1, bytes = 0, alloced = 1000, HasEncodedChars=0;
++    int c, oldbytes;
++    char *s, *t, *tmp;
++
++    if (!PrintSomeHeaders) PrintHeads = 0;
++    mailheaders = malloc(alloced+1);
++    if (!mailheaders) ExitWithError(nomem);
++    strcpy(mailheaders, "MM_HEADERS=\n");
++    bytes = 12;
++yankagain:
++    t = mailheaders + bytes;
++    oldbytes = bytes-1; /* a hack for YankMode */
++    while ((c = getc(InputFP)) != EOF) {
++        if (++bytes >= alloced) {
++            alloced += 1000;
++            mailheaders = realloc(mailheaders, alloced);
++            if (!mailheaders) ExitWithError(nomem);
++            t = mailheaders + bytes - 1;
++        }
++        if (c == '\n') {
++            if (SawNewline) break;
++            SawNewline = 1;
++        } else SawNewline = 0;
++        *t++ = c;
++    }
++    *t = 0;
++    --bytes;
++    if (c == EOF) {
++	if (nestingdepth) {
++	    fprintf(stderr, "metamail: Incomplete multipart message -- unexpected EOF\n");
++/*            exit(ProcessingErrors); */
++        } else {
++            if (YankMode) {
++/*                ExitWithError("Could not extract a MIME message from the  body\n"); */
++		fprintf(stderr, "metamail: Could not extract a MIME message from the body\n");
++            } else {
++		fprintf(stderr, "metamail: Could not find end of mail headers.\n");
++/*                ExitWithError("Could not find end of mail headers"); */
++            }
++	}
++	BoundaryCt=0;
++	return -1;
++    }
++    for (s=mailheaders+oldbytes; *s; ++s) {
++        if (*s == '\n' && (*(s+1) != ' ') && (*(s+1) != '\t')) {
++	    if (!ContentType && !lc2strncmp(s, "\ncontent-type:", 14)) {
++		char *dum;
++                ContentType = FreshHeaderCopy(s+14);
++		/* Eliminate white space embedded in content-type */
++		while (1) {
++		    dum = index(ContentType, '/');
++		    if (!dum) break;
++		    if (isspace(*(dum-1))) {
++			for (--dum; *dum; ++dum) {
++			    *dum = *(dum+1);
++			}
++		    } else if (isspace(*++dum)) {
++			for ( ; *dum; ++dum) {
++			    *dum = *(dum+1);
++			}
++		    } else {
++			break;
++		    }
++		}
++                StripTrailingSpace(ContentType);
++                ParseContentParameters(ContentType);
++                if (PrintHeads) maybephead(s+1);
++            } else if (!ContentEncoding && !lc2strncmp(s, "\ncontent-transfer-encoding:", 27)) {
++                ContentEncoding = FreshHeaderCopy(s+27);
++                if (PrintHeads) maybephead(s+1);
++            } else if (!lc2strncmp(s, "\nsubject:", 9)) {
++                if (PrintHeads) maybephead(s+1);
++                MailSubject = FreshHeaderCopy(s+9);
++            } else if (!lc2strncmp(s, "\nfrom:", 6)) {
++                if (PrintHeads) maybephead(s+1);
++                MailFrom = FreshHeaderCopy(s+6);
++            } else if (!lc2strncmp(s, "\ncontent-description:", 4)) {
++                if(PrintHeads) maybephead(s+1);
++                MailSubject = FreshHeaderCopy(s+21);
++            } else {
++                /* Print any with encoded variables */
++                char *dum = s;
++                while (dum) {
++                    dum = index(dum, '?');
++                    if (dum && *++dum == '=') break;
++                }
++                if (dum) {
++                    char *nl = s+1;
++                    while (nl) {
++                        nl = index(nl, '\n');
++                        if (nl && !isspace((unsigned char) *++nl)) break;
++                    }
++                    if (nl && nl > dum) ++HasEncodedChars;
++                }
++                if (HasEncodedChars) {
++                    phead(s+1);
++                } else if (PrintHeads) {
++                    maybephead(s+1);
++                }
++            }
++        }
++    }
++    /* Ugly, but effective */
++    if (YankMode && !ContentType) {
++        goto yankagain;
++    }
++    if (PrintHeads) printf("\n");
++    if (!ContentType) {
++        ContentType = "text/plain";
++        CParamsUsed=0;
++    }
++    for (tmp=ContentType; *tmp; ++tmp) {
++        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++    }
++    return 0;
++}
++
++PrepareMessage() {
++    int c;
++
++    EncodingCode = ENCODING_NONE;
++    if (ContentEncoding) {
++        /* strip leading white space */
++        while (*ContentEncoding && isspace((unsigned char) *ContentEncoding)) ++ContentEncoding;
++        StripTrailingSpace(ContentEncoding);
++        if (!lc2strcmp(ContentEncoding, "base64")) {
++            EncodingCode = ENCODING_BASE64;
++        } else if (!lc2strcmp(ContentEncoding, "quoted-printable")) {
++            EncodingCode = ENCODING_QUOTEDPRINTABLE;
++        } else if (!lc2strncmp (ContentEncoding, "x-uue", 5)) {
++            fprintf (stderr, "WARNING:  Using nonstandard %s encoding, trying uuencode algorithm.\n", ContentEncoding);
++ 	    EncodingCode = ENCODING_UUENCODE;
++        } else {
++            if (lc2strcmp(ContentEncoding, "none")
++                 && !lc2strcmp(ContentEncoding, "8bit")
++                 && !lc2strcmp(ContentEncoding, "7bit")) {
++                fprintf(stderr, "Ignoring unrecognized Content-Transfer-Encoding value: %s\n", ContentEncoding);
++            }
++        }
++    }
++    if (EatLeadingNewlines) {
++        while ((c = getc(InputFP)) != EOF) {
++            if (c != '\n') {
++                ungetc(c, InputFP);
++                break;
++            }
++        }
++    }
++    SetUpEnvironment();  
++}
++
++SetUpEnvironment() { 
++    int i, j, environsize;
++    char **newenviron, *mailervar, *summaryvar, *ctypevar, *s;
++    static char ttyenv[15], debugenv[15], *noaskenv, pagerenv[15], *quietenv, rootenv[25];
++
++#if !defined(AMIGA) && !defined(MSDOS)
++    /* Hack to make the code look similar for unix & dos */
++#define putenv(var)        newenviron[i++] = var;
++    for (environsize=0; environ[environsize]; ++environsize) {
++	;
++    }
++    newenviron = (char **) malloc(sizeof(char *) * (17+environsize));
++    if (!newenviron) ExitWithError(nomem);
++#endif
++    mailervar = malloc(13+strlen(MailerName));
++    if (!mailervar) ExitWithError(nomem);
++    sprintf(mailervar, "MM_MAILER=%s", MailerName);
++    summaryvar = malloc(26 + strlen(MailFrom) + strlen(MailSubject));
++    if (!summaryvar) ExitWithError(nomem);
++    sprintf(summaryvar, "MM_SUMMARY=%s (from %s)", MailSubject, MailFrom);
++    MailSummary = summaryvar+11;
++    EliminateNastyChars(MailSummary);
++    i = 0;
++    if (ContentType) {
++        int ctypelen = 22+strlen(ContentType);
++        for (j=0; j<CParamsUsed; ++j) {
++            ctypelen += 6 + strlen(CParams[j]) + strlen(CParamValues[j]);
++        }
++        ctypevar = malloc(ctypelen);
++        if (!ctypevar) ExitWithError(nomem);
++        for (s=ContentType; *s; ++s) {
++            if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
++        }
++        while (isspace((unsigned char) *--s)) *s = 0;
++        sprintf(ctypevar, "MM_CONTENTTYPE=%s", ContentType);
++        for (j=0; j<CParamsUsed; ++j) {
++            strcat(ctypevar, " ; ");
++            strcat(ctypevar, CParams[j]);
++            strcat(ctypevar, " = ");
++            strcat(ctypevar, CParamValues[j]);
++        }
++        putenv(ctypevar);
++    }
++    putenv(mailheaders ? mailheaders : "MM_HEADERS=unknown");
++    putenv(mailervar);
++    putenv(summaryvar);
++    sprintf(ttyenv, "MM_NOTTTY=%d", DefinitelyNotTty);
++    putenv(ttyenv);
++    sprintf(debugenv, "MM_DEBUG=%d", DoDebug);
++    putenv(debugenv);
++    s = getenv("MM_QUIET");
++    if (!s) s = QuietDefault;
++    quietenv = malloc(15 + strlen(s));
++    if (!quietenv) ExitWithError(nomem);
++    if (Quiet) {
++        strcpy(quietenv, "MM_QUIET=1");
++    } else {
++        sprintf(quietenv, "MM_QUIET=%s", s);
++    }
++    putenv(quietenv);
++    s = getenv("MM_NOASK");
++    if (!s) s = NoAskDefault;
++    noaskenv = malloc(15 + strlen(s));
++    if (!noaskenv) ExitWithError(nomem);
++    if (MightAskBeforeExecuting) {
++        sprintf(noaskenv, "MM_NOASK=%s", s);
++    } else {
++        strcpy(noaskenv, "MM_NOASK=1");
++    }
++    putenv(noaskenv);
++    s = getenv("MM_RUNASROOT");
++    if (!s) s = "0";
++    sprintf(rootenv, "MM_RUNASROOT=%s", s);
++    putenv(rootenv);
++    sprintf(pagerenv, "MM_USEPAGER=%d", MaybePageOutput);
++    putenv(pagerenv);
++#if !defined(AMIGA) && !defined(MSDOS)
++    for (j=0; j<environsize; ++j) {
++        if (strncmp(environ[j], "MM_", 3) || !strncmp(environ[j], "MM_CHARSET", 10)) {
++            putenv(environ[j]);
++        }
++    }
++    newenviron[i] = NULL;
++    environ = newenviron;
++    if (DoDebug) {
++        printf("Here is the environment:\n\n");
++        system("printenv");
++    }
++#endif
++}
++
++
++#ifdef AMIGA
++int
++putenv(def)
++char *def;
++{
++    char *cp;
++    char nameBuf[100];
++    FILE *envFile;
++
++    if ((cp = index(def, '=')) == NULL || def == cp) {
++        return(1);
++    }
++
++    strcpy(nameBuf, "ENV:");
++    strncat(nameBuf, def, cp - def);
++    nameBuf[(cp - def) + 4] = 0;
++    cp++;               /* Now points to value part of environment string. */
++
++    if ((envFile = fopen(nameBuf, "w")) == NULL) {
++        return(2);
++    }
++
++    fputs(cp, envFile);
++    fclose(envFile);
++
++    return(0);
++}
++#endif
++
++OKToRun(ctype, progname, label)
++char *ctype, *progname, *label;
++{
++    char AnsBuf[100], *s;
++
++    if (DoInBackground) return(1);
++    if (DefinitelyNotTty || MustNotBeTty) return(1);
++    while (1) {
++        printf("\n");
++        if (label) {
++            printf("This message contains %s.\nDo you want to view it using the '%s' command (y/n) [y] ? ", label, ShortCommand(progname));
++        } else {
++            printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
++        }
++        s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
++        if (!s) return(0); /* EOF */
++	while (s && *s && isspace((unsigned char) *s)) ++s;
++	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
++	if (*s == 'n' || *s == 'N' || *s == 'q' || *s == 'Q') {
++	    return(0);
++	}
++	printf("Please answer yes or no.\n");
++    }
++}
++
++EliminateNastyChars(s)
++char *s;
++{
++    if (s) for( ; *s ;++s) {
++        if (isalnum((unsigned char) *s)) continue;
++	if (index(" ,.;:/?\\|[]{}()*&^%#@-_=+~<>\"", *s)) continue;
++	if (*s == '\'' || *s == '`') {
++	    *s = '"';
++	} else {
++	    *s = ' ';
++	}
++    }
++}
++
++StripTrailingSpace(s)
++char *s;
++{
++    char *t = s+strlen(s) -1;
++    while (isspace((unsigned char) *t) && (t >= s)) *t-- = 0;
++}
++
++static char *KeyHeads=NULL;
++static char **KeyHeadList;
++static int KeyKeep = 0;
++
++void setKeyHeads()
++{
++    char *s;
++    int numkeys = 0;
++
++    if ((KeyHeads = getenv("KEYHEADS")) != 0) {
++        for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
++    } else if ((KeyHeads = getenv("KEYIGNHEADS")) != 0) {
++	for (s=KeyHeads;*s;++s) if (isupper((unsigned char) *s)) *s=tolower((unsigned char) *s);
++	KeyKeep = 1;
++    } else {
++	static char khtmp[] = "to:cc:subject:from:content-description:date";
++	KeyHeads = khtmp;
++    }
++    for (s=KeyHeads; *s; ++s) if (*s == ':') ++numkeys;
++    numkeys += 2;
++    KeyHeadList = (char **) malloc((numkeys) * sizeof(char *));
++    if (!KeyHeadList) ExitWithError(nomem);
++    numkeys = 0;
++    KeyHeadList[0] = KeyHeads;
++    for(s=KeyHeads; *s; ++s) {
++	if (*s == ':') {
++	    *s = '\0';
++	    KeyHeadList[++numkeys] = s+1;
++	}
++    }
++    KeyHeadList[++numkeys] = NULL;
++}
++
++/* find the first colon in a header line which appears before any spaces or control characters */
++char *
++findcolon(hdr)
++char *hdr;
++{
++    while (*hdr && !isspace(*hdr) && !iscntrl(*hdr))
++	if (*hdr == ':') return hdr;
++	else hdr++;
++    return 0;
++}
++
++/* check the header given to see if it matches any in the KeyHeadList */
++maybephead(hdr)
++char *hdr;
++{
++    char *s;
++    int numkeys=0;
++
++    if (!KeyHeads) setKeyHeads();
++
++    s = findcolon(hdr);
++    if (s) {
++	int len = s - hdr;
++        for (numkeys=0; KeyHeadList[numkeys]; ++numkeys) {
++            if (!strcmp(KeyHeadList[numkeys], "*")
++                 || !lc2strncmp(hdr, KeyHeadList[numkeys], len)) {
++		if (!KeyKeep) phead(hdr);
++		return;
++            }
++        }
++	if (KeyKeep) phead(hdr);
++	return;
++    }
++    if (!strncmp(hdr, "From ", 5) || !strncmp(hdr, ">From ", 6)) {
++	for (numkeys = 0; KeyHeadList[numkeys]; ++numkeys) {
++	    if (!strcmp(KeyHeadList[numkeys], "*")
++		 || !lc2strncmp(">from", KeyHeadList[numkeys], 5)) {
++		if (!KeyKeep) phead(hdr);
++		return;
++	    }
++	}
++	if (KeyKeep) phead(hdr);
++    }
++}
++
++/* This next routine prints out a mail header, and needs to deal with the new extended charset headers. */
++phead(s)
++char *s;
++{
++    char *t = s;
++
++    while (1) {
++	t = index(t, '\n');
++	if (!t) break;
++        if (!isspace((unsigned char) *(t+1))) {
++            *t = 0;
++	    break;
++	} else ++t;
++    }
++    PrintHeader(s, 1);
++    printf("\n");
++    if (t) *t = '\n';
++}
++
++static char PrevCharset[100] = "us-ascii";
++
++/* This is the part that actually handles the charset issues */
++void PrintHeader(s, ShowLeadingWhitespace)
++char *s;
++int ShowLeadingWhitespace;
++{
++    char *charset, *encoding, *txt, *txtend, TmpFile[TMPFILE_NAME_SIZE];
++    int ecode = ENCODING_NONE, CorrectedCharset = 0;
++    FILE *fp;
++
++    while (*s && (*s != '=')) {
++        if (isspace((unsigned char) *s)) {
++            if (ShowLeadingWhitespace) {
++                putchar(' ');
++            }
++        } else {
++            putchar(*s);
++            if (!CorrectedCharset) {
++                CorrectedCharset = 1;
++                strcpy(PrevCharset, "us-ascii");
++            }
++        }
++        if (!ShowLeadingWhitespace) {
++            /* Only at most one leading space is ignored */
++            ShowLeadingWhitespace = 1;
++        }
++        ++s;
++    }
++    if (!*s) return;
++    if (*(s+1) != '?') {
++        putchar('=');
++        PrintHeader(++s, 1);
++        return;
++    }
++    charset = s+2;
++    encoding = index(charset, '?');
++    if (!encoding) {
++        putchar('=');
++        PrintHeader(++s,1);
++        return;
++    }
++    txt = index(encoding+1, '?');
++    if (!txt) {
++        putchar('=');
++        PrintHeader(++s, 1);
++        return;
++    }
++    txtend = txt;
++    do {
++        txtend = index(txtend+1, '?');
++    } while(txtend && (*(txtend+1) != '='));
++    if (!txtend) {
++        putchar('=');
++        PrintHeader(++s, 1);
++    }
++    /* Proper parse! Ready to dissect... */
++    *encoding = 0;
++    *txt = 0;
++    *txtend = 0;
++    if ((*(encoding+1) == 'q') || (*(encoding+1) == 'Q')) {
++        ecode = ENCODING_QUOTEDPRINTABLE;
++    } else if ((*(encoding+1) == 'b') || (*(encoding+1) == 'B')) {
++        ecode = ENCODING_BASE64;
++    } else {
++        fprintf(stderr, "Bad encoding value in non-ASCII header string: %s\n", encoding+1);
++    }
++    if (lc2strcmp(charset, PrevCharset)) {
++        char *s2, *charsetinuse;
++
++        strcpy(PrevCharset, charset);
++        for (s2=PrevCharset; *s2; ++s2) {
++            if (isupper((unsigned char) *s2)) *s2 = tolower((unsigned char) *s2);
++        }
++        charsetinuse = getenv("MM_CHARSET");
++        if (!charsetinuse || lc2strcmp(charsetinuse, PrevCharset)) {
++            printf("[** %s charset **] ", charset);
++        }
++    }
++    if (ecode == ENCODING_NONE) {
++        printf(txt+1);
++    } else {
++        /* What follows is REALLY bogus, but all my encoding stuff is pipe-oriented right now... */
++        MkTmpFileName(TmpFile);
++        fp = fopen(TmpFile, WRITE_BINARY);
++        if (!fp) {
++            fprintf(stderr, "Could not open temporary file\n");
++        } else {
++            char *t;
++            for (t=txt+1; *t; ++t) {
++                if (*t == '_') {
++                    putc(' ', fp);
++                } else if (*t == '\n') {
++                    putc(' ', fp);
++                } else {
++                    putc(*t, fp);
++                }
++            }
++            fclose(fp);
++            fp = fopen(TmpFile, "r");
++            if (!fp) {
++                fprintf(stderr, "Could not open temporary file\n");
++            } else {
++                TranslateInputToOutput(fp, stdout, ecode, "text");
++                fclose(fp);
++            }
++            unlink(TmpFile);
++        }
++    }
++    *encoding = '?';
++    *txt = '?';
++    *txtend = '?';
++    PrintHeader(txtend + 2, 0);
++}
++
++BuildCommand(Buf, controlstring, TmpFileName, UsedTmpFileName, PartsWritten)
++char *Buf, *controlstring, *TmpFileName;
++int *UsedTmpFileName;
++struct part **PartsWritten;
++{
++    char *from, *to, *s, *p, *tmp;
++    int prefixed = 0, UsedBigFile=0, UsedLittleFiles=0, numparts=0;
++    struct part *firstpart=NULL, *thispart=NULL, *tmppart=NULL;
++
++    if (UsedTmpFileName) *UsedTmpFileName = 0;
++    if (PartsWritten) *PartsWritten = NULL;
++    for (from=controlstring, to=Buf; *from; ++from) {
++        if (prefixed) {
++            prefixed = 0;
++            switch(*from) {
++                case '%':
++                    *to++ = '%';
++                    break;
++                case 'n':
++                case 'F':
++		    if (!PartsWritten) {
++			fprintf(stderr, "metamail: Bad mailcap \"test\" clause: %s\n", controlstring);
++			ExitWithError("%%n and %%F may not be used in \"test\" clauses.  Execution terminated.");
++		    }
++                    if (UsedBigFile) {
++                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
++                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
++                    }
++                    if (!UsedLittleFiles) {
++                        /* Set up parts */
++                        char *LineBuf, *boundary, TmpFileNameBuf[TMPFILE_NAME_SIZE];
++                        char *oldct, *oldce, *newct;
++                        int currct, boundarylen, newctlen, j;
++                        int oldcparmsused, oldcparamsalloced;
++                        char **oldcparams, **oldcparamvalues;
++                        FILE *headfp;
++
++                        LineBuf = malloc(LINE_BUF_SIZE);
++                        if (!LineBuf) ExitWithError(nomem);
++                        boundary = FindParam("boundary");
++			if (!boundary) {
++			    fprintf(stderr, "Bad message format: This multipart message has no boundary parameter,\n");
++			    fprintf(stderr, "but the mailcap entry for %s uses %%F or %%n.\n\n", ContentType);
++			    ExitWithError("A change to the mailcap file might make this message viewable.");
++                        }
++                        if (boundary[0] == '"') {
++                            boundary=UnquoteString(boundary);
++                        }
++                        sprintf(LineBuf, "--%s", boundary);
++                        strcpy(boundary, LineBuf);
++                        boundarylen = strlen(boundary);
++                        if (BoundaryCt >= BoundaryAlloc) {
++                            BoundaryAlloc += 5;
++                            if (Boundaries) {
++                                Boundaries = (char **) realloc(Boundaries, BoundaryAlloc*sizeof(char *));
++                            } else {
++                                Boundaries = (char **) malloc(BoundaryAlloc*sizeof(char *));
++                            }
++                            if (!Boundaries) ExitWithError(nomem);
++                        }
++                        Boundaries[BoundaryCt++] = boundary;
++                        while (fgets(LineBuf, LINE_BUF_SIZE, InputFP)) { /* find start */
++                            if (!strncmp(LineBuf, boundary, boundarylen)
++                                 && ((LineBuf[boundarylen] == '\n')
++                                      || (LineBuf[boundarylen] == '-'
++                                           && LineBuf[boundarylen+1] == '-'
++                                           && LineBuf[boundarylen+2] == '\n'))) {
++                                break;
++                            }
++                        }
++                        free(LineBuf);
++                        currct = BoundaryCt;
++                        oldct=ContentType;
++                        oldce=ContentEncoding;
++                        oldcparmsused = CParamsUsed;
++                        oldcparamsalloced = CParamsAlloced;
++                        oldcparams = CParams;
++                        oldcparamvalues = CParamValues;
++                        CParams = NULL;
++                        CParamValues = NULL;
++                        CParamsUsed = 0;
++                        CParamsAlloced = 0;
++                        while(currct == BoundaryCt) {
++                            tmppart = (struct part *) malloc(sizeof(struct part));
++                            if (!tmppart) ExitWithError(nomem);
++                            if (firstpart) {
++                                thispart->next = tmppart;
++                                thispart = tmppart;
++                            } else {
++                                firstpart = thispart = tmppart;
++                            }
++                            tmppart->next = NULL;
++                            ContentType=NULL;
++                            ContentEncoding=NULL;
++                            Read822Prefix(0,0);
++                            PrepareMessage();
++                            newctlen=5+strlen(ContentType);
++                            for (j=0; j<CParamsUsed; ++j) {
++                                newctlen += 11+strlen(CParams[j]) + strlen(CParamValues[j]);
++                            }
++                            newct= malloc(newctlen);
++                            if (!newct) ExitWithError(nomem);
++                            strcpy(newct, "'");
++                            strcat(newct, ContentType);
++                            for (j=0; j<CParamsUsed; ++j) {
++                                strcat(newct, "; ");
++                                strcat(newct, CParams[j]);
++                                if (CParamValues[j][0] == '\"') {
++                                    strcat(newct, " = ");
++                                    strcat(newct, CParamValues[j]);
++                                } else {
++                                    strcat(newct, " = \"");
++                                    strcat(newct, CParamValues[j]);
++                                    strcat(newct, "\"");
++                                }
++                            }
++                            strcat(newct, "'");
++                            thispart->ctype = newct;
++                            MkTmpFileName(TmpFileNameBuf);
++                            thispart->fname = malloc(1+strlen(TmpFileNameBuf));
++                            if (!thispart->fname) ExitWithError(nomem);
++                            strcpy(thispart->fname, TmpFileNameBuf);
++                            WriteTmpFile(thispart->fname, thispart->ctype);
++                            strcat(TmpFileNameBuf, "H");
++                            headfp = fopen(TmpFileNameBuf, "w");
++                            if (headfp) {
++                                fputs(mailheaders+12, headfp);
++                                /* The +12 gets rid of MM_HEADERS=\n */
++                                fclose(headfp);
++                            }
++                            ++numparts;
++                        }
++                        ContentType=oldct;
++                        ContentEncoding=oldce;
++                        CParamsUsed = oldcparmsused;
++                        CParamsAlloced = oldcparamsalloced;
++                        CParams = oldcparams;
++                        CParamValues = oldcparamvalues;
++                        /* Now we've seen the last encapsulation boundary, but if there is a "postfix"
++                            we must throw it away.*/
++                        if (BoundaryCt > 0) {
++                            ConsumeRestOfPart(NULL);
++                        }
++                        *PartsWritten = firstpart;
++                        UsedLittleFiles=1;
++                    }
++                    if (*from == 'n') {
++                        char numbuf[10];
++                        sprintf(numbuf, "%d", numparts);
++                        strcpy(to, numbuf);
++                        to += strlen(numbuf);
++                    } else { /* %F */
++                        for (tmppart = firstpart; tmppart != NULL; tmppart = tmppart->next) {
++                            sprintf(to, "%s %s ", tmppart->ctype, tmppart->fname);
++                            to += (strlen(tmppart->ctype) + strlen(tmppart->fname) + 2);
++                        }
++                    }
++                    break;
++                case 's':
++                    if (UsedLittleFiles) {
++                        fprintf(stderr, "metamail: Bad mailcap entry: %s\n", controlstring);
++                        ExitWithError("%%n and %%F are incompatible with %%s.  Execution terminated.");
++                    }
++                    if (TmpFileName) {
++                        strcpy(to, TmpFileName);
++                        to += strlen(TmpFileName);
++                        if (UsedTmpFileName) ++(*UsedTmpFileName);
++                    }
++                    UsedBigFile = 1;
++                    break;
++                case '{':
++                    s = index(from, '}');
++                    if (!s) {
++                        fprintf(stderr, "Ignoring ill-formed parameter reference in mailcap file: %s\n", from);
++                        break;
++                    }
++                    ++from;
++                    *s = 0;
++                    /* put in lower case */
++                    for (tmp=from; *tmp; ++tmp) {
++                        if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++                    }
++                    p = FindParam(from);
++                    if (p && p[0] == '"') {
++                        p=UnquoteString(p);
++                    }
++                    if (!p) p = "";
++                    *to++ = '\'';
++                    strcpynoquotes(to, p);
++                    to += strlen(p);
++                    *to++ = '\'';
++                    *s = '}'; /* restore */
++                    from = s;
++                    break;
++                case 't':
++                    /* type/subtype */
++                    strcpynoquotes(to, ContentType);
++                    to += strlen(ContentType);
++                    break;
++                default:
++                    fprintf(stderr, "Ignoring unrecognized format code in mailcap file: %%%c\n", *from);
++                    break;
++            }
++        } else if (*from == '%') {
++            prefixed = 1;
++        } else {
++            *to++ = *from;
++        }
++    }
++    *to = 0;
++}
++
++strcpynoquotes(t,f)
++char *t, *f;
++{
++    static char *badchars="|<>%*?\"`'";
++
++    while (*f) {
++        if (index(badchars, *f)) *t++ = ' '; else *t++ = *f;
++        ++f;
++    }
++}
++
++WriteTmpFile(fname, ctype)
++char *fname;
++char *ctype;
++{
++    FILE *fpout;
++    int retval = 0;
++
++    fpout = fopen(fname, WRITE_BINARY);
++    if (!fpout) {
++        perror("WriteTmpFile");
++        ExitWithError("Can't create temporary file");
++    }
++    TranslateInputToOutput(InputFP, fpout, EncodingCode, ctype);
++    if (ftell(fpout) == 0) retval = 1;
++    if (fclose(fpout)) ExitWithError("Can't write temporary file");
++    return(retval);
++}
++
++
++TranslateInputToOutput(InputFP, OutputFP, Ecode, ctype)
++FILE *InputFP, *OutputFP;
++int Ecode;
++char *ctype;
++{
++    int InMultipart = BoundaryCt > 0 ? 1 : 0;
++
++    switch(Ecode) {
++        case ENCODING_BASE64:
++            from64(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt, DoesNeedPortableNewlines(ctype));
++            break;
++        case ENCODING_QUOTEDPRINTABLE:
++            fromqp(InputFP, OutputFP, InMultipart ? Boundaries : NULL, &BoundaryCt);
++            break;
++ 	case ENCODING_UUENCODE:
++ 	    fromuue(InputFP, OutputFP, InMultipart ? Boundaries: NULL, &BoundaryCt);
++ 	    break;
++        default:
++            ConsumeRestOfPart(OutputFP);
++    }
++#if !defined(AMIGA) && !defined(MSDOS)
++    if (UsingStandardInput && feof(InputFP) && !freopen("/dev/tty", "r", stdin)) {
++        fprintf(stderr, "Warning: Cannot freopen /dev/tty to stdin");
++    } else InputFP = stdin;
++#endif
++}
++
++CreateNewWindowPrefix(Prefix)
++char *Prefix;
++{
++    char *override = getenv("TERMINAL_CMD");
++    if (override) {
++        strcpy(Prefix, override);
++#ifdef AMIGA
++    } else {
++        /* The window should *not* run in background. We are thus unable
++         * to use NewWsh or NewCLI.
++         */
++        /* strcpy(Prefix, "newwsh CMD "); */
++        Prefix[0] = 0;
++#else
++    } else if (getenv("DISPLAY")) {
++        /* X11 */
++        strcpy(Prefix, "xterm -title '");
++        strcat(Prefix, MailSummary);
++        strcat(Prefix, "' -e ");
++    } else if (getenv("WINDOW_PARENT")) {
++        /* SunView */
++        strcpy(Prefix, "shelltool ");
++    } else if (getenv("WMHOST")) {
++        /* old Andrew WM */
++        strcpy(Prefix, "h19 ");
++    } else {
++        /* last resort is to look for /dev/tty */
++        if (!freopen("/dev/tty", "r", stdin)){
++            ExitWithError("Don't know how to create a terminal window");
++        }
++        InputFP = stdin;
++        fprintf(stderr, "Warning, reopened /dev/tty, could be strange.\n");
++        Prefix[0] = 0;
++#endif
++    }
++}
++
++int HasSavedTtyState=0;
++#if !defined(AMIGA) && !defined(MSDOS)
++#ifdef SYSV
++static struct termio MyTtyStateIn, MyTtyStateOut;
++#else
++static struct sgttyb MyTtyStateIn, MyTtyStateOut;
++#endif
++#endif
++
++SaveTtyState() {
++    /* Bogus -- would like a good portable way to reset the terminal state here */
++#if !defined(AMIGA) && !defined(MSDOS)
++#ifdef SYSV
++    ioctl(fileno(stdin), TCGETA, &MyTtyStateIn);
++    ioctl(fileno(stdout), TCGETA, &MyTtyStateOut);
++#else
++    gtty(fileno(stdin), &MyTtyStateIn);
++    gtty(fileno(stdout), &MyTtyStateOut);
++#endif
++    HasSavedTtyState = 1;
++#endif
++}
++
++RestoreTtyState() {
++#if !defined(AMIGA) && !defined(MSDOS)
++#ifdef SYSV
++    if (HasSavedTtyState) {
++        ioctl(fileno(stdout), TCSETA, &MyTtyStateOut);
++        ioctl(fileno(stdin), TCSETA, &MyTtyStateIn);
++    }
++#else
++    if (HasSavedTtyState) {
++        stty(fileno(stdout), &MyTtyStateOut);
++        stty(fileno(stdin), &MyTtyStateIn);
++    }
++#endif
++#endif
++}
++
++NeedToAskBeforeExecuting(type)
++char *type;
++{
++    struct NoAskItem *nai;
++    if (!MightAskBeforeExecuting || DoInBackground) return(0);
++    for (nai = FirstNoAskItem; nai; nai = nai->next) {
++        if (CtypeMatch(type, nai->type)) return(0);
++    }
++    return(1);
++}
++
++NeedToBeQuiet(cmd)
++char *cmd;
++{
++    struct NoAskItem *nai;
++    for (nai = FirstQuietItem; nai; nai = nai->next) {
++        if (!lc2strcmp(nai->type, cmd)) return(1);
++    }
++    return(0);
++}
++
++CtypeMatch(ctype, pat)
++char *ctype, *pat;
++{
++    int len;
++    char pat2[200];
++
++    if (!lc2strcmp(ctype, pat)) {
++        return(1); /* exact match, case-insensitive */
++    }
++    if (index(pat, '/') == NULL) {
++        /* implicit wildcard */
++        strcpy(pat2, pat);
++        strcat(pat2, "/*");
++        pat = pat2;
++    }
++    len = strlen(pat);
++    if ((pat[--len] == '*')
++         && (pat[--len] == '/')
++         && (!lc2strncmp(ctype, pat, len))
++         && ((ctype[len] == '/') || (ctype[len] == '\0'))){
++        /* wildcard match */
++        return(1);
++    }
++    return(0);
++}
++
++ExecuteCommand(cmd, really)
++char *cmd;
++int really;
++{
++    int code;
++    if (!Quiet || DoDebug) {
++        if (!NeedToBeQuiet(ShortCommand(cmd))) {
++            printf("---Executing: %s\n", DoDebug ? cmd : ShortCommand(cmd));
++        } else if (EatLeadingNewlines) {
++            printf("\n");
++        } 
++        fflush(stdout);
++    }
++    if (really) {
++        fflush(stdout); fflush(stderr);
++        code = system(cmd);
++        if (DoDebug) printf("Command exit status: %d\n", code);
++#ifdef MSDOS
++	code = 0;	/* system doesn't return a valid exit code on MS-DOS */
++#endif
++        return(code);
++    }
++    return(0);
++}
++
++MkTmpFileName(name)
++char *name;
++{
++  int   length  = MAX_FILE_NAME_SIZE;
++  char* tmpname = NULL;
++
++#ifdef AMIGA
++    strcpy(name, "T:mmXXXXXX");
++    close(mkstemp(name));
++#else
++  #ifndef MSDOS
++    sprintf(name, "%s/mm.XXXXXX", tmproot);
++    close(mkstemp(name));
++  #else
++     strcpy(name, "TXXXXXX");
++     if (!close(mkstemp(name)))
++         name[0] = 0;
++     else
++         if (DoDebug) printf("temp name = \"%s\"\n", name);
++  #endif
++#endif
++     fprintf( stderr, "strlen\n");
++     if (name) 
++       length = strlen(name);
++
++     fprintf( stderr, "after strlen\n");
++     tmpname = malloc( sizeof(char) * length );
++     fprintf( stderr, "after malloc\n");
++     strcpy( tmpname, name );
++     fprintf( stderr, "after strcpy\n");
++     dlist_insertnew( &TmpNameListTail, (void*) tmpname );
++     fprintf( stderr, "after dlistinsert\n");
++     tmpname = NULL;
++}
++
++void
++CleanupTmpFiles( void )
++{
++  DList* help = TmpNameListTail;
++  DList* old = NULL;
++  
++  while (help) {
++    if (unlink( (char*) help->data ) < 0) 
++      if (DoDebug) 
++	fprintf( stderr, "error unlinking %s\n", (char*) help->data );
++    old = help;
++    help = help->prev;
++    free( old );
++  }
++  
++  TmpNameListTail = NULL;
++}
++
++#ifdef AMIGA
++/* We need to execute a command and then remove a file "fileToRemove".
++ * MkRmScript() creates a shell script that accomplishes this. The script
++ * is written to a temporary file. The name of the script is returned.
++ */
++char *
++MkRmScript(command, fileToRemove, nameBuf)
++char *command;
++char *fileToRemove;
++char *nameBuf;
++{
++    FILE *script;
++
++    MkTmpFileName(nameBuf);
++    if ((script = fopen(nameBuf, "w")) == NULL) {
++        fprintf(stderr, "Unable to open %s for writing\n", nameBuf);
++        exit(1);
++    }
++    fprintf(script, ".BRA {\n.KET }\n%s\nDelete %s QUIET\n", command, fileToRemove);
++    fclose(script);
++    return(nameBuf);
++}
++#endif
++
++void
++ConsumeRestOfPart(outfp)
++FILE *outfp;
++{
++    char *Buf;
++    int c;
++
++    if (BoundaryCt <= 0) {
++        while ((c=getc(InputFP)) != EOF) {
++            if (outfp) putc(c, outfp);
++        }
++        return;
++    }
++    Buf = malloc(LINE_BUF_SIZE);
++    if (!Buf) ExitWithError(nomem);
++    while (fgets(Buf, LINE_BUF_SIZE, InputFP)) {
++        if ((BoundaryCt > 0)
++             && (Buf[0] == '-')
++             && (Buf[1] == '-')
++             && PendingBoundary(Buf, Boundaries, &BoundaryCt)) {
++            break;
++        }
++        if (outfp) fputs(Buf, outfp);
++    }
++    free(Buf);
++}
++
++char *paramend(s)
++char *s;
++{
++    int inquotes=0;
++    while (*s) {
++        if (inquotes) {
++            if (*s == '"') {
++                inquotes = 0;
++            } else if (*s == '\\') {
++                ++s; /* skip a char */
++            }
++        } else if (*s == ';') {
++            return(s);
++        } else if (*s == '"') {
++            inquotes = 1;
++        }
++        ++s;
++    }
++    return(NULL);
++}        
++
++void
++ParseContentParameters(ct)
++char *ct;
++{
++    char *s, *t, *eq;
++
++    CParamsUsed = 0;
++    s = index(ct, ';');
++    if (!s) return;
++    *s++ = 0;
++    do {
++        t = paramend(s);
++        if (t) *t++ = 0;
++        eq = index(s, '=');
++        if (!eq) {
++            fprintf(stderr, "Ignoring unparsable content-type parameter: '%s'\n", s);
++            JunkParameter=Cleanse(s);
++        } else {
++            if (CParamsUsed >= CParamsAlloced) {
++                CParamsAlloced += 10;
++                if (CParams) {
++                    CParams = (char **) realloc(CParams, (1+CParamsAlloced) * sizeof (char *));
++                    CParamValues = (char **) realloc(CParamValues, (1+CParamsAlloced) * sizeof (char *));
++                } else {
++                    CParams = (char **) malloc((1+CParamsAlloced) * sizeof (char *));
++                    CParamValues = (char **) malloc((1+CParamsAlloced) * sizeof (char *));
++                }
++                if (!CParams || !CParamValues) ExitWithError(nomem);
++            }
++            *eq++ = 0;
++            s = Cleanse(s);
++            CParams[CParamsUsed] = s;
++            /* strip leading white space */
++            while (*eq && isspace((unsigned char) *eq)) ++eq;
++            /* strip trailing white space */
++            StripTrailingSpace(eq);
++            CParamValues[CParamsUsed++] = eq; 
++            if (DoDebug) printf("NEW PARAMETER: %s VALUE: %s\n", s, eq);
++        }
++        s = t;
++    } while (t);
++}
++
++char *FindParam(s)
++char *s;
++{
++    int i;
++    for (i=0; i<CParamsUsed; ++i) {
++        if (!strcmp(s, CParams[i])) {
++            return(CParamValues[i]);
++        }
++    }
++    return(NULL);
++}
++
++#ifdef MSDOS
++system2(s)
++char *s;
++{
++    printf("system2: \"%s\"\n", s);
++    return(0);
++}
++#endif
++
++strcatquoting(s1, s2)
++char *s1;
++char *s2;
++{
++    strcat(s1, s2);
++#ifdef NOTDEF
++    while (*s1) ++s1;
++    while (*s2) {
++        if (*s2 == '\"' || *s2 == '\\') *s1++ = '\\';
++        *s1++ = *s2++;
++    }
++    *s1 = '\0';
++#endif
++}
++
++PauseForUser() {
++#if defined(MSDOS) || defined(AMIGA)
++    char Buf[100];
++#endif
++
++    if (DefinitelyNotTty || MustNotBeTty) return;	
++#if defined(MSDOS) || defined(AMIGA)
++    printf("Press RETURN to go on\n");
++    gets(Buf);
++#else
++    fflush(stdout);
++    SaveTtyState();
++    if (StartRawStdin() != -1) {
++        printf("--Press any key to go on.--");
++    } else {
++        printf("Press RETURN to go on.\n");
++    }
++    fflush(stdout);
++    getchar();
++    RestoreTtyState();
++    printf("\n");
++#endif
++}
++
++StartRawStdin() {
++#if !defined(AMIGA) && !defined(MSDOS)
++#ifdef SYSV
++    struct termio   orterm, fterm;
++    ioctl(0, TCGETA, &orterm);	/* get current (i.e. cooked) termio */
++    fterm = orterm;		/* get termio to modify */
++
++    fterm.c_lflag &= ~ICANON;	/* clear ICANON giving raw mode */
++    fterm.c_cc[VMIN] = 1;	/* set MIN char count to 1 */
++    fterm.c_cc[VTIME] = 0;	/* set NO time limit */
++    return ioctl(0, TCSETAW, &fterm);	/* modify termio for raw mode */
++#else
++    struct sgttyb ts;
++    gtty(fileno(stdin), &ts);
++    ts.sg_flags |= RAW;
++    return stty(fileno(stdin), &ts);
++#endif
++#else
++    return(-1);
++#endif
++}
++
++
++int IsDirectory(fname)
++char *fname;
++{
++    struct stat stbuf;
++    if (stat(fname, &stbuf)) {
++	return(-1);
++    }
++    return (((stbuf.st_mode & S_IFMT) == S_IFDIR) ? 1 : 0);
++}
++
+--- metamail-2.7.orig/src/metamail/environment.c
++++ metamail-2.7/src/metamail/environment.c
+@@ -0,0 +1,181 @@
++/* Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++
++/* environment.c - contains (nearly) everything for the environmenthandling
++   
++   Author: Michael Moerz <mikem@debian.org>
++*/
++
++#include "metamail.h"
++#include "environment.h"
++
++/** adds a string to the current environmet variable PATH
++    @param auxpath path to add to $PATH (=auxiliary path)
++*/
++void
++addToPath(auxpath)
++char *auxpath;
++{
++  if (auxpath && *auxpath) {    /* when pointer and auxpath[0] are != NULL */
++    static char *newpath = 0;    /* is needed! since it becomes part ov ENV */
++    char *oldpath = newpath;
++    char *path = getenv("PATH");
++    
++    if (!path) path = "";	 /* give a default if no current path */
++    newpath = XMALLOC(char, (7 + strlen(path) + strlen(auxpath)));
++    sprintf(newpath, "PATH=%s:%s", auxpath, path);
++    putenv(newpath);
++    if (oldpath) XFREE(oldpath); /* free up any old allocated PATH */
++  }
++}
++
++/** initialize global variable mailheaders from environment
++    this code is needed at several places -> own function
++*/
++void
++initMailHeadersFromEnvironment() {
++  mailheaders = getenv("MM_HEADERS");
++  if (mailheaders) {
++    char *s;
++    s = XMALLOC(char, 15+strlen(mailheaders));
++    sprintf(s, "MM_HEADERS=%s", mailheaders);
++    /* error? free mailheaders? */
++    mailheaders = s;
++  }
++}  
++
++/** initializes variables from environment variables or sets them to default
++    values if they are not found in the environment
++*/
++void
++initVarsFromEnvironment() {
++  char *QuietStr = NULL, *NoAskStr = NULL;
++
++  /* temporary directory - where all temporary files are created */
++  tmproot = getenv("METAMAIL_TMPDIR");
++  if (!tmproot) {
++    tmproot = XMALLOC(char, 5);
++    strcpy(tmproot, "/tmp");
++  }
++
++  /* */
++  initMailHeadersFromEnvironment();
++
++  /* the quietstring that can turn off output for various things */
++  QuietStr = getenv("MM_QUIET");
++  if (!QuietStr) /* when not set in the environment set default */
++    QuietStr = QuietDefault;
++  /* now either we are always quiet (="1") or we have to create a structure
++     containing information about when we have to be quiet
++  */
++  if (!strcmp(QuietStr, "1")) { /* when Quietstr == "1" */
++    Quiet = 1;
++  } else {
++    struct NoAskItem *qitem;
++    char *s, *tmp;
++    char *QuietCopy;
++
++    Quiet = 0;
++    QuietCopy = XMALLOC(char, 1+strlen(QuietStr));
++    strcpy(QuietCopy, QuietStr);
++    for (tmp=QuietCopy; *tmp; ++tmp) {
++      if (isupper((unsigned char) *tmp)) 
++	*tmp = tolower((unsigned char) *tmp);
++    }
++    do {
++      s = index(QuietCopy, ',');
++      if (s) *s++ = 0;
++      qitem = XMALLOC(struct NoAskItem, 1);
++      qitem->next = FirstQuietItem;
++      qitem->type = QuietCopy;
++      FirstQuietItem = qitem;
++      QuietCopy = s;
++    } while (QuietCopy);
++  }
++
++  /* */
++  if (getenv("MM_TRANSPARENT")) {
++    /* Will not propogate recursively */
++    TransparentMode = atoi(getenv("MM_TRANSPARENT"));
++  }
++
++  /* override for allowing to run as root -- DANGER WILL ROBINSON */
++  if (getenv("MM_RUNASROOT")) {
++    RunAsRootOK = atoi(getenv("MM_RUNASROOT"));
++  }
++
++  /* */
++  if (getenv("MM_YANKMODE")) {
++    /* Will not propogate recursively */
++    YankMode = atoi(getenv("MM_YANKMODE"));
++  }
++
++  /* debug flag */
++  if (getenv("MM_DEBUG")) {
++    DoDebug = atoi(getenv("MM_DEBUG"));
++  }
++
++  /* put that somewhere else */
++  if (DoDebug) 
++    printf("Metamail Version %s, debugging turned on.\n", mmversion);
++
++  /* similar to quiet */
++  NoAskStr = getenv("MM_NOASK");
++  if (!NoAskStr) /* when noask not set in the ENV then init to default */
++    NoAskStr = NoAskDefault;
++  if (!strcmp(NoAskStr, "1")) {
++    MightAskBeforeExecuting = 0;
++  } else {
++    struct NoAskItem *nai;
++    char *s, *tmp;
++    char *NoAskCopy;
++    
++    NoAskCopy = XMALLOC(char, 1+strlen(NoAskStr));
++    strcpy(NoAskCopy, NoAskStr);
++    for (tmp=NoAskCopy; *tmp; ++tmp) {
++      if (isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++    }
++    do {
++      s = index(NoAskCopy, ',');
++      if (s) *s++ = 0;
++      nai = XMALLOC(struct NoAskItem, 1);
++      nai->next = FirstNoAskItem;
++      nai->type = NoAskCopy;
++      FirstNoAskItem = nai;
++      NoAskCopy = s;
++    } while (NoAskCopy);
++  }
++
++  /* hmm, perhaps mailprogram name ? */
++  MailerName = getenv("MM_MAILER");
++  if (!MailerName)
++    MailerName = "unknown";
++
++  /* */
++  if (getenv("MM_USEPAGER")) {
++    MaybePageOutput = atoi(getenv("MM_USEPAGER"));
++  }
++
++  /* setting if we have a tty or not */
++  if ((getenv("MM_NOTTTY") && ((atoi(getenv("MM_NOTTTY"))) != 0))) {
++    MustNotBeTty = 1;
++  }
++  if (MustNotBeTty
++      || !isatty(0)
++      || !isatty(1)) {
++    DefinitelyNotTty = 1;
++  }
++  
++  
++}
+--- metamail-2.7.orig/src/metamail/metamail_default.h
++++ metamail-2.7/src/metamail/metamail_default.h
+@@ -0,0 +1,9 @@
++#ifndef METAMAIL_DEFAULT_H
++#define METAMAIL_DEFAULT_H 1
++
++char *mmversion = MM_VERSTRING;
++char *NoAskDefault = "text,text/plain,text/richtext";
++char *QuietDefault = CATCOMMAND;
++char *tmproot="";
++
++#endif /* METAMAIL_DEFAULT_H */
+--- metamail-2.7.orig/src/metamail/dlistold.c
++++ metamail-2.7/src/metamail/dlistold.c
+@@ -0,0 +1,120 @@
++// Copyright: Michael Moerz 2000
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License with
++// the Debian GNU/Linux distribution in file /usr/share/doc/common-licenses/GPL
++// if not, write to the Free Software Foundation, Inc., 59 Temple Place,
++// Suite 330, Boston, MA  02111-1307  USA
++
++
++#include <stdlib.h>
++#include "dlist.h"
++
++/* create a new dlist node containing data */
++DList* 
++dlist_new(void* data) {
++  DList* new = malloc( sizeof(DList) * 1 );
++  
++  new->next = NULL;
++  new->prev = NULL;
++  new->data = data;
++
++  return new;
++}
++
++/* concatenate two lists */
++void
++dlist_cat(DList* tail_l1, DList* head_l2){
++  tail_l1->next = head_l2;
++  head_l2->prev = tail_l1; 
++}
++
++/* to shorten things a bit in some cases */
++DList*
++dlist_insertnew(DList** tail, void* data) {
++  DList* new = dlist_new( data );
++  return dlist_insert( tail, new );
++}
++
++/* can also be used to append to a list */
++DList*
++dlist_insert(DList** tail, DList* new) {
++  if ( (*tail) ) {
++    new->next = (*tail)->next;
++    (*tail)->next = new;
++    new->prev = (*tail);
++  }     
++
++  if ( new->next )  // if next is defined, then set its prev value correctly
++    new->next->prev = new;
++  else
++    (*tail) = new;
++  
++  return new;
++}
++
++/* retrieves the head of a list */
++DList* 
++dlist_head(DList* head){
++  DList* old;
++
++  while( head ) {
++    old = head;
++    head = head->prev;
++  }
++  
++  return old;
++}
++
++/* retrieves the tail of a list */
++DList* 
++dlist_tail(DList* head){
++  DList* old;
++
++  while( head ) {
++    old = head;
++    head = head->next;
++  }
++  
++  return old;
++}
++
++/* returns the length of the list */
++size_t 
++dlist_length(DList* head){
++  size_t n;
++
++  for (n = 0; head; ++n)
++    head = head->next;
++
++  return n;
++}
++
++/* removes an entry from the list, and returns it so that it might
++   be destroyed properly */
++DList*
++dlist_remove(DList** head, DList** tail, DList* entry) {
++  if (entry != (*head)) {  // when not head
++    if (entry->prev)       // and a previous entry exists
++      entry->prev->next = entry->next; // tell the previous our next entry
++  } else
++    (*head) = entry->next; // otherwise next entry is head
++        
++  if (entry != (*tail)) {  // when not tail
++    if (entry->next)       // and next entry exists
++      entry->next->prev = entry->prev; // tell the next entry our previous one
++  } else
++    (*tail) = entry->prev; // otherwise previous is tail
++
++  return entry;
++}
++
+--- metamail-2.7.orig/src/metamail/dlistold.h
++++ metamail-2.7/src/metamail/dlistold.h
+@@ -0,0 +1,36 @@
++// Copyright: Michael Moerz 2000
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License with
++// the Debian GNU/Linux distribution in file /usr/share/doc/common-licenses/GPL
++// if not, write to the Free Software Foundation, Inc., 59 Temple Place,
++// Suite 330, Boston, MA  02111-1307  USA
++
++#ifndef DRF_LIST_H
++#define DRF_LIST_H 1
++
++typedef struct dlist {
++  struct dlist* next;
++  struct dlist* prev;
++  void* data;
++} DList;
++
++extern DList* dlist_new        (void* data);
++extern void   dlist_cat        (DList* tail_l1, DList* head_l2);
++extern DList* dlist_insertnew  (DList** tail, void* data);
++extern DList* dlist_insert     (DList** tail, DList* new);
++extern DList* dlist_head       (DList* head);
++extern DList* dlist_tail       (DList* head);
++extern size_t dlist_length     (DList* head);
++extern DList* dlist_remove     (DList** head, DList** tail, DList* entry);
++
++#endif /* !DRF_LIST_H */
+--- metamail-2.7.orig/src/metamail/includeaway
++++ metamail-2.7/src/metamail/includeaway
+@@ -0,0 +1,97 @@
++#ifdef BORLAND
++#define F_OK 0
++extern unsigned _stklen = 16384;
++extern char *mktemp(char *);
++#define WRITE_BINARY	"w"
++#else /* BORLAND */
++#ifdef MICROSOFT
++#include <malloc.h>
++#include <stdlib.h>
++#include <time.h>
++#include <signal.h>
++#define F_OK 0
++#else
++
++#ifndef AMIGA
++#ifdef SYSV
++//#include <termio.h>
++//#include <unistd.h>
++#else /* SYSV */
++#include <sgtty.h>
++#endif /* SYSV */
++#endif /* AMIGA */
++#endif /* MICROSOFT */
++#endif /* BORLAND */
++
++//#if defined(SYSV) && !defined(linux)
++//#define LPRTEMPLATE "lp %s"
++//#define LPRCOMMAND "lp"
++//#else
++//#define LPRTEMPLATE "lpr %s"
++//#define LPRCOMMAND "lpr"
++
++#endif
++#ifdef MSDOS
++#define CATCOMMAND  "cat"
++#define CATTEMPLATE "cat %s"
++#define METAMAIL    "metamail"
++#define TMPFILE_NAME_SIZE   128
++#define MAX_FILE_NAME_SIZE 128
++#define WRITE_BINARY	"wb"
++#else /* MSDOS */
++#ifdef AMIGA
++extern char *MkRmScript();
++#ifndef F_OK
++#define F_OK (0)
++#endif
++#define CATCOMMAND  "Type"
++#define CATTEMPLATE "Type %s"
++#define METAMAIL    "metamail <*"
++#define TMPFILE_NAME_SIZE     50
++#define MAX_FILE_NAME_SIZE 256
++#define WRITE_BINARY	"w"
++#else /* AMIGA */
++//extern char **environ, *gets();
++//#define CATCOMMAND  "cat"
++//#define CATTEMPLATE "cat %s"
++//#define METAMAIL    "metamail"
++//#define TMPFILE_NAME_SIZE   1000
++//#define MAX_FILE_NAME_SIZE 1000
++//#define WRITE_BINARY	"w"
++#endif /* AMIGA */
++#endif /* MSDOS */
++
++//#ifndef NO_RLIMITS
++//#include <sys/resource.h>
++//#endif
++
++//#define CMDSIZE 1200 /* Maximum size of command to execute */
++
++//#define LINE_BUF_SIZE       2000
++
++#ifndef MICROSOFT
++extern char *malloc();
++extern char *realloc();
++#endif
++
++//extern FILE *popen();
++//static char *nomem = "Out of memory!";
++//static char *mmversion = MM_VERSTRING;
++//static char *NoAskDefault = "text,text/plain,text/richtext";
++//static char *QuietDefault = CATCOMMAND;
++//static char *tmproot="";
++
++//#define ENCODING_NONE 0
++//#define ENCODING_BASE64 1
++//#define ENCODING_QUOTEDPRINTABLE 2
++//#define ENCODING_8BIT 3
++//#define ENCODING_UUENCODE -1	/* non-standard */
++
++#ifdef MICROSOFT
++/* Need a function prototype for TryMailcapEntry because without it MSC
++ * passes a pointer to the structure rather than the structure itself.
++ */
++TryMailcapEntry(struct MailcapEntry mc, char *SquirrelFile);
++#endif
++
++
+--- metamail-2.7.orig/src/metamail/mimencode.c
++++ metamail-2.7/src/metamail/mimencode.c
+@@ -0,0 +1,95 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++#include <metamail/common.h>
++
++//#ifdef MSDOS
++//#include <fcntl.h>
++//#endif
++
++#define BASE64 1
++#define QP 2 /* quoted-printable */
++
++main(argc, argv)
++int argc;
++char **argv;
++{
++    int encode = 1, which = BASE64, i, portablenewlines = 0;
++    FILE *fp = stdin;
++    FILE *fpo = stdout;
++
++    for (i=1; i<argc; ++i) {
++        if (argv[i][0] == '-') {
++	    switch (argv[i][1]) {
++		case 'o':
++		    if (++i >= argc) {
++			fprintf(stderr, "mimencode: -o requires a file name.\n");
++			exit(-1);
++		    }
++		    fpo = fopen(argv[i], "w");
++		    if (!fpo) {
++			perror(argv[i]);
++			exit(-1);
++		    }
++		    break;
++                case 'u':
++                    encode = 0;
++                    break;
++                case 'q':
++                    which = QP;
++                    break;
++                case 'p':
++                    portablenewlines = 1;
++                    break;
++                case 'b':
++                    which = BASE64;
++                    break;
++		default:
++                    fprintf(stderr,
++                       "Usage: %s [-u] [-q] [-b] [-p] [-o outputfile] [file name]\n", *argv);
++                    exit(-1);
++            }
++        } else {
++	  //#ifdef MSDOS
++	  //            if (encode)
++          //      fp = fopen(argv[i], "rb");
++          //  else
++          //  {
++          //      fp = fopen(argv[i], "rt");
++          //      setmode(fileno(fpo), O_BINARY);
++          //  } /* else */
++	  //#else
++            fp = fopen(argv[i], "r");
++	    //#endif /* MSDOS */
++            if (!fp) {
++                perror(argv[i]);
++                exit(-1);
++            }
++        }
++    }
++    //#ifdef MSDOS
++    //if (fp == stdin) setmode(fileno(fp), O_BINARY);
++    //#endif /* MSDOS */
++    if (which == BASE64) {
++        if (encode) {
++            to64(fp, fpo, portablenewlines);
++        } else {
++            from64(fp,fpo, (char **) NULL, (int *) 0, portablenewlines);
++        }
++    } else {
++        if (encode) toqp(fp, fpo); else fromqp(fp, fpo, NULL, 0);
++    }
++    return(0);
++}
++
+--- metamail-2.7.orig/src/metamail/tmpfile.c
++++ metamail-2.7/src/metamail/tmpfile.c
+@@ -0,0 +1,120 @@
++#include <metamail/common.h>
++#include <metamail/dlist.h> /* double linked list management */
++
++#include "tmpfile.h"
++#include "metamail.h"
++
++DList TmpNameList = { NULL, NULL };
++
++void
++MkTmpFileName(name)
++     char *name;
++{
++  int   tmpfd   = 0;
++
++  if (DoDebug) 
++    fprintf(stderr, "MkTmpFileName:\n");
++
++  if (!name) {
++    if (DoDebug)
++      fprintf(stderr, "name is null\nMkTmpFileName END\n");
++    return;
++  }
++  
++  strcpy(name, tmproot);
++  strcat(name, "/MXXXXXX");
++ 
++  if ((tmpfd = mkstemp(name)) > 0) {
++    if (close(tmpfd) == -1) {
++      metamail_warning( "couldn't close tmpfile: ", xstrerror( errno ) );
++      name[0] = 0;
++      return;
++    }
++    if (DoDebug)
++      fprintf(stderr, "name = \"%s\"\n", name);
++    AddTmpFileName( name );
++    if (DoDebug)
++      fprintf( stderr, "MkTmpFileName END\n", name);
++  } else {
++    metamail_warning( "couldn't optain tmpfile: ", xstrerror( errno ) );
++    return;
++  }
++}
++
++void
++AddTmpFileName(name)
++     char *name;
++{
++  char *tmpname = NULL;
++  if ( name ) {
++    tmpname = XMALLOC( char, strlen(name) + 1 );
++  
++    strcpy( tmpname, name );
++    dlist_insertnew( &TmpNameList, (void*) tmpname, TmpNameList.tail );
++    if (DoDebug)
++      fprintf( stderr, "AddTmpFileName: %s\n", name );
++  }
++}
++
++void
++DelTmpFileName(name)
++     char *name;
++{
++  DListEntry *help = NULL;
++  
++  if ( (help = dlist_remove( &TmpNameList, dlist_search( &TmpNameList, name, 
++							 dlist_strcmp ) ) ) ) {
++    XFREE( help->data );
++    XFREE( help );
++  } else
++    fprintf(stderr, "tried to remove non tmplist file %s\n", name);
++}
++
++void
++RmTmpFileName(name)
++     char *name;
++{
++  DListEntry* help = NULL;
++  
++  if (DoDebug) 
++    fprintf( stderr, "RmTmpFileName:\n" );
++
++  if( (help = dlist_remove( &TmpNameList, 
++			    dlist_search( &TmpNameList, name, 
++					  dlist_strcmp ) ) ) ) {
++    if (DoDebug) fprintf( stderr, "filename: %s\n", name );
++    if (!access( name, R_OK ) ) { 
++      if(unlink( name ) == -1)
++	metamail_error( stderr, "error unlinking: ", xstrerror( errno ) );
++    }
++    XFREE( help->data );
++    XFREE( help );
++  }
++}
++
++void
++CleanupTmpFiles( void )
++{
++  DListEntry* help = NULL;
++  
++  if (DoDebug) 
++    fprintf( stderr, "CleanupTmpFiles:\n" );
++
++  while ( TmpNameList.head ) {
++    if (DoDebug) fprintf(stderr, "tmpfile: %s  %X\n", TmpNameList.head->data,
++			 TmpNameList.head->next);
++    if (!access( (char*) TmpNameList.head->data, R_OK )) {
++      if (DoDebug) fprintf( stderr, "access file yes\n" );
++      if (unlink( (char*) TmpNameList.head->data ) < 0) {
++	if (DoDebug) 
++	  metamail_error( stderr, "error unlinking: ", 
++			  (char*) TmpNameList.head->data );
++      }
++    }
++    
++    help = dlist_remove( &TmpNameList, TmpNameList.head );
++    if (DoDebug) fprintf( stderr, "%X\n", help );
++    XFREE( help->data );
++    XFREE( help );
++  }
++}
+--- metamail-2.7.orig/src/metamail/splitmail.c
++++ metamail-2.7/src/metamail/splitmail.c
+@@ -0,0 +1,434 @@
++/*
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++/****************************************************** 
++    Metamail -- A tool to help diverse mail readers 
++                cope with diverse multimedia mail formats.
++
++    Author:  Nathaniel S. Borenstein, Bellcore
++
++ ******************************************************* */
++
++#include <metamail/common.h>
++
++#define MINCHUNKSIZE 20000 /* Better be enough to hold the headers, or we die! */
++
++extern char *getenv();
++extern char *getmyname();
++#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
++#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
++
++usageexit() {
++    fprintf(stderr, "Usage:  splitmail [-d] [-v] [-s splitsize] [-i id-suffix] [-p prefix] [file-name]\n");
++    exit(-1);
++}
++
++char *MonthNames[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
++char *DayNames[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
++
++char *
++endofheader(s)
++char *s;
++{
++    char *orgs = s, c;
++    while (1) {
++	s = index(s, '\n');
++	if (!s) return(orgs+strlen(orgs));
++	c = *(s+1);
++        if (c != ' ' && c != '\t') return(s);
++        ++s;
++    }
++}
++
++main(argc, argv)
++char **argv;
++{
++    int i, DoDeliver=0, SplitSize=DEFAULT_SPLIT_SIZE, dum, InNewline=1, bytesread, whichpart=1, Verbose=0, numparts = -1, c;
++    char *fname = NULL, *bigbuf, *s, *SharedHeaders, *headend, *from, id[100], *deliverycmd, *prefix, SubjectBuf[250];
++    char *MessageID = 0, *OrigID=NULL;
++    FILE *fp;
++
++    s = getenv("METAMAIL_TMPDIR");
++    if (s) {
++        prefix = malloc(10+strlen(s));
++        if (!prefix) {
++            fprintf(stderr, "splitmail: Not enough memory\n");
++            exit(-1);
++        }
++        sprintf(prefix, "%s/split.", s);
++    } else {
++        prefix = "/tmp/split.";
++    }
++    s = getenv("SPLITSIZE");
++    if (s) {
++        dum = atoi(s);
++        if (dum < MINCHUNKSIZE) {
++            fprintf(stderr, "Ignoring SPLITSIZE environment variable of %d -- the minimum value is %d\n", dum, MINCHUNKSIZE);
++        } else {
++            SplitSize = dum;
++        }
++    }
++    for (i=1; i<argc; ++i) {
++	if (argv[i][0] == '-') {
++	    switch (argv[i][1]) {
++		case 's':
++		    if (++i >= argc) usageexit();
++		    dum = atoi(argv[i]);
++		    if (dum < MINCHUNKSIZE && dum >= 0) {
++			fprintf(stderr, "splitmail: Using minimum splitsize of %d\n", MINCHUNKSIZE);
++			dum = MINCHUNKSIZE;
++			
++		    }
++		    SplitSize = dum;
++		    break;
++		case 'd':
++		    DoDeliver = 1;
++                    break;
++                case 'p':
++		    if (++i >= argc) usageexit();
++                    prefix = argv[i];
++                    break;
++ 		case 'i':
++ 		    if( ++i >= argc) usageexit();
++ 		    MessageID = argv[i];
++ 		    break;
++		case 'v':
++		    Verbose = 1;
++		    break;
++		default:
++		    usageexit();
++	    }
++	} else {
++	    if (fname) usageexit();
++	    fname = argv[i];
++	}
++    }
++    bigbuf = malloc(100+SplitSize);
++    if (!bigbuf) {
++	fprintf(stderr, "splitmail:  Not enough memory for %d-byte chunks\n", SplitSize);
++	exit(-1);
++    }
++    SplitSize -= 1000; /* gives fudge factor for headers, line endings */
++    if (fname) {
++        struct stat stbuf;
++        if (!stat(fname, &stbuf)) {
++            /* Note:  this will sometimes be 1 too high when it is a very close call,
++              because of the desire to have complete lines.  In such cases, we send
++              a null final part */
++            numparts = 1 + (stbuf.st_size / SplitSize);
++        }
++	fp = fopen(fname, "r");
++	if (!fp) {
++	    fprintf(stderr, "splitmail: Cannot read file %s\n", fname);
++	    exit(-1);
++	}
++    } else fp = stdin;
++    headend = bigbuf;
++    while((c=getc(fp)) != EOF) {
++        if (headend >= bigbuf + SplitSize) {
++            fprintf(stderr, "splitmail: Could not find the end of the headers!\n");
++            exit(-1);
++        }
++	*headend++ = c;
++	if (c == '\n') {
++	    if (InNewline) break; /* end of headers */
++	    InNewline = 1;
++	} else {
++	    InNewline = 0;
++	}
++    }
++    if (c == EOF) {
++	fprintf(stderr, "splitmail: Could not find the end of the headers!\n");
++	exit(-1);
++    }
++    *headend = '\0';
++    SharedHeaders = malloc(1+strlen(bigbuf)); /* maximum size needed */
++    if (!SharedHeaders) {
++	fprintf(stderr, "splitmail: Not enough memory\n");
++	exit(-1);
++    }
++    from = bigbuf;
++    *SharedHeaders = '\0';
++    strcpy(SubjectBuf, "Partial Message");
++    while (from < headend) {
++	s = endofheader(from);  /* would be index(from, '\n'),
++				 but need to check for continuation lines */
++        *s = '\0';
++	if (ShareThisHeader(from, SubjectBuf, sizeof (SubjectBuf), &OrigID)) {
++	    strcat(SharedHeaders, from);
++	    strcat(SharedHeaders, "\n");
++	}
++	*s = '\n';
++	from = ++s;
++    }
++    //#ifdef AMIGA
++    //snprintf(id, sizeof(id), "%d.%s@%s%s", time(0), SeqToName(GetSequence(4)), FindConfig("NodeName"),
++    //       FindConfig("DomainName"));
++    //#else
++    //#ifdef MSDOS
++    //snprintf(id, sizeof(id), "%ld.UNKNOWN.SITE.NAME", time(NULL)); // BCR
++    //#else
++    snprintf(id, sizeof(id), "%d.%d.%d.%s", (int) getuid(), (int) getpid(), (int) time(0), getmyname());
++    //#endif /* MSDOS */
++    //#endif /* AMIGA */
++    bytesread = headend - bigbuf;
++    deliverycmd = Verbose ? VERBOSEDELIVERYCMD : NORMALDELIVERYCMD;
++    while (!feof(fp)) {
++	while (SplitSize > bytesread && !feof(fp)) {
++	    /* Need to loop because fread is weird */
++	    bytesread += fread(bigbuf + bytesread, sizeof(char), SplitSize - bytesread, fp);
++	}
++	/* Now complete the line */
++	while((c=getc(fp)) != EOF) {
++	    bigbuf[bytesread++] = c;
++	    if (c=='\n') break;
++	}
++        bigbuf[bytesread] = '\0';
++        if (feof(fp) && numparts <= 0) numparts = whichpart;
++        HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID);
++	bytesread = 0;
++	++whichpart;
++    }
++    while (whichpart <= numparts) {
++        /* Our guess as to how many parts was OFF, hopefully only by one */
++        *bigbuf = '\0'; /* have to deliver an empty part, ugh! */
++        HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID);
++        ++whichpart;
++    }
++    return(0);
++}
++
++HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID)
++int DoDeliver, numparts, whichpart;
++char *deliverycmd, *prefix, *SharedHeaders, *SubjectBuf, *id, *MessageID, *bigbuf, *OrigID;
++{
++    FILE *fpout;
++    char OutputFile[1000];
++    int code;
++    //    struct  timeval	tp;
++    // struct  timezone	tzp;
++    char    *tm_zone;
++
++    if (DoDeliver) {
++        fpout = popen(deliverycmd, "w");
++    } else {
++    	int fd;
++        snprintf(OutputFile, sizeof(OutputFile), "%s%d", prefix, whichpart);
++        remove(OutputFile);
++        fpout = NULL;
++        fd = open(OutputFile, O_WRONLY|O_CREAT|O_EXCL, 0600);
++        if (fd != -1) fpout = fdopen(fd, "w");
++    }
++    if (!fpout) {
++	fprintf(stderr, "splitmail: Can't open %s for writing\n", DoDeliver ? deliverycmd : OutputFile);
++        exit(-1);
++    }
++    if (numparts != 1) { /* one-parters end up not changed at all! */
++        struct tm *gt;
++        time_t clock;
++        int secsoff, hrsoff, minsoff;
++        char signoff='+';
++
++	fputs(SharedHeaders, fpout);
++	if (OrigID) fprintf(fpout, "References: %s\n", OrigID);
++
++        clock=time(0);
++        gt = (struct tm*) gmtime(&clock);
++        hrsoff=minsoff=0;
++        fprintf(fpout, "Date: %s, %02d %s %d %02d:%02d:%02d %c%02d%02d (GMT)\n", DayNames[gt->tm_wday],
++                 gt->tm_mday, MonthNames[gt->tm_mon], 1900+gt->tm_year, gt->tm_hour,
++                 gt->tm_min, gt->tm_sec, signoff, hrsoff, minsoff);
++	//#else
++        //clock=time(0);
++        //gt = localtime(&clock);
++	//gettimeofday(&tp, &tzp);
++	//tm_zone = (char *)timezone(tzp.tz_minuteswest, gt->tm_isdst);
++	//secsoff = tzp.tz_minuteswest * 60;
++	//#else
++        secsoff= gt->tm_gmtoff;
++	//#endif
++        if (secsoff < 0) {
++            signoff = '-';
++            secsoff *= -1;
++        }
++        hrsoff = secsoff / 3600;
++        minsoff = (secsoff - (3600*hrsoff)) / 60;
++        fprintf(fpout, "Date: %s, %02d %s %d %02d:%02d:%02d %c%02d%02d (%s)\n",
++		DayNames[gt->tm_wday], gt->tm_mday, MonthNames[gt->tm_mon],
++		1900+gt->tm_year, gt->tm_hour, 
++		gt->tm_min, gt->tm_sec, signoff, hrsoff, minsoff, gt->tm_zone);
++
++        if( MessageID) {
++            fprintf(fpout, "Message-Id: <%d.%s.%s>\n",whichpart,id,MessageID);
++        }
++        fprintf(fpout, "Subject: %s (part %d of ", SubjectBuf, whichpart);
++        if (numparts > 0) {
++            fprintf(fpout, "%d)\n", numparts);
++        } else {
++            fprintf(fpout, "several)\n");
++        }
++        fprintf(fpout, "Content-type: message/partial; id=\"%s\"; number=%d", id, whichpart);
++        if (numparts > 0) fprintf(fpout, "; total=%d", numparts);
++        fprintf(fpout, "\nMIME-Version: 1.0\n\n");
++    }
++    fputs(bigbuf, fpout);
++    code = DoDeliver ? pclose(fpout) : fclose(fpout);
++    if (code) {
++        fprintf(stderr, "splitmail: %s of part %d failed\n", DoDeliver ? "Delivery" : "Writing", whichpart);
++        if (whichpart > 1) fprintf(stderr, "  (previous %d parts may have succeeded)\n", whichpart -1);
++        exit(-1);
++    }
++}
++
++static char *SharedHeads[] = {
++    "from",
++    "to",
++    "cc",
++    "bcc",
++    "newsgroup",
++    "newsgroups",
++    NULL
++};
++
++ShareThisHeader(s, SubjectBuf, size, OrigID)
++char *s;
++char *SubjectBuf;
++size_t size;
++char **OrigID;
++{
++    int i;
++    char *colon = index(s, ':');
++    if (!colon) return(0); /* don't share it in all parts */
++    *colon = '\0';
++    if (!ULstrcmp(s, "message-id")) {
++        *colon = ':';
++	*OrigID = malloc(1+strlen(++colon));
++	if (! *OrigID) {
++	    fprintf(stderr, "splitmail: Not enough memory\n");
++	    exit(-1);
++	}
++	while (*colon && isspace(*colon)) {++colon;}
++        strcpy(*OrigID, colon);
++        return(0);
++    }
++    if (!ULstrcmp(s, "subject")) {
++        *colon = ':';
++        strncpy(SubjectBuf, ++colon, size);
++        SubjectBuf[size - 1] = '\0';
++        return(0);
++    }
++    if (!ULstrcmp(s, "content-type")) {
++        if (IllegalContentType(colon+1)) {
++            fprintf(stderr, "splitmail: message has illegal content-type header, delivery cancelled.\n");
++            exit(-1);
++        }
++    }
++    for (i=0; SharedHeads[i]; ++i) {
++	if (!ULstrcmp(s, SharedHeads[i])) break;
++    }
++    *colon = ':';
++    return(SharedHeads[i] ? 1 : 0);
++}
++
++static char *tspecials = "()<>@,;:\\\"/[]?.=";
++
++IllegalContentType(ctype)
++char *ctype;
++{
++    char *ct, *semicolon, *st, *s, *param, *eq, *matcheq;
++    ct = malloc(1+strlen(ctype));
++    if (!ct) {
++        fprintf(stderr, "splitmail: out of memory!\n");
++        exit(-1);
++    }
++    strcpy(ct, ctype);
++    semicolon = index(ct, ';');
++    if (semicolon) *semicolon = 0;
++    st = index(ct, '/');
++    if (!st) {
++        fprintf(stderr, "Illegal content-type specification: %s\nAll MIME content-type headers must contain a type/subtype specification.\n", ctype);
++        return(-1);
++    }
++    if (st) *st++ = 0;
++    for (s = ct; *s; ++s) {
++        if (!isprint(*s) || index(tspecials, *s)) {
++            fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in a MIME content-type.\n", ctype, *s, *s);
++            return(-1);
++        }
++    }
++    for (s = st; s && *s; ++s) {
++        if (!isprint(*s) || index(tspecials, *s)) {
++            fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in a MIME content-subtype.\n", ctype, *s, *s);
++            return(-1);
++        }
++    }
++    while (semicolon) {
++        param = ++semicolon;
++        while (*param && isspace(*param)) ++param;
++        semicolon = index(param, ';');
++        if (semicolon) *semicolon = 0;
++        eq = index(param, '=');
++        if (eq) *eq++ = 0;
++        for (s = param; *s; ++s) {
++            if (!isprint(*s) || index(tspecials, *s)) {
++                fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in a MIME content-type parameter name.\n", ctype, *s, *s);
++                return(-1);
++            }
++        }
++        while (*eq && isspace(*eq)) ++eq;
++        if (*eq == '\"') {
++            matcheq = eq;
++            do {
++                matcheq = index(matcheq+1, '\"');
++                if (!matcheq) {
++                    fprintf(stderr, "Illegal content-type specification: %s\nA quoted MIME parameter value must have matching quotation marks.\n", ctype);
++                    return(-1);
++                }
++            } while (*(matcheq-1) == '\\');
++            while (*++matcheq) {
++                if (!isspace(*matcheq)) {
++                    fprintf(stderr, "Illegal content-type specification: %s\nA quoted MIME parameter value must stop after the closing quotation mark.\n", ctype);
++                    return(-1);
++                }
++            }
++        } else {
++            for (s = eq; s && *s; ++s) {
++                if (!isprint(*s) || index(tspecials, *s)) {
++                    fprintf(stderr, "Illegal content-type specification: %s\nThe character '%c' (ASCII %d) is illegal in an unquoted MIME parameter value.\n", ctype, *s, *s);
++                    return(-1);
++                }
++            }
++        }
++    }
++    free(ct);
++    return(0);
++}
++
++int ULstrcmp(s1, s2)
++register char *s1, *s2;
++{
++    char c1,c2;
++
++    for(;;) {
++	c1 = *s1++; if (c1 <= 'Z') if (c1 >= 'A') c1 += 040;
++	c2 = *s2++; if (c2 <= 'Z') if (c2 >= 'A') c2 += 040;
++	if (c1 != c2) break;
++	if (c1 == '\0') return(0);
++    }
++    return(c1 - c2);
++}
++
++/* STILL TO DO:  
++  Get number of parts right when possible 
++*/
+--- metamail-2.7.orig/src/metamail/mailto.c
++++ metamail-2.7/src/metamail/mailto.c
+@@ -0,0 +1,2433 @@
++/*
++Copyright (c) 1992 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++*/
++
++/* 
++Program: mailto
++Author: Nathaniel S. Borenstein
++
++   This is a program that allows users to send MIME-format mail with much 
++   the same user interface as the Berkeley mail program.  
++
++   However, it should be stressed that this program includes
++   ABSOLUTELY NO CODE taken from Berkeley mail -- it is a 
++   "clean" reimplementation.
++
++   The user interface is directly modelled on Berkeley mail,
++   and the desiderata for its design are taken from the man
++   page for that program.
++
++   For information on using this program, consult the man page.
++
++STILL NEED TO DO/SUPPORT:
++
++-- Replace the main fgets call with something that allows in-line escape codes to do the equivalent of the tilde escapes.  Handle margins, centering, excerpts, EightBitMode, and RightToLeft mode properly.
++-- Replace EditString with something that does the right thing in-line.
++*/
++
++#include <metamail/common.h>
++
++#include <curses.h>  /* This and next for tgetstr(3X) and kin */
++#include <term.h>
++
++#include "metamail.h"
++#include "metamail_default.h"
++
++struct mailpart *CreateNewPart();
++char *getmyname(); /* Defined in shared.c */
++
++
++/* The main data structure for the multiple parts of the mail */
++
++struct mailpart {
++    int istext;
++    int isrich;
++    char *content_type;
++    int encoding_type_needed;
++    char *filename;
++    struct MailcapEntry *mc;
++    struct mailpart *next, *prev;
++};
++
++/* Some globals */
++struct mailpart *FirstPart = NULL;
++static char *Subject = NULL, *ToList = NULL, *CCList= NULL, *InReplyTo = NULL;
++FILE *fpout = NULL;
++static char *CharacterSet = NULL;
++static int PartEndsWithNewline=1;
++static int SplitSize=DEFAULT_SPLIT_SIZE;
++
++char *deadLetter = "dead.letter";
++char *signature = ".signature";
++char *mimeSignature = ".SIGNATURE";
++#define TMPFILE_NAME_SIZE   1000
++#define FILE_NAME_SIZE      1000
++
++#define DEFAULT_EDITOR      "vi"
++
++#define SYSTEM(command)     system(command);
++
++
++/* The following are the globals that can be set via .mailrc */
++int  V_askcc=0, /* To ask about the Cc field */
++     V_dot=0, /* To take a period as the end of input */
++     V_ignore=0, /* To ignore interrupts */
++     V_verbose=0, /* To run sendmail with -v */
++     V_quiet=0, /* To suppress various informational output */
++     V_keepblind=0, /* To receive a blind copy of outgoing mail. */
++     V_commasonly=0; /* To suppress using spaces as address separators */
++
++/* Codes for encoding_type_needed */
++#define ENC_NONE 0
++#define ENC_QP 1 /* quoted-printable */
++#define ENC_B64 2 /* base64 */
++
++/* Codes for JustificationState */
++#define JUST_LEFT 0
++#define JUST_RIGHT 1
++#define JUST_CENTER 2
++int JustificationState = JUST_LEFT;
++
++
++EightBitCharHelp() {
++    if (!CharacterSet || !strcmp(CharacterSet, "us-ascii")) {
++        printf("There are no extended characters available for your US-ASCII terminal.\n\n");
++        printf("If you are actually using a terminal or terminal emulator with a richer\ncharacter set, you must use the '-a' option or the 'MM_CHARSET' environment\nvariable to inform this program of that fact.\n");
++    } else {
++        static char *kbd1[] =
++          {
++            "1234567890-=",
++            "qwertyuiop[]",
++            "asdfghjkl;'`",
++            "zxcvbnm,./\\",
++            NULL
++        };
++        static char *kbd2[] = /* MUST have same # of entries as kbd1 */
++          {
++            "!@#$%^&*()_+",
++            "QWERTYUIOP{}",
++            "ASDFGHJKL:\"~",
++            "ZXCVBNM<>?|",
++            NULL
++        };
++        char *s;
++        int i, ct;
++
++        printf("Here is the keyboard map for the character set %s\n.If your terminal does not really use this character set, this may look strange.\n\n", CharacterSet);
++        for (i=0; kbd1[i]; ++i) {
++            for (ct=0, s=kbd1[i]; *s; ++s) {
++                printf("%c%c ", *s, (*s) + 128);
++                ct+=3;
++            }
++            while (ct++<40) printf(" ");
++            for (s=kbd2[i]; *s; ++s) {
++                printf("%c%c ", *s, (*s) + 128);
++            }
++            printf("\n");
++        }
++    }
++}            
++
++char *
++tmpname() {
++    char *s = malloc(30);
++    if (!s) nomemabort();
++    {
++        char *tmproot = getenv("METAMAIL_TMPDIR");
++        if (!tmproot) tmproot="/tmp";
++        if (strlen(tmproot) > 19) {
++            free(s);
++            s=malloc(12+strlen(tmproot));
++            if (!s) nomemabort();
++        }
++        sprintf(s, "%s/mm.XXXXXX", tmproot);
++    }
++    return(s);
++}
++
++TildeHelp() {
++    char *pager = getenv("PAGER");
++    char TmpName[100], CmdBuf[150];
++    FILE *fp;
++
++    strcpy(TmpName, tmpname());
++    fp = fdopen(mkstemp(TmpName), "w");
++    if (!fp) fp = stdout;
++    fprintf(fp, "The following tilde escapes are BSD-mail-compatible:\n");
++    fprintf(fp, "~? Show help on tilde escapes\n");
++    fprintf(fp, "~| RESERVED FOR BSD MAIL COMPATIBILITY\n");
++    fprintf(fp, "~f RESERVED FOR BSD MAIL COMPATIBILITY\n");
++    fprintf(fp, "~m RESERVED FOR BSD MAIL COMPATIBILITY\n");
++    fprintf(fp, "~! Shell escape\n");
++    fprintf(fp, "~~ Enter text line starting with a tilde\n");
++    fprintf(fp, "~. Send the mail and exit\n");
++    fprintf(fp, "~c Add to Cc list\n");
++    fprintf(fp, "~d Read from %s (or named file, ~d filename)\n", deadLetter);
++    fprintf(fp, "~e Edit message being composed\n");
++    fprintf(fp, "~h Edit the headers\n");
++    fprintf(fp, "~p Print out the message so far\n");
++    fprintf(fp, "~q Quit, copying to %s\n", deadLetter);
++    fprintf(fp, "~r Read the named text file into the message\n");
++    fprintf(fp, "~s Reset the subject\n");
++    fprintf(fp, "~t Add to To list\n");
++    fprintf(fp, "~v Edit using VISUAL editor\n");
++    fprintf(fp, "~w Write message to named file\n");
++    fprintf(fp, "\n");
++    fprintf(fp, "The following tilde escapes are unique to this program:\n");
++    fprintf(fp, "~/<number> Set maximum size before message is split into multiple parts\n");
++    fprintf(fp, "~?+ Show help on extended (eight-bit) characters\n");
++    fprintf(fp, "~> Indent Left Margin\n");
++    fprintf(fp, "~< Unindent Left Margin\n");
++    fprintf(fp, "~<R Indent Right Margin\n");
++    fprintf(fp, "~>R Unindent Right Margin\n");
++    fprintf(fp, "~+ Enter 8-bit mode for non-ASCII characters\n");
++    fprintf(fp, "~- Leave 8-bit mode (return to ASCII)\n");
++    fprintf(fp, "~^ Toggle \"Upside-down\" (right-to-left) mode.\n");
++    fprintf(fp, "~* Add non-text data (pictures, sounds, etc.) as a new MIME part (try it!)\n");
++    fprintf(fp, "~b Toggle bold mode\n");
++    fprintf(fp, "~i Toggle italic mode\n");
++    fprintf(fp, "~j Alter Justification (~jc = center, ~jl = flushleft, ~jr = flushright.)\n");
++    fprintf(fp, "~k Toggles whether or not to keep a 'blind' copy of your mail\n");
++    fprintf(fp, "~n Force newline (hard line break)\n");
++    fprintf(fp, "~Q Toggle quotation (excerpt) mode\n");
++    fprintf(fp, "~S Toggle Semitic text mode (combines 8-bit and left-to-right)\n");
++    fprintf(fp, "~u Toggle underline mode\n");
++    fprintf(fp, "~z Add the contents of %s as a TEXT signature.\n", signature);
++    fprintf(fp, "~Z Add the contents of %s as a NON-TEXT (MIME-format) signature.\n", mimeSignature);
++    fprintf(fp, "For further information, read the man page.\n");
++    fprintf(fp, "\n");
++    if (fp != stdout) {
++        fclose(fp);
++        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", pager ? pager : "sensible-pager", TmpName);
++        SYSTEM(CmdBuf);
++        unlink(TmpName);
++    }
++}
++
++char *gethome() {
++    struct passwd *p = getpwuid(getuid());
++    if (!p || !p->pw_dir) {
++        perror("Cannot find your home directory, using /tmp");
++        return("/tmp");
++    }
++    return (p->pw_dir);
++}
++
++
++static char standoutbuf[50], standendbuf[50], StartUnderline[50], StopUnderline[50], BoldOn[50], BoldOff[50], KS[50], KE[50];
++static int termcolumns, termrows;
++
++InitTerminal() {
++    char tbuf[1024], *term, *dum;
++
++    term = getenv("TERM");
++    if (term && tgetent(tbuf, term) != 1) {
++        term = NULL;
++    }
++    if (term) {
++        dum = KS;
++        if (tgetstr("ks", &dum)) *dum = '\0'; else KS[0] = '\0';
++        dum = KE;
++        if (tgetstr("ke", &dum)) *dum = '\0'; else KE[0] = '\0';
++        dum = standoutbuf;
++        if (tgetstr("so", &dum)) *dum = '\0'; else standoutbuf[0] = '\0';
++        dum = standendbuf;
++        if (tgetstr("se", &dum)) *dum = '\0'; else standendbuf[0] = '\0';
++        dum = BoldOn;
++        if (tgetstr("md", &dum)) *dum = '\0'; else strcpy(BoldOn, standoutbuf);
++        dum = BoldOff;
++        if (tgetstr("me", &dum)) *dum = '\0'; else strcpy(BoldOff, standendbuf);
++        dum = StartUnderline;
++        if (tgetstr("us", &dum)) *dum = '\0'; else StartUnderline[0] = '\0';
++        dum = StopUnderline;
++        if (tgetstr("ue", &dum)) *dum = '\0'; else StopUnderline[0] = '\0';
++        termcolumns = tgetnum("co");
++        if (termcolumns <= 0) termcolumns = 80;
++        termrows = tgetnum("li");
++        if (termrows <= 0) termrows = 23;
++    } else {
++        KS[0] = '\0';
++        KE[0] = '\0';
++        standoutbuf[0] = '\0';
++        standendbuf[0] = '\0';
++        BoldOn[0] = '\0';
++        BoldOff[0] = '\0';
++        StartUnderline[0] = '\0';
++        StopUnderline[0] = '\0';
++        termcolumns = 80;
++        termrows = 23;
++    }
++    fputs(KS, stdout);
++}
++
++FinalizeTerminal() {
++    tfputs(standendbuf);
++    tfputs(BoldOff);
++    tfputs(StopUnderline);
++}
++
++struct mailpart *
++NewPart() {
++    struct mailpart *p;
++    p = (struct mailpart *) malloc(sizeof(struct mailpart));
++    if (!p) nomemabort();
++    p->istext = 1;
++    p->isrich = 0;
++    p->content_type = "text/plain";
++    p->encoding_type_needed = ENC_NONE;
++    p->filename = tmpname();
++    p->mc = NULL;
++    p->next = NULL;
++    p->prev = NULL;
++    return(p);
++}
++
++nomemabort() {
++    fprintf(stderr, "mailto: Out of memory\n");
++    cleanexit(-1);
++}
++
++char *
++freshcopy(s)
++char *s;
++{
++    char *t = malloc(1+strlen(s));
++    if (!t) nomemabort();
++    strcpy(t, s);
++    return(t);
++}
++
++char *
++GetLineMalloced(prompt, def)
++char *prompt, *def;
++{
++    char Sbuf[1000], *ans;
++    printf("%s: ", prompt);
++    fflush(stdout);
++    ans = fgets(Sbuf, sizeof(Sbuf), stdin);
++    if (ans) {
++        /* Need a fresh copy */
++        ans = malloc(1+strlen(Sbuf));
++        if (!ans) nomemabort();
++        strcpy(ans, Sbuf);
++        ans[strlen(ans) - 1] = '\0'; /* trash newline */
++    } else {
++        /* Callers will free() this, so make a fresh copy as well */
++        ans = malloc(1+strlen(def));
++        if (!ans) nomemabort();
++        strcpy(ans, def);
++    }
++    return(ans);
++}
++
++char *
++EditString(prompt, s)
++char *prompt, *s;
++{
++    char *ans;
++    char NewPrompt[500];
++    if (!s) s = "";
++    snprintf(NewPrompt, sizeof(NewPrompt), "%s [%s]", prompt, s);
++    ans = GetLineMalloced(NewPrompt, s);
++    while (*ans && isspace((unsigned char) *ans)) ++ans;
++    if (!*ans) return(s);
++    return(ans);
++}
++
++char *
++AddCommasToAddressList(s)
++char *s;
++{
++    int spaces = 0;
++    char *t, *ans, *ansptr;
++
++    if (V_commasonly) {
++        ans = malloc(1+strlen(s));
++        if (!ans) nomemabort;
++        strcpy(ans, s);
++        return(ans);
++    }
++    for (t=s; *t; ++t) {
++        if (*t == ' ') ++spaces;
++    }
++    /* That provides a max size for the mallocs */
++    ans = malloc(1+strlen(s) +spaces);
++    if (!ans) nomemabort();
++    ansptr = ans;
++    for (t=s; *t; ++t) {
++        if (*t == ' ' && *(t-1) != ',') {
++            *ansptr++ = ',';
++        }
++        *ansptr++ = *t;
++    }
++    *ansptr = '\0';
++    while (--ansptr > ans && (isspace((unsigned char) *ansptr) || *ansptr == ',')) {
++        *ansptr = '\0';
++    }
++    return(ans);
++}
++
++char *
++AddToList(List, entry, definitelynew)
++char *List, *entry;
++int definitelynew;
++{
++    int len;
++    char *end = entry+strlen(entry);
++
++    while (--end >= entry && isspace((unsigned char) *end)) *end = '\0';
++    if (! *entry) return(List);
++    if (List && *List) {
++        List = realloc(List, strlen(List) + strlen(entry) + 5);
++        if (!List) nomemabort();
++        if (V_commasonly && !definitelynew) {
++            strcat(List, " ");
++        } else {
++            strcat(List, ", ");
++        }
++        strcat(List, entry);
++    } else {
++        List = malloc(strlen(entry) + 2);
++        if (!List) nomemabort();
++        strcpy(List, entry);
++    }
++    len = strlen(List);
++    while (List[--len] == ',') List[len] = '\0';
++    return(List);
++}
++
++main(argc, argv)
++char **argv;
++{
++    char *sdum, *LineBuf, CmdBuf[100];
++    int i, EightBitMode = 0, RightToLeftMode = 0, AllDone=0, EightBitSeen=0, prevaddrdone=1;
++    FILE *fpin;
++    struct mailpart *CurrentPart=NULL;
++
++    if ((LineBuf = malloc(MAX_LINELENGTH)) == NULL) {
++        fprintf(stderr, "mailto: Unable to allocate memory\n");
++        exit(10);
++    }
++    ProcessInitFiles();
++    InitSignals();
++    InitTerminal();
++    sdum = getenv("SPLITSIZE");
++    if (sdum) {
++        i = atoi(sdum);
++        if (i < MINCHUNKSIZE) {
++            fprintf(stderr, "Ignoring SPLITSIZE environment variable of %d -- the minimum value is %d\n", i, MINCHUNKSIZE);
++        } else {
++            SplitSize = i;
++        }
++    }
++
++    CharacterSet = getenv("MM_CHARSET");
++    for (i=1; i<argc; ++i) {
++        if (argv[i][0] == '-') {
++            switch (argv[i][1]) {
++                case 'a':
++                    if (argv[i][2]) {
++                        CharacterSet = &argv[i][2];
++                    } else if (++i < argc) {
++                        CharacterSet = argv[i];
++                    } else {
++                        fprintf(stderr, "mailto: -a requires a character set specification to follow\n");
++                        cleanexit(-1);
++                    }
++                    break;
++                case 'c':
++                    if (argv[i][2]) {
++                        CCList = &argv[i][2];
++                    } else if (++i < argc) {
++                        CCList = argv[i];
++                    } else {
++                        CCList = "";
++                    }
++                    break;
++                case 'r':
++                    if (argv[i][2]) {
++                        InReplyTo = &argv[i][2];
++                    } else if (++i < argc) {
++                        InReplyTo = argv[i];
++                    } else {
++                        fprintf(stderr, "mailto: -r requires a Message-ID to follow\n");
++                        cleanexit(-1);
++                    }
++                    break;
++                case 's':
++                    if (argv[i][2]) {
++                        Subject = &argv[i][2];
++                    } else if (++i < argc) {
++                        Subject = argv[i];
++                    } else {
++                        fprintf(stderr, "mailto: -s requires a subject specification to follow\n");
++                        cleanexit(-1);
++                    }
++                    break;
++                default:
++                    fprintf(stderr, "mailto:  Unrecognized option %s\n", argv[i]);
++                    cleanexit(-1);
++            }
++        } else {
++            /* It's an address, I guess */
++            ToList = AddToList(ToList, argv[i], prevaddrdone);
++            prevaddrdone = (argv[i][strlen(argv[i]) -1] == ',') ? 1 : 0;
++        }
++    }
++    if (!CharacterSet) CharacterSet = "us-ascii";
++    for (sdum = CharacterSet; *sdum; ++sdum) {
++        if (isupper(*sdum)) *sdum = tolower(*sdum);
++    }
++    if (strcmp(CharacterSet, "us-ascii")
++	 && strcmp(CharacterSet, "kio8-r")
++	 && strncmp(CharacterSet, "iso-8859-", 9)) {
++        fprintf(stderr, "mailto:  Unsupported character set: %s\n", CharacterSet);
++        exit(-1);
++    }
++    if (strcmp(CharacterSet, "us-ascii")) {
++        printf("Composing mail in character set %s\n", CharacterSet);
++    }
++    ProcessMailcapFiles();
++    if (!ToList) {
++        sdum=GetLineMalloced("To", "");
++        ToList=AddCommasToAddressList(sdum);
++        free(sdum);
++    }
++    if (!Subject) Subject=GetLineMalloced("Subject", "<NO SUBJECT>");
++    if (!CCList && V_askcc) {
++        sdum = GetLineMalloced("Cc", "");
++        CCList = AddCommasToAddressList(sdum);
++        free(sdum);
++    }
++    FirstPart = NewPart();
++    CurrentPart = FirstPart;
++    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
++    if (!fpout) {
++        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
++        cleanexit(-1);
++    }
++    while (!AllDone && fgets(LineBuf, MAX_LINELENGTH, stdin) != NULL) {
++        if (V_dot && LineBuf[0] == '.' && LineBuf[1] == '\n') {
++            AllDone = 1;
++        } else if (LineBuf[0] == '~') {
++            /* Clean up argument */
++            char *start = LineBuf+2;
++            char *end = start + strlen(start);
++            while (--end > start && isspace((unsigned char) *end)) *end = '\0';
++            while (isspace((unsigned char) *start)) ++start;
++            switch (LineBuf[1]) {
++                case '.':
++                    AllDone = 1;
++                    break;
++                case '?':
++                    if (*start == '+') {
++                        EightBitCharHelp();
++                    } else {
++                        TildeHelp();
++                    }
++                    break;
++                case '~':
++                    FputsQuotingLT(LineBuf+1, fpout, CurrentPart, EightBitMode, RightToLeftMode);
++                    break;
++                case '!':
++                    if (!V_quiet) printf("Executing: %s\n", start);
++                    SYSTEM(start);
++                    break;
++                case '>':
++                    CurrentPart->isrich = 1;
++                    fputs("<nl>", fpout);
++                    if (*start=='r' || *start == 'R') {
++                        TryClosingStyle("indentright", fpout, CurrentPart);
++                    } else {
++                        TryOpeningStyle("indent", fpout, CurrentPart, NULL);
++                    }
++                    break;
++                case '<':
++                    CurrentPart->isrich = 1;
++                    fputs("<nl>", fpout);
++                    if (*start == 'R' || *start == 'r') {
++                        TryOpeningStyle("indentright", fpout, CurrentPart, NULL);
++                    } else {
++                        TryClosingStyle("indent", fpout, CurrentPart);
++                    }
++                    break;
++                case '/':
++                    i = atoi(start);
++                    if (i < MINCHUNKSIZE) {
++                        fprintf(stderr, "Ignoring splitsize setting of %d -- the minimum value is %d\n", i, MINCHUNKSIZE);
++                    } else {
++                        SplitSize = i;
++                        if (!V_quiet) printf("Set splitsize to %d\n", i);
++                    }
++                    break;
++                case '+':
++                    if (!strcmp(CharacterSet, "us-ascii")) {
++                        fprintf(stderr, "mailto:  No 8-bit characters allowed in ASCII mail\n");
++                    } else {
++                        EightBitMode = 1;
++                        if (!V_quiet) printf("Entering text in eight-bit mode\n");
++                    }
++                    break;
++                case '-':
++                    EightBitMode = 0;
++                    if (!V_quiet) printf("Entering text in seven-bit (normal) mode\n");
++                    break;
++                case '^':
++                    RightToLeftMode = ! RightToLeftMode;
++                    if (!V_quiet) printf("%s right-to-left mode\n", RightToLeftMode ? "Entering" : "Exiting");
++                    break;
++                case '*':
++                    {
++                    struct mailpart *p = CreateNewPart();
++                    if (!p) break;
++                    TempCloseStyles(fpout);
++                    fclose(fpout);
++                    CurrentPart->next = p;
++                    CurrentPart->next->prev = CurrentPart;
++                    CurrentPart = CurrentPart->next;
++                    CurrentPart->next = NewPart();
++                    CurrentPart->next->prev = CurrentPart;
++                    CurrentPart = CurrentPart->next;
++                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
++                        cleanexit(-1);
++                    }
++                    ReopenStyles(fpout, CurrentPart);
++                    break;
++                    }
++                case 'b':
++                    ToggleStyle("bold", fpout, CurrentPart, BoldOn, BoldOff);
++                    break;
++                case 'c':
++                    CCList = AddToList(CCList, start, 1);
++                    if (!V_quiet) printf("Cc field is now: %s\n", CCList);
++                    break;
++                case 'd':
++                    {
++                    char fnam[FILE_NAME_SIZE];
++                    if (! *start) {
++                        snprintf(fnam, sizeof(fnam), "%s/dead.letter", gethome());
++                    } else {
++                        strcpy(fnam, start);
++                    }
++                    fpin = fopen(fnam, "r");
++                    if (!fpin) {
++                        fprintf(stderr, "mailto: Cannot open file %s\n", fnam);
++                        break;
++                    }
++                    TempCloseStyles(fpout);
++                    fclose(fpout);
++                    CurrentPart->next = NewPart();
++                    CurrentPart->next->prev = CurrentPart;
++                    CurrentPart = CurrentPart->next;
++                    CurrentPart->istext = 0;
++                    CurrentPart->content_type = "message/rfc822";
++                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto: Cannot open temporary file %s\n", CurrentPart->filename);
++                        break;
++                    }
++                    (void) TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
++                    fclose(fpin);
++                    fclose(fpout);
++                    printf("Included contents of %s\n(continue)\n", fnam);
++                    CurrentPart->next = NewPart();
++                    CurrentPart->next->prev = CurrentPart;
++                    CurrentPart = CurrentPart->next;
++                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
++                        cleanexit(-1);
++                    }
++                    ReopenStyles(fpout, CurrentPart);
++                    break;
++                    }
++                case 'e':
++                    EditCurrentMessage(0);
++                    break;
++                case 'h':
++                    ToList = AddCommasToAddressList(EditString("To", ToList));
++                    Subject = EditString("Subject", Subject);
++                    CCList = AddCommasToAddressList(EditString("Cc", CCList));
++                    break;
++                case 'i':
++                    ToggleStyle("italic", fpout, CurrentPart, standoutbuf, standendbuf);
++                    break;
++                case 'j':
++                    {
++                    int NewJustificationState;
++                    switch (*start) {
++                        case 'c':
++                        case 'C':
++                            NewJustificationState = JUST_CENTER;
++                            break;
++                        case 'r':
++                        case 'R':
++                            NewJustificationState = JUST_RIGHT;
++                            break;
++                        case 'l':
++                        case 'L':
++                            NewJustificationState = JUST_LEFT;
++                            break;
++                        default:
++                            printf("mailto: Unrecognized justification state: %c\n", *start);
++                            NewJustificationState = JustificationState;
++                    }
++                    if (JustificationState == NewJustificationState) {
++                        if (!V_quiet) printf("mailto:  No change in justificiation\n");
++                    } else {
++                        if (CurrentPart->isrich) {
++                            if (JustificationState == JUST_CENTER) {
++                                EndStyle(fpout, "center");
++                            } else if (JustificationState == JUST_RIGHT) {
++                                EndStyle(fpout, "flushright");
++                            } else {
++                                EndStyle(fpout, "flushleft");
++                            }
++                        }
++                        CurrentPart->isrich = 1;
++                        fputs("<nl>", fpout);
++                        JustificationState = NewJustificationState;
++                        if (JustificationState == JUST_CENTER) {
++                            StartStyle(fpout, "center", NULL);
++                        } else if (JustificationState == JUST_RIGHT) {
++                            StartStyle(fpout, "flushright", NULL);
++                        } else {
++                            StartStyle(fpout, "flushleft", NULL);
++                        }
++                    }
++                    break;
++                    }
++                case 'k':
++                    V_keepblind = ! V_keepblind;
++                    if (!V_quiet) printf("%s keep a blind copy of this message\n", V_keepblind ? "Will" : "Won't");
++                    break;
++                case 'n':
++                    CurrentPart->isrich = 1;
++                    fputs("<nl>", fpout);
++                    if (!V_quiet) printf("Inserted line break\n");
++                    break;
++                case 'p':
++                    {
++                    FILE *fptmp;
++                    char Cmd[TMPFILE_NAME_SIZE + 15];
++                    char *s=tmpname();
++                    fclose(fpout);
++                    fptmp = fdopen(mkstemp(s), "w");
++                    WriteOutMessage(fptmp, ToList, Subject, CCList, FirstPart);
++                    TempCloseStyles(fptmp);
++                    fclose(fptmp);
++                    fpout = fopen(CurrentPart->filename, "a");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
++                        cleanexit(-1);
++                    }
++                    snprintf(Cmd, sizeof(Cmd), "metamail -z %s", s);
++                    SYSTEM(Cmd);
++                    free(s);
++                    RestoreCurrentStyles();
++                    break;
++                    }
++                case 'q':
++                    TempCloseStyles(fpout);
++                    fclose(fpout);
++                    if (!WriteDeadLetter()) cleanexit(0);
++                    break;
++                case 'Q':
++                    ToggleStyle("excerpt", fpout, CurrentPart, NULL, NULL);
++                    break;
++                case 'r':
++                    if (! *start) {
++                        printf("mailto: No file name given.\n");
++                        break;
++                    }
++                    fpin = fopen(start, "r");
++                    if (!fpin) {
++                        fprintf(stderr, "mailto: Cannot open file %s\n", start);
++                        break;
++                    }
++                    EightBitSeen = TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
++                    if (EightBitSeen 
++                         && (CurrentPart->istext || CurrentPart->isrich)) {
++                        if (CurrentPart->encoding_type_needed == ENC_NONE) {
++                            CurrentPart->encoding_type_needed = ENC_QP;
++                        }
++                        if (!strcmp(CharacterSet, "us-ascii")) {
++                            SwitchToEuropean();
++                        }
++                    }
++                    fclose(fpin);
++		    if (!V_quiet) printf("Included contents of %s\n", start);
++		    printf("(continue)\n");
++                    break;
++                case 'S':
++                    /* Semitic language mode toggle */
++                    if (EightBitMode) {
++                        EightBitMode = 0;
++                        RightToLeftMode = 0;
++                    } else {
++                        if (!strcmp(CharacterSet, "us-ascii")) {
++                            fprintf(stderr, "mailto:  No 8-bit characters allowed in ASCII mail\n");
++                            break;
++                        }
++                        EightBitMode = 1;
++                        RightToLeftMode = 1;
++                    }
++                    if (!V_quiet) printf("%s Eight-bit and right-to-left modes\n", RightToLeftMode ? "Entering" : "Exiting");
++                    break;
++                case 's':
++                    {
++                    char *subj=start;
++                    if (*subj) {
++                        Subject = freshcopy(subj);
++                    } else {
++                        Subject=GetLineMalloced("Subject", "<NO SUBJECT>");
++                    }
++                    break;
++                    }
++                case 't':
++                    ToList = AddToList(ToList, start, 1);
++                    if (!V_quiet) printf("To field is now: %s\n", ToList);
++                    break;
++                case 'u':
++                    ToggleStyle("underline", fpout, CurrentPart, StartUnderline, StopUnderline);
++                    break;
++                case 'v':
++                    EditCurrentMessage(1);
++                    break;
++                case 'w':
++                    {
++                    FILE *fptmp;
++                    char *fname;
++                    fclose(fpout);
++                    fname = start;
++                    fptmp = fopen(fname, "w");
++                    WriteOutMessage(fptmp, ToList, Subject, CCList, FirstPart);
++                    TempCloseStyles(fptmp);
++                    if(fclose(fptmp)) {
++                        fprintf(stderr, "Could not write file %s\n", fname);
++                    } else {
++                        printf("Wrote draft to %s\n", fname);
++                    }
++                    fpout = fopen(CurrentPart->filename, "a");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
++                        cleanexit(-1);
++                    }
++                    break;
++                    }
++                case 'z':
++                    {
++                    char FBuf[FILE_NAME_SIZE];
++                    if (! *start) {
++                        snprintf(FBuf, sizeof(FBuf), "%s/.signature", gethome());
++                    } else {
++                        strcpy(FBuf, start);
++                    }
++                    fpin = fopen(FBuf, "r");
++                    if (!fpin) {
++                        fprintf(stderr, "mailto: Cannot open file %s\n", FBuf);
++                        break;
++                    }
++                    CurrentPart->isrich = 1;
++                    StartStyle(fpout, "signature", NULL);
++                    EightBitSeen = TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
++                    if (EightBitSeen) {
++                        if (CurrentPart->encoding_type_needed == ENC_NONE) {
++                            CurrentPart->encoding_type_needed = ENC_QP;
++                        }
++                        if ((CurrentPart->istext || CurrentPart->isrich) && !strcmp(CharacterSet, "us-ascii")) {
++                            SwitchToEuropean();
++                        }
++                    }
++                    fclose(fpin);
++                    EndStyle(fpout, "signature");
++                    if (!V_quiet) printf("Included contents of %s\n", FBuf);
++		    printf("(continue)\n");
++                    break;
++                    }
++                case 'Z':
++                    {
++                    char fnam[FILE_NAME_SIZE];
++                    if (! *start) {
++                        snprintf(fnam, sizeof(fnam), "%s/.SIGNATURE", gethome());
++                    } else {
++                        strcpy(fnam, start);
++                    }
++                    fpin = fopen(fnam, "r");
++                    if (!fpin) {
++                        fprintf(stderr, "mailto: Cannot open file %s\n", fnam);
++                        break;
++                    }
++                    TempCloseStyles(fpout);
++                    fclose(fpout);
++                    CurrentPart->next = NewPart();
++                    CurrentPart->next->prev = CurrentPart;
++                    CurrentPart = CurrentPart->next;
++                    CurrentPart->istext = 0;
++                    CurrentPart->content_type = "message/rfc822";
++                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto: Cannot open temporary file %s\n", CurrentPart->filename);
++                        break;
++                    }
++                    EightBitSeen = TranslateInputToEncodedOutput(fpin, fpout, ENC_NONE, "");
++                    if (EightBitSeen &&
++                        (CurrentPart->istext || CurrentPart->isrich)) {
++                        if (CurrentPart->encoding_type_needed == ENC_NONE) {
++                            CurrentPart->encoding_type_needed = ENC_QP;
++                        }
++                        if (!strcmp(CharacterSet, "us-ascii")) {
++                            SwitchToEuropean();
++                        }
++                    }
++                    fclose(fpin);
++                    fclose(fpout);
++                    printf("Included contents of %s\n", fnam);
++		    printf("(continue)\n");
++                    CurrentPart->next = NewPart();
++                    CurrentPart->next->prev = CurrentPart;
++                    CurrentPart = CurrentPart->next;
++                    fpout = fdopen(mkstemp(CurrentPart->filename), "w");
++                    if (!fpout) {
++                        fprintf(stderr, "mailto:  Can't open temporary file %s\n", CurrentPart->filename);
++                        cleanexit(-1);
++                    }
++                    ReopenStyles(fpout, CurrentPart);
++                    break;
++                    }
++                default:
++                    printf("Unrecognized tilde escape: %c\n", LineBuf[1]);
++                    break;
++            }
++        } else {
++            FputsQuotingLT(LineBuf, fpout, CurrentPart, EightBitMode, RightToLeftMode);
++        }
++    }
++    TempCloseStyles(fpout);
++    fclose(fpout);
++    printf("EOT\n");
++    if (V_verbose) {
++        snprintf(CmdBuf, sizeof(CmdBuf), "splitmail -d -v -s %d", SplitSize);
++    } else {
++        snprintf(CmdBuf, sizeof(CmdBuf), "splitmail -d -s %d", SplitSize);
++    }
++    fpout = popen(CmdBuf, "w");
++    if (!fpout) {
++        fprintf(stderr, "mailto: Can't write to splitmail\n");
++        (void) WriteDeadLetter();
++        cleanexit(-1);
++    }
++    WriteOutMessage(fpout, ToList, Subject, CCList, FirstPart);
++    if (ferror(fpout) || pclose(fpout)) {
++        perror("mailto: Error writing to splitmail");
++        (void) WriteDeadLetter();
++        cleanexit(-1);
++    }
++    cleanexit(0); /* Never returns */
++}
++
++char *newid() {
++    static char idbuf[100];
++    static int ctr=0;
++
++    snprintf(idbuf, sizeof(idbuf), "<%d_%d_%d_%d@%s>", (int) getuid(), (int) getpid(), (int) time(0), ++ctr, getmyname());
++
++    return(idbuf);
++}
++
++WriteOutMessage(fp, ToList, Subject, CCList, FirstPart)
++FILE *fp;
++char *ToList, *Subject, *CCList;
++struct mailpart *FirstPart;
++{
++    FILE *fpin;
++    static int ctr = 0;
++    fprintf(fp, "MIME-Version: 1.0\n");
++    if (InReplyTo != NULL) {
++        EmitHeader(fp, "In-Reply-To", InReplyTo);
++    }
++    EmitHeaderWithAliases(fp, "To", ToList);
++
++    EmitHeader(fp, "Subject", Subject);
++    if (CCList && *CCList) EmitHeaderWithAliases(fp, "Cc", CCList);
++    if (V_keepblind) {
++        struct passwd *p = getpwuid(getuid());
++        if (!p) {
++            fprintf(stderr, "Can't find your user id to keep a blind copy\n");
++        } else {
++            EmitHeader(fp, "Bcc", p->pw_name);
++        }
++    }
++    fprintf(fp, "Message-ID: %s\n", newid());
++    if (!FirstPart) return; /* empty body */
++    if (FirstPart->next) {
++        char boundary[120];
++        snprintf(boundary, sizeof(boundary), "PART.BOUNDARY.%d.%d.%s.%d.%d",
++                 (int) getuid(), (int) getpid(), getmyname(), (int) time(0), ++ctr);
++        fprintf(fp, "Content-type: multipart/mixed;\n\tboundary=\"%s\"\n\n", boundary);
++        fprintf(fp, "> THIS IS A MESSAGE IN 'MIME' FORMAT.  Your mail reader does not support MIME.\n> Some parts of this will be readable as plain text.\n> To see the rest, you will need to upgrade your mail reader.\n");
++        while(FirstPart) {
++            /* First check to see if it is empty & text, in which case skip it */
++            if (FirstPart->istext) {
++                struct stat stbuf;
++                if (!stat(FirstPart->filename, &stbuf)) {
++                    if (stbuf.st_size == 0) {
++                        FirstPart = FirstPart->next;
++                        continue;
++                    }
++                }
++            }
++            fprintf(fp, "\n--%s\n", boundary);
++            WriteContentTypeAndEncoding(fp, FirstPart);
++            fprintf(fp, "\n");
++            fpin = fopen(FirstPart->filename, "r");
++            if (!fpin) {
++                fprintf(stderr, "Can't read temporary file %s\n", FirstPart->filename);
++                cleanexit(-1);
++            }
++            (void) TranslateInputToEncodedOutput(fpin, fp, FirstPart->encoding_type_needed, FirstPart->content_type);
++            fclose(fpin);
++            FirstPart = FirstPart->next;
++        }
++        fprintf(fp, "\n--%s--\n\n", boundary);
++    } else {
++        WriteContentTypeAndEncoding(fp, FirstPart);
++        fprintf(fp, "\n");
++        fpin = fopen(FirstPart->filename, "r");
++        if (!fpin) {
++            fprintf(stderr, "Can't read temporary file %s\n", FirstPart->filename);
++            cleanexit(-1);
++        }
++        (void) TranslateInputToEncodedOutput(fpin, fp, FirstPart->encoding_type_needed, FirstPart->content_type);
++        fclose(fpin);
++    }
++}
++
++WriteContentTypeAndEncoding(fp, part)
++FILE *fp;
++struct mailpart *part;
++{
++    fprintf(fp, "Content-ID: %s\n", newid());
++    if (part->istext) {
++        if (part->isrich) {
++            if (strcmp(CharacterSet, "us-ascii")
++		 && strcmp(CharacterSet, "koi8-r")
++		 && (strncmp(CharacterSet, "iso-8859-", 9) 
++                      || part->encoding_type_needed != ENC_NONE)) {
++                fprintf(fp, "Content-type: text/richtext; charset=\"%s\"\n", CharacterSet);
++            } else {
++                fprintf(fp, "Content-type: text/richtext\n");
++            }
++        } else {
++            fprintf(fp, "Content-type: ");
++            WriteCtypeNicely(fp, part->content_type);
++            if (strcmp(CharacterSet, "us-ascii")
++                 && (strncmp(CharacterSet, "iso-8859-", 9) 
++                      || part->encoding_type_needed != ENC_NONE)) {
++                fprintf(fp, "; charset=\"%s\"\n", CharacterSet);
++            } else fputs("\n", fp);
++        }
++    } else {
++        fprintf(fp, "Content-type: ");
++        WriteCtypeNicely(fp, part->content_type); /* fixes some syntactic junk */
++        fputs("\n", fp);
++    }
++    if (part->istext && part->isrich && part->encoding_type_needed == ENC_NONE) {
++        /* Don't you believe it... */
++        part->encoding_type_needed = ENC_QP;
++    }
++    if (part->encoding_type_needed == ENC_B64) {
++        fprintf(fp, "Content-Transfer-Encoding: base64\n");
++    } else if (part->encoding_type_needed == ENC_QP) {
++        fprintf(fp, "Content-Transfer-Encoding: quoted-printable\n");
++    }
++}
++
++TranslateInputToEncodedOutput(InputFP, OutputFP, Ecode, ctype)
++FILE *InputFP, *OutputFP;
++int Ecode;
++char *ctype;
++{
++    int c, EightBitSeen = 0;
++
++    switch(Ecode) {
++        case ENC_B64:
++            to64(InputFP, OutputFP, DoesNeedPortableNewlines(ctype));
++            break;
++        case ENC_QP:
++            toqp(InputFP, OutputFP);
++            break;
++        default:
++            while ((c = getc(InputFP)) != EOF){
++                if (c > 127) EightBitSeen = 1;
++                putc(c, OutputFP);
++            }
++    }
++    return(EightBitSeen);
++}
++
++#define	MAX_STACK_SIZE	500
++static int StackSize=0;
++static char *Stack[MAX_STACK_SIZE];
++static char *EnvStartStack[MAX_STACK_SIZE];
++
++/* The following two routines are used when richtext styles need to be 
++   kept open across an inserted object -- i.e. the richtext is split into 
++   two parts of a multipart message */
++
++TempCloseStyles(fp)
++FILE *fp;
++{
++    int i = StackSize;
++    while(--i>=0) {
++        fprintf(fp, "</%s>", Stack[i]);
++    }
++    tfputs(StopUnderline);
++    tfputs(standendbuf);
++    tfputs(BoldOff);
++    fflush(stdout);
++}
++
++RestoreCurrentStyles() {
++    int i=0;
++    while (i<StackSize) {
++        if (EnvStartStack[i]) {
++            tfputs(EnvStartStack[i]);
++        }
++        ++i;
++    }
++}
++
++ReopenStyles(fp, part)
++FILE *fp;
++struct mailpart *part;
++{
++    int i=0;
++    RestoreCurrentStyles();
++    if (StackSize > 0) part->isrich = 1;
++    while (i < StackSize) {
++        fprintf(fp, "<%s>", Stack[i++]);
++    }
++}
++
++richtextreset()
++{
++    StackSize = 0;
++}
++
++AlreadyInStyle(s)
++char *s;
++{
++    int i;
++    for (i=0; i<StackSize; ++i) {
++        if (!strcmp(Stack[i], s)) return(1);
++    }
++    return(0);
++}
++
++StartStyle(fp, s, envstartstr)
++FILE *fp;
++char *s;
++char *envstartstr;
++{
++    char *t;
++    fprintf(fp, "<%s>", s);
++    PartEndsWithNewline=0;
++    t = malloc(1+strlen(s));
++    if (!t) nomemabort();
++    strcpy(t, s);
++    EnvStartStack[StackSize] = envstartstr;
++    Stack[StackSize++] = t;
++    if (!V_quiet) printf("Beginning: %s\n", t);
++}
++
++EndStyle(fp, s)
++FILE *fp;
++char *s;
++{
++    int i = StackSize, j;
++    while(--i>=0) {
++        fprintf(fp, "</%s>", Stack[i]);
++        if (!strcmp(s, Stack[i])) break;
++    }
++    if (i>=0) {
++        free(Stack[i]);
++        --StackSize;
++        for (j=i; j<StackSize; ++j) {
++            Stack[j] = Stack[j+1];
++            EnvStartStack[j] = EnvStartStack[j+1];
++        }
++    } else i=0;
++    while (i<StackSize) {
++        fprintf(fp, "<%s>", Stack[i++]);
++    }
++    PartEndsWithNewline=0;
++    if (!V_quiet) printf("Ending: %s\n", s);
++}
++
++ToggleStyle(name, fp, part, turnonstr, turnoffstr)
++char *name;
++FILE *fp;
++struct mailpart *part;
++char *turnonstr, *turnoffstr;
++{
++    part->isrich = 1;
++    if (AlreadyInStyle(name)) {
++        EndStyle(fp, name);
++        if (turnoffstr) tfputs(turnoffstr);
++        RestoreCurrentStyles(); /* because on some terminals,
++                                  the same thing turns
++                                  off underlining AND bold */
++    } else {
++        StartStyle(fp, name, turnonstr);
++        if (turnonstr) tfputs(turnonstr);
++    }
++}
++
++TryOpeningStyle(name, fp, part, envstartstr)
++char *name;
++FILE *fp;
++struct mailpart *part;
++char *envstartstr;
++{
++    if (AlreadyInStyle(name)) {
++        printf("mailto: Already in %s style\n", name);
++    } else {
++        part->isrich = 1;
++        StartStyle(fp, name, envstartstr);
++    }
++}
++
++TryClosingStyle(name, fp, part)
++char *name;
++FILE *fp;
++struct mailpart *part;
++{
++    if (AlreadyInStyle(name)) {
++        part->isrich = 1;
++        EndStyle(fp, name);
++    } else {
++        printf("mailto: You aren't in a %s style\n", name);
++    }
++}
++
++FputsQuotingLT(s, fp, part, EightBitMode, RightToLeftMode)
++char *s;
++FILE *fp;
++struct mailpart *part;
++int EightBitMode, RightToLeftMode;
++{
++    static int InNewLineSequence=1;
++    int c=0;
++    char LBuf[1000], *sdum;
++    if (*s == '\n') {
++        if (InNewLineSequence) {
++            fputs("<nl>\n", fp);
++        } else {
++            fputs("<nl><nl>\n\n", fp);
++            InNewLineSequence = 1;
++        }
++        part->isrich = 1;
++        PartEndsWithNewline=1;
++        return;
++    }
++    InNewLineSequence = 0;
++    if (RightToLeftMode) {
++        sdum = s+strlen(s)-1;
++        if (*sdum == '\n') --sdum;
++        while (sdum >= s) {
++            LBuf[c++] = *sdum--;
++        }
++        LBuf[c++] = '\n';
++        LBuf[c] = '\0';
++        s = LBuf;
++    }
++    if (isspace((unsigned char) *s)) {
++        /* Lines that start with spaces should not be folded! */
++        fputs("<nl>", fp);
++        part->isrich = 1;
++    }
++    if (s) {
++        if (EightBitMode) part->encoding_type_needed = ENC_QP;
++        while (*s) {
++            c = (unsigned char) *s;
++            if (EightBitMode) {
++                if (isprint(c) && ! isspace(c)) {
++                    c = c+128;
++                }
++                putc(c, fp);
++                putc(c, stdout);
++            } else if (c == '<') {
++                part->isrich = 1;
++                fputs("<lt>", fp);
++            } else {
++                if (c > 127 || c < 0) {
++                    part->encoding_type_needed = ENC_QP;
++                    if (!strcmp(CharacterSet, "us-ascii")) {
++                        SwitchToEuropean();
++                    }
++                }
++                putc(c, fp);
++                if (RightToLeftMode) putc(c, stdout);
++            }
++            ++s;
++        }
++        PartEndsWithNewline = (c == '\n') ? 1 : 0;
++    }
++}
++
++cleanexit(code)
++int code;
++{
++    finalize();
++    exit(code);
++}
++
++finalize() {
++    while (FirstPart) {
++        unlink(FirstPart->filename);
++        FirstPart = FirstPart->next;
++    }
++    FinalizeTerminal();
++}
++
++void
++cleanup(signum)
++int signum;
++{
++    if (fpout) {
++        TempCloseStyles(fpout);
++        fclose(fpout);
++    }
++    if (signum == SIGPIPE) {
++        (void) WriteDeadLetter();
++    }
++    if (signum == SIGINT) {
++        if (V_ignore) {
++            printf("Interrupt ignored because 'ignore' is set.  Use ~q if you want to quit.\n");
++            return;
++        } else {
++            (void) WriteDeadLetter();
++        }
++    }
++    finalize();
++    signal(signum, SIG_DFL);
++    kill(getpid(), signum);
++}
++
++InitSignals() {
++    signal(SIGINT, cleanup);
++    signal(SIGPIPE, cleanup);
++    signal(SIGILL, cleanup);
++    signal(SIGTRAP, cleanup);
++    signal(SIGIOT, cleanup);
++    signal(SIGFPE, cleanup);
++    signal(SIGSEGV, cleanup);
++    signal(SIGTERM, cleanup);
++#ifdef SIGXCPU
++    signal(SIGXCPU, cleanup);
++#endif
++}
++
++WriteDeadLetter()
++{
++    FILE *fp;
++    char DeadFile[1000];
++
++    snprintf(DeadFile, sizeof(DeadFile), "%s/dead.letter", gethome());
++    fp = fopen(DeadFile, "w");
++    WriteOutMessage(fp, ToList, Subject, CCList, FirstPart);
++    if(fclose(fp)) {
++        perror("Could not write ~/dead.letter\n");
++        return(-1);
++    } else {
++        printf("Wrote draft to ~/dead.letter\n");
++        return(0);
++    }
++}
++
++struct MailcapEntry {
++    char *contenttype;
++    char *command;
++    char *testcommand;
++    char *editcommand;
++    char *composecommand;
++    char *composetypedcommand;
++    char *label;
++    int needsterminal;
++    int copiousoutput;
++    struct MailcapEntry *next;
++} *FirstMailcapEntry = NULL;
++
++/* There are a fair number of core leaks in what follows.  That should matter little -- the mailcap files are only parsed once, and are usually pretty small anyway. */
++
++char *
++GetCommand(s, t)
++char *s, **t;
++{
++    char *s2;
++    int quoted = 0;
++    s2 = malloc(strlen(s)*2); /* absolute max, if all % signs */
++    if (!s2) nomemabort();
++    *t = s2;
++    while (s && *s) {
++	if (quoted) {
++            if (*s == '%') *s2++ = '%'; /* Quote through next level, ugh! */
++
++            *s2++ = *s++;
++	    quoted = 0;
++	} else {
++	    if (*s == ';') {
++                *s2 = '\0';
++		return(++s);
++	    }
++	    if (*s == '\\') {
++		quoted = 1;
++		++s;
++	    } else {
++		*s2++ = *s++;
++	    }
++	}
++    }
++    *s2 = '\0';
++    return(NULL);
++}	
++
++char *Cleanse(s, dolc) /* no leading or trailing space, all lower case */
++char *s;
++int dolc;
++{
++    char *tmp, *news;
++    
++    /* strip leading white space */
++    while (*s && isspace((unsigned char) *s)) ++s;
++    news = s;
++    /* put in lower case, find end */
++    for (tmp=s; *tmp; ++tmp) {
++        if (dolc && isupper((unsigned char) *tmp)) *tmp = tolower((unsigned char) *tmp);
++    }
++    /* strip trailing white space */
++    while (--tmp && *tmp && isspace((unsigned char) *tmp)) *tmp = '\0';
++    return(news);
++}
++
++char *DeQuote(s)
++char *s;
++{
++    char *retval;
++    s = Cleanse(s, 0);
++    if (*s != '"') return(s);
++    retval = ++s;
++    while (s && *s) {
++        s = index(s, '\"');
++        if (!s) return(retval); /* but it's a bad parse */
++        if (*(s-1) != '\\') {
++            *s = '\0';
++            return(retval);
++        }
++        ++s;
++    }
++    return(retval); /* also a bad parse */
++}    
++
++struct MailcapEntry *
++GetMailcapEntry(fp)
++FILE *fp;
++{
++    int rawentryalloc = MAX_LINELENGTH, len;
++    char *rawentry, *s, *t, *LineBuf;
++    struct MailcapEntry *mc;
++
++    LineBuf = malloc(MAX_LINELENGTH);
++    if (!LineBuf) nomemabort();
++    rawentry = malloc(1 + rawentryalloc);
++    mc = (struct MailcapEntry *) malloc(sizeof (struct MailcapEntry));
++    if (!rawentry || !mc) nomemabort();
++    *rawentry = '\0';
++    while (fgets(LineBuf, MAX_LINELENGTH, fp)) {
++	if (LineBuf[0] == '#') continue;
++	len = strlen(LineBuf);
++        if (LineBuf[len-1] == '\n') LineBuf[--len] = '\0';
++	if ((len + strlen(rawentry)) > rawentryalloc) {
++            rawentryalloc += MAX_LINELENGTH;
++	    rawentry = realloc(rawentry, rawentryalloc+1);
++	    if (!rawentry) nomemabort();
++	}
++	if (LineBuf[len-1] == '\\') {
++            LineBuf[len-1] = '\0';
++	    strcat(rawentry, LineBuf);
++	} else {
++	    strcat(rawentry, LineBuf);
++	    break;
++	}
++    }
++    free(LineBuf);
++    for (s=rawentry; *s && isspace((unsigned char) *s); ++s) ;
++    if (!*s) {
++	/* totally blank entry -- quietly ignore */
++	free(rawentry);
++	return(NULL);
++    }
++    s = index(rawentry, ';');
++    if (!s) {
++	fprintf(stderr, "mailto: Ignoring invalid mailcap entry: %s\n", rawentry);
++	free(rawentry);
++	return(NULL);
++    }
++    *s++ = '\0';
++    mc->needsterminal = 0;
++    mc->copiousoutput = 0;
++    mc->testcommand = NULL;
++    mc->composecommand = NULL;
++    mc->composetypedcommand = NULL;
++    mc->editcommand = NULL;
++    mc->label = NULL;
++    mc->contenttype = malloc(1+strlen(rawentry));
++    mc->next = NULL;
++    if (!mc->contenttype) nomemabort();
++    strcpy(mc->contenttype, rawentry);
++    t = GetCommand(s, &mc->command);
++    s = t;
++    while (s) {
++	char *arg, *eq;
++
++        t = GetCommand(s, &arg);
++/*        if (t) *t++ = '\0'; */
++        eq = index(arg, '=');
++        if (eq) *eq++ = '\0';
++        arg = Cleanse(arg, 1);
++	if (!strcmp(arg, "needsterminal")) {
++	    mc->needsterminal = 1;
++	} else if (!strcmp(arg, "copiousoutput")) {
++	    mc->copiousoutput = 1;
++        } else if (eq && !strcmp(arg, "test")) {
++            mc->testcommand = DeQuote(eq);
++        } else if (eq && !strcmp(arg, "edit")) {
++            mc->editcommand = DeQuote(eq);
++        } else if (eq && !strcmp(arg, "compose")) {
++            mc->composecommand = DeQuote(eq);
++        } else if (eq && !strcmp(arg, "composetyped")) {
++            mc->composetypedcommand = DeQuote(eq);
++        } else if (eq && !strcmp(arg, "description")) {
++            mc->label = DeQuote(eq);
++        } else if (eq && !strcmp(arg, "label")) { 
++            mc->label = DeQuote(eq); /* bogus old name for description */
++        } else if (eq && !strcmp(arg, "textualnewlines")) {
++            ExceptionalNewline(mc->contenttype, atoi(eq));
++	} else if (strcmp(arg, "notes")) { /* IGNORE notes field */
++/*	    if (*arg) fprintf(stderr, "mailto: Ignoring invalid mailcap flag: %s\n", arg);  */
++	}
++	s = t;
++    }
++    free(rawentry);
++    return(mc);
++}
++
++ProcessMailcapFiles() 
++{
++    char *s, *path = getenv("MAILCAPS"), *origpath;
++    static char *stdpath = STDPATH;
++    struct MailcapEntry *mc, *CurrentMailcapEntry = NULL;
++    FILE *fp;
++
++    if (!path) {
++        int uid = getuid();
++        struct passwd *p;
++        p = getpwuid(uid);
++        if (p) path = malloc(5+strlen(p->pw_dir) + strlen(stdpath));
++        if (!p || !path) nomemabort();
++        strcpy(path, p->pw_dir);
++        strcat(path, stdpath);
++    } else {
++        char *pathcopy;
++        pathcopy = malloc(1+strlen(path));
++        if (!pathcopy) nomemabort();
++        strcpy(pathcopy, path);
++        path = pathcopy;
++    }
++    origpath = path;
++    while(path) {
++        s = index(path, PATH_SEPARATOR);
++        if (s) *s++ = '\0';
++        fp = fopen(path, "r");
++        while (fp && !feof(fp)) {
++            mc = GetMailcapEntry(fp);
++            if (!mc) continue;
++            if (!FirstMailcapEntry) {
++                FirstMailcapEntry = mc;
++                CurrentMailcapEntry = mc;
++            } else {
++                CurrentMailcapEntry->next = mc;
++                CurrentMailcapEntry = mc;
++            }
++	}
++        if (fp) fclose(fp);
++        path = s;
++    }
++    free(origpath);
++    return(-1);
++}
++
++struct mailpart *
++CreateNewPart() {
++    struct mailpart *mp;
++    struct MailcapEntry *mc = FirstMailcapEntry;
++    int i, ans, resultcode;
++    char LineBuf[100], *CmdBuf;
++
++    mp = NewPart();
++    if (!mp) return(NULL);
++    printf("Please choose which kind of data you wish to insert:\n\n");
++    printf("0: A raw file, possibly binary, of no particular data type.\n");
++    printf("1: Raw data from a file, with you specifying the content-type by hand.\n");
++    i = 1;
++    while (mc) {
++        if (mc->composecommand || mc->composetypedcommand) {
++            ++i;
++            if (mc->label) {
++                printf("%d: %s\n", i, mc->label);
++            } else {
++                printf("%d: data in '%s' format\n", i, mc->contenttype);
++            }
++        }
++        mc = mc->next;
++    }
++    printf("\n\nEnter your choice as a number from 0 to %d: ", i);
++    fflush(stdout);
++    fgets(LineBuf, sizeof(LineBuf), stdin);
++    ans = atoi(LineBuf);
++    if (ans == 0 || ans == 1) {
++        char *sdum, CTLineBuf[100];
++        FILE *fpi, *fpo;
++	printf("\nIf you want to include non-textual data from a file, enter the file name.\nTo include the output of a command, enter \"|\" followed by the command.\nIf you do not want to include anything, just press ENTER (RETURN).\n> ");
++        fflush(stdout);
++        fgets(CTLineBuf, sizeof(CTLineBuf), stdin);
++        sdum = CTLineBuf+strlen(CTLineBuf) -1;
++        while (sdum >= CTLineBuf && isspace((unsigned char) *sdum)) {
++            *sdum = '\0';
++            --sdum;
++        }
++        sdum=CTLineBuf;
++        while (*sdum && isspace((unsigned char) *sdum)) ++sdum;
++        if (! *sdum) {
++            printf("Data insertion cancelled\n");
++            return(NULL);
++        }
++	if (*sdum == '|') {
++	    fpi = popen(sdum+1, "r");
++	} else {
++	    fpi = fopen(sdum, "r");
++	}
++        if (!fpi) {
++            printf("Cannot read %s, data insertion cancelled\n", sdum);
++            return(NULL);
++        }
++        fpo = fdopen(mkstemp(mp->filename), "w");
++        if (!fpo) {
++            printf("Cannot open temporary file, data insertion cancelled\n");
++            return(NULL);
++        }
++        (void) TranslateInputToEncodedOutput(fpi, fpo, ENC_NONE, "");
++	if (*sdum == '|') {
++	    fclose(fpi);
++	} else {
++	    pclose(fpi);
++	}
++        fclose(fpo);
++        mp->istext = 0;
++        if (ans == 1) {
++            while (1) {
++                int ct;
++                printf("\nEnter the MIME Content-type value for the data from file %s\n    (type '?' for a list of locally-valid content-types): ", sdum);
++                fflush(stdout);
++                fgets(LineBuf, sizeof(LineBuf), stdin);
++		LineBuf[strlen(LineBuf)-1]='\0';
++                if (index(LineBuf, '/')) {
++                    char lc[100], *s, AnsBuf[100];
++                    strcpy(lc, LineBuf);
++                    for (s=lc; *s; ++s) {
++                        if (isupper(*s)) *s = tolower(*s);
++                    }
++                    if (!strcmp(lc, "text/plain")) break;
++                    if (!strcmp(lc, "application/octet-stream")) break;
++                    mc=FirstMailcapEntry;
++                    while (mc) {
++                        if (mc->contenttype && index(mc->contenttype, '/') && !index(mc->contenttype, '*') && !lc2strcmp(mc->contenttype, lc)) {
++                            break;
++                        }
++                        mc = mc->next;
++                    }
++                    if (mc) break;
++                    printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type.  Do you want to use it anyway [no] ? ", LineBuf);
++                    s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
++                    while (s && *s && isspace((unsigned char) *s)) ++s;
++                    if (s && (*s == 'y' || *s == 'Y')) break;
++                    continue;
++                }
++                printf("\nMIME content-type values are type/format pairs, and always include a '/'.\nThe types supported at your site include, but are not limited to:\n\n");
++                mc=FirstMailcapEntry;
++                ct = 0;
++                while (mc) {
++                    if (mc->contenttype && index(mc->contenttype, '/') && !index(mc->contenttype, '*')) {
++                        if (ct++) fputs(", ", stdout);
++                        fputs(mc->contenttype, stdout);
++                    }
++                    mc = mc->next;
++                }
++                fputs("\n\nThe MIME content-type for file inclusion is 'application/octet-stream'.\n", stdout);
++            }
++            mp->content_type = freshcopy(LineBuf);
++        } else mp->content_type=freshcopy("application/octet-stream");
++        mp->encoding_type_needed = WhichEncodingForFile(mp->filename, mp->content_type);
++        printf("Included data in '%s' format\n", mp->content_type);
++	printf("(continue)\n");
++        SetTextFlags(mp);
++        return(mp);
++    } else if (ans<0 || ans > i) {
++        printf("Data insertion cancelled\n");
++        return(NULL);
++    }
++    i=2;
++    mc=FirstMailcapEntry;
++    while (mc) {
++        if (mc->composecommand || mc->composetypedcommand) {
++            if (i == ans) break;
++            ++i;
++        }
++        mc = mc->next;
++    }
++    CmdBuf = malloc(CMDSIZE);
++    if (!CmdBuf) nomemabort();
++    BuildCommand(CmdBuf, mc->composecommand ? mc->composecommand : mc->composetypedcommand, mp->filename);
++    printf("Executing: %s\n", CmdBuf);
++    resultcode = SYSTEM(CmdBuf);
++    if (resultcode) {
++        printf("Command execution failed, nothing included\n");
++        free(CmdBuf);
++        return(NULL);
++    }
++    if (access(mp->filename, R_OK)) {
++        printf("No file was created, nothing included!\n");
++        free(CmdBuf);
++        return(NULL);
++    }
++    mp->istext = 0;
++    if (mc->composecommand) {
++        mp->content_type = mc->contenttype;
++        mp->encoding_type_needed = WhichEncodingForFile(mp->filename, mp->content_type);
++    } else {
++        char c, LineBuf[1000], *colon, *ctypebuf = NULL, *cencbuf = NULL, *s, *newfilename;
++        FILE *fp, *fpout;
++        int inheaders=1, bct=0;
++
++        s = LineBuf;
++        fp = fopen(mp->filename, "r");
++        if (!fp) {
++            fprintf(stderr, "Cannot read file %s, no data included.\n", mp->filename);
++            free(CmdBuf);
++            return(NULL);
++        }
++        while ((c = getc(fp)) != EOF && inheaders) {
++            if (c == '\n') {
++                c = getc(fp);
++                if (c == ' ' || c == '\t') {
++                    *s++ = ' ';
++                } else {
++                    /* actually process the header */
++                    *s = 0;
++                    colon = index(LineBuf, ':');
++                    if (colon) {
++                        *colon++ = 0;
++                        for (s=LineBuf; *s; ++s) {
++                            if (isupper(*s)) *s = tolower(*s);
++                        }
++                        if (!strcmp(LineBuf, "content-transfer-encoding")) {
++                            cencbuf = malloc(1+strlen(colon));
++                            if (!cencbuf) nomemabort();
++                            strcpy(cencbuf, colon);
++                        } else if (!strcmp(LineBuf, "content-type")) {
++                            ctypebuf = malloc(1+strlen(colon));
++                            if (!ctypebuf) nomemabort();
++                            strcpy(ctypebuf, colon);
++                        }
++                    }
++                    if (c == '\n') {
++                        inheaders = 0;
++                        break;
++                    }
++                    ungetc(c, fp);
++                    s = LineBuf; /* start over */
++                }
++            } else {
++                *s++ = c;
++            }
++        }
++        if (!ctypebuf) {
++            fprintf(stderr, "The command (%s) did not return a content-type value, so no data could be included.\n", CmdBuf);
++            free(CmdBuf);
++            return(NULL);
++        }
++        mp->content_type = ctypebuf;
++        if (cencbuf) {
++            while (*cencbuf && isspace(*cencbuf)) ++cencbuf;
++            for (s=cencbuf; *s; ++s) {
++                if (isupper(*s)) *s = tolower(*s);
++            }
++            if (!strncmp(cencbuf, "base64", 6)) {
++                mp->encoding_type_needed = ENC_B64;
++            } else if (!strncmp(cencbuf, "quoted-printable", 16)) {
++                mp->encoding_type_needed = ENC_QP;
++            } else {
++                fprintf(stderr, "The command (%s) returned an unrecognized content-transfer-encoding value, so no data could be included.\n", CmdBuf);
++                free(CmdBuf);
++                return(NULL);
++            }
++        } else {
++            mp->encoding_type_needed = ENC_NONE;
++        }
++        newfilename = tmpname();
++        fpout = fdopen(mkstemp(newfilename), "w");
++        if (!fpout) {
++            fprintf(stderr, "Cannot open file %s for writing, no data included.\n", newfilename);
++            free(CmdBuf);
++            return(NULL);
++        }
++        switch(mp->encoding_type_needed) {
++            case ENC_B64:
++                from64(fp, fpout, NULL, &bct, 0);
++                break;
++            case ENC_QP:
++                fromqp(fp, fpout, NULL, &bct);
++                break;
++            default:
++                while ((c = getc(fp)) != EOF) {
++                    putc(c, fpout);
++                }
++                break;
++        }
++        fclose(fp);
++        fclose(fpout);
++        unlink(mp->filename);
++        mp->filename = newfilename;
++    }
++    SetTextFlags(mp);
++    printf("Included data in '%s' format\n", mc->contenttype);
++    printf("(continue)\n");
++    free(CmdBuf);
++    return(mp);
++}
++
++SetTextFlags(mp)
++struct mailpart *mp;
++{
++    if (!lc2strncmp(mp->content_type, "text/", 5)) {
++        mp->istext = 1;
++        if (!lc2strncmp(mp->content_type, "text/richtext", 13)) {
++            mp->isrich = 1;
++        }
++    }
++}
++
++WhichEncodingForFile(fname, ctype)
++char *fname, *ctype;
++{
++    int c, linesize=0, total=0, unsafechars=0, longlines=0;
++    char *s;
++    FILE *fp = fopen(fname, "r");
++    if (!fp) {
++        /* If the stupid editing program forks, this actually will do a 
++              reasonable thing as long as it saves the file before the mail is sent */
++        return(ENC_B64); /* safest */
++    }
++    while ((c = getc(fp)) != EOF) {
++        if (c>127) ++unsafechars;
++        ++total;
++        if (c == '\n') {
++            if (linesize > 79) ++longlines;
++            linesize = 0;
++        } else ++linesize;
++        if (total>1000 && (longlines || unsafechars)) break;
++    }
++    fclose(fp);
++    if (longlines || unsafechars) {
++        for (s=ctype; *s; ++s) if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
++        if (!strncmp(ctype, "image/", 6)
++             || !strncmp(ctype, "audio/", 6)
++             || !strncmp(ctype, "application/octet-stream", 24)
++             || !strncmp(ctype, "video/", 6)) {
++            return(ENC_B64);
++        }
++        if (!unsafechars) return(ENC_QP);
++
++        return((total/unsafechars < 16) ? ENC_B64 : ENC_QP);
++    }
++    return(ENC_NONE);
++}
++
++BuildCommand(Buf, controlstring, TmpFileName)
++char *Buf, *controlstring, *TmpFileName;
++{
++    char *from, *to;
++    int prefixed = 0;
++    int NamedFile=0;
++
++    for (from=controlstring, to=Buf; *from; ++from) {
++        if (prefixed) {
++            prefixed = 0;
++            switch(*from) {
++                case '%':
++                    *to++ = '%';
++                    break;
++                case 's':
++                    if (TmpFileName) {
++                        strcpy(to, TmpFileName);
++                        to += strlen(TmpFileName);
++                        ++NamedFile;
++                    }
++                    break;
++                default:
++                    fprintf(stderr, "Ignoring unrecognized format code in mailcap file: %%<%c\n", *from);
++                    break;
++            }
++        } else if (*from == '%') {
++            prefixed = 1;
++        } else {
++            *to++ = *from;
++        }
++    }
++    *to = '\0';
++    if (!NamedFile) {
++        strcat(Buf, " > ");
++        strcat(Buf, TmpFileName);
++    }
++}
++
++CtypeMatch(ctype, pat)
++char *ctype, *pat;
++{
++    int len;
++    char *s;
++    for (s=ctype; *s; ++s) if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
++    for (s=pat; *s; ++s) if (isupper((unsigned char) *s)) *s = tolower((unsigned char) *s);
++    if (!strcmp(ctype, pat)) {
++        return(1); /* exact match, case-insensitive */
++    }
++    len = strlen(pat);
++    if ((pat[--len] == '*')
++         && (pat[--len] == '/')
++         && (!strncmp(ctype, pat, len))
++         && (ctype[len] == '/')){
++        /* wildcard match */
++        return(1);
++    }
++    return(0);
++}
++
++EditCurrentMessage(UseVisual)
++int UseVisual;
++{
++    char *editor = NULL;
++    char *CmdBuf, *CmdBuf2, LineBuf[100];
++    struct mailpart *mp, *lastmp=NULL;
++    struct MailcapEntry *mc;
++    int partct=1, ans;
++
++    CmdBuf = malloc(CMDSIZE);
++    CmdBuf2 = malloc(CMDSIZE);
++    if (!CmdBuf || !CmdBuf2) nomemabort();
++    if (!PartEndsWithNewline) {
++        putc('\n', fpout);
++        PartEndsWithNewline=1;
++    }
++    fclose(fpout);
++    if (UseVisual) editor = getenv("VISUAL");
++    if (!editor) editor = getenv("EDITOR");
++    if (!editor) editor = DEFAULT_EDITOR;
++    if (!FirstPart->next) {
++        /* Only one part */
++        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", editor, FirstPart->filename);
++        printf("Executing: %s\n", CmdBuf);
++        SYSTEM(CmdBuf);
++        if ((FirstPart->istext || FirstPart->isrich) &&
++             FirstPart->encoding_type_needed == ENC_NONE &&
++             ContainsEightBitChar(FirstPart->filename)) {
++            FirstPart->encoding_type_needed = ENC_QP;
++        }
++        fpout = fopen(FirstPart->filename, "a");
++        free(CmdBuf);
++        free(CmdBuf2);
++        return;
++    }
++    lastmp = mp = FirstPart;
++    while (mp) {
++        printf("Part #%d is of type '%s'.\n", partct, mp->content_type);
++        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", editor, mp->filename);
++        if (mp->mc && mp->mc->editcommand) {
++            BuildCommand(CmdBuf2, mp->mc->editcommand, mp->filename);
++        } else {
++            mc = FirstMailcapEntry;
++            while (mc) {
++                if (mc->editcommand && CtypeMatch(mp->content_type, mc->contenttype)) {
++                    break;
++                }
++                mc = mc->next;
++            }
++            if (mc) {
++                BuildCommand(CmdBuf2, mc->editcommand, mp->filename);
++            } else {
++                CmdBuf2[0] = '\0';
++            }
++        }
++        if (CmdBuf2[0]) {
++            printf("Which command do you want to use to edit it?\n\n");
++            printf("1: %s\n", CmdBuf2);
++            printf("2: %s\n", CmdBuf);
++            printf("\n\nEnter 1 or 2, or 0 to not edit it: ");
++            fflush(stdout);
++            fgets(LineBuf, sizeof(LineBuf), stdin);
++            ans = atoi(LineBuf);
++        } else ans = 2;
++        if (ans == 1) {
++            printf("Executing: %s\n", CmdBuf2);
++            SYSTEM(CmdBuf2);
++        } else if (ans == 2) {
++            printf("Executing: %s\n", CmdBuf);
++            SYSTEM(CmdBuf);
++        }
++        if ((mp->istext || mp->isrich) &&
++             mp->encoding_type_needed == ENC_NONE &&
++             ContainsEightBitChar(mp->filename)) {
++            mp->encoding_type_needed = ENC_QP;
++        }
++        ++partct;
++        lastmp = mp;
++        mp = mp->next;
++    }
++    fpout = fopen(lastmp->filename, "a");
++    free(CmdBuf);
++    free(CmdBuf2);
++}
++
++
++ProcessInitFiles() {
++    char fname[FILE_NAME_SIZE];
++
++    ProcessOneMailRC("/usr/lib/Mail.rc", 0);
++    snprintf(fname, sizeof(fname), "%s/.mailrc", gethome());
++    ProcessOneMailRC(fname, 0);
++    snprintf(fname, sizeof(fname), "%s/.AMS_aliases", gethome());
++    ProcessOneMailRC(fname, 1);
++}
++
++char *
++NextAliasLine(LineBuf, LineAlloced, LineCount, fp, IsAndrew)
++char *LineBuf;
++int *LineAlloced, *LineCount;
++FILE *fp;
++int IsAndrew;
++{
++    char *sbuf;
++    sbuf = malloc(MAX_LINELENGTH);
++    if (!sbuf) nomemabort();
++    if (!LineBuf) {
++        *LineAlloced = MAX_LINELENGTH + MAX_LINELENGTH;
++        LineBuf = malloc(*LineAlloced);
++        if (!LineBuf) nomemabort();
++    }
++    *LineBuf = 0;
++    *LineCount = 0;
++    while (1) {
++        if (fgets(sbuf, MAX_LINELENGTH, fp) == NULL) {
++            return(LineBuf);
++        }
++        *LineCount += strlen(sbuf);
++        if (*LineCount >= *LineAlloced) {
++            *LineAlloced += MAX_LINELENGTH;
++            LineBuf = realloc(LineBuf, *LineAlloced);
++            if (!LineBuf) nomemabort();
++        }
++        strcat(LineBuf, sbuf);
++        if (IsAndrew || LineBuf[*LineCount - 2] != '\\') return(LineBuf);
++        /* The -2 got us past the newline. */
++        LineBuf[*LineCount - 2] = ' ';
++        *LineCount -= 1;
++        LineBuf[*LineCount] = '\0';
++    }
++}
++
++ProcessOneMailRC(fname, IsAndrew)
++char *fname;
++int IsAndrew;
++{
++    FILE *fp;
++    char *LineBuf = NULL, *sdum;
++    int LineAlloced = 0, LineCount = 0;
++
++    fp = fopen(fname, "r");
++    if (!fp) return;
++    do {
++        LineBuf=NextAliasLine(LineBuf, &LineAlloced, &LineCount, fp, IsAndrew);
++        if (LineCount == 0) continue;
++        if (IsAndrew && LineBuf[0] == '#') continue;
++        for (sdum = LineBuf; *sdum; ++sdum) {
++            if (*sdum == ' ') break; /* only map first word to lower case */
++            if (isupper((unsigned char) *sdum)) *sdum = tolower((unsigned char) *sdum);
++        }
++        if (IsAndrew) {
++            HandleAliasCommand(LineBuf);
++        } else if (!strncmp(LineBuf, "set ", 4)) {
++            HandleSetCommand(LineBuf+4, 1);
++        } else if (!strncmp(LineBuf, "unset ", 6)) {
++            HandleSetCommand(LineBuf+6, 0);
++        } else if (!strncmp(LineBuf, "alias ", 6)) {
++            HandleAliasCommand(LineBuf+6);
++        } else {
++            /* ignore */
++        }
++    } while (LineCount != 0);
++    free(LineBuf);
++    fclose(fp);
++}
++
++HandleSetCommand(cmd, DoSet)
++char *cmd;
++int DoSet;
++{
++    char *s;
++    int i;
++
++    while (*cmd) {
++        while (*cmd && isspace((unsigned char) *cmd)) ++cmd;
++        for (s=cmd; *s && !isspace((unsigned char) *s); ++s) {;}
++        *s++ = '\0';
++        if (!strcmp(cmd, "askcc")) {
++            V_askcc = DoSet;
++        } else if (!strcmp(cmd, "dot")) {
++            V_dot = DoSet;
++        } else if (!strcmp(cmd, "ignore")) {
++            V_ignore = DoSet;
++        } else if (!strcmp(cmd, "verbose")) {
++            V_verbose = DoSet;
++        } else if (!strcmp(cmd, "quiet")) {
++            V_quiet = DoSet;
++        } else if (!strcmp(cmd, "keepblind")) {
++            V_keepblind = DoSet;
++        } else if (!strcmp(cmd, "commasonly")) {
++            V_commasonly = DoSet;
++        } else if (!strncmp(cmd, "splitsize ", 9)) {
++            i = atoi(cmd+10);
++            if (i < MINCHUNKSIZE) {
++                fprintf(stderr, "Ignoring splitsize mailrc setting of %d -- the minimum value is %d\n", i, MINCHUNKSIZE);
++            } else {
++                SplitSize = i;
++            }
++        } else {
++            /* ignore */
++        }
++        cmd = s;;
++    }
++}
++
++struct alias {
++    char *shortname, *longname;
++    struct alias *next;
++} *FirstAlias = NULL;
++
++HandleAliasCommand(aliasline)
++char *aliasline;
++{
++    struct alias *tmpalias;
++    char *s, *s2;
++    int len = strlen(aliasline);
++
++    if (aliasline[len - 1] == '\n') {
++        aliasline[len - 1] = '\0';
++    }
++    tmpalias = (struct alias *) malloc(sizeof (struct alias));
++    s = malloc(len + 1);
++    if (!s || !tmpalias) nomemabort();
++    strcpy(s, aliasline);
++    while (*s && isspace((unsigned char) *s)) { ++s;}
++    for (s2=s; *s2 && !isspace((unsigned char) *s2); ++s2) {;}
++    if (!*s2) {
++        if (s != s2) printf("mailto: ignoring bad alias line in init file: %s\n", aliasline);
++        free(s);
++        free(tmpalias);
++        return;
++    }
++    *s2++ = '\0';
++    tmpalias->shortname = s;
++    tmpalias->longname = s2;
++    tmpalias->next = FirstAlias;
++    FirstAlias = tmpalias;
++}
++
++EmitHeader(fp, hdr, body)
++FILE *fp;
++char *hdr;
++char *body;
++{
++    fputs(hdr, fp);
++    fputs(": ", fp);
++    HeaderFputs(body, fp, hdr);
++    fputs("\n", fp);
++/*    fprintf(fp, "%s: %s\n", hdr, body ? body : ""); */
++}
++
++char *
++firstbad(s)
++char *s;
++{
++    char *dum;
++    for (dum=s; *dum; ++dum) {
++        if (!isascii(*dum) || iscntrl(*dum)) {
++            return(dum);
++        }
++    }
++    return(NULL);
++}
++
++char *
++firstgood(s)
++char *s;
++{
++    char *dum;
++    for (dum=s; *dum; ++dum) {
++        if (isascii(*dum) && !iscntrl(*dum)) {
++            return(dum);
++        }
++    }
++    return(NULL);
++}
++
++HeaderFputs(s, fp, hdr)
++char *s;
++FILE *fp;
++char *hdr;
++{
++    char *firstnonascii, *firstascii;
++
++    if (!s) return;
++    firstnonascii=firstbad(s);
++    if (firstnonascii) {
++        if (!strcmp(CharacterSet, "us-ascii")) {
++            fprintf(stderr, "Warning:  The prevailing character set is ASCII.  Your %s header has\nnon-ASCII or non-printing ASCII characters which may be unreadable.\n", hdr);
++        }
++        while (firstnonascii) {
++            while (s < firstnonascii) {
++                putc(*s, fp);
++                ++s;
++            }
++            firstascii=firstgood(s);
++            if (!firstascii) firstascii = s+strlen(s);
++            if ((firstascii - s) > 25) firstascii = s+25; /* Short encoded words */
++            /* general format is =?charset?B or Q?encoded data?= */
++            fprintf(fp, "=?%s?Q?", CharacterSet);
++            while (s < firstascii) {
++                PutQP(*s, fp);
++                ++s;
++            }
++            fputs("?= ", fp); /* close encoded word */
++            firstnonascii=firstbad(s);
++        }
++        while (*s) {
++            putc(*s, fp);
++            ++s;
++        }
++    } else {
++        fputs(s, fp);
++    }
++}
++
++static char basis_hex[] = "0123456789ABCDEF";
++
++PutQP(c, fp)
++unsigned char c;
++FILE *fp;
++{
++    putc('=', fp);
++    putc(basis_hex[c>>4], fp);
++    putc(basis_hex[c&0xF], fp);
++}
++
++EmitHeaderWithAliases(fp, hdr, names)
++FILE *fp;
++char *hdr;
++char *names;
++{
++    fputs(hdr, fp);
++    fputs(": ", fp);
++    EmitAddresses(fp, names, hdr);
++    fputs("\n", fp);
++}
++
++EmitAddresses(fp, names, hdr)
++FILE *fp;
++char *names;
++char *hdr;
++{
++    char *s;
++    while (names) {
++        s= index(names, ',');
++        if (s) *s = '\0';
++        DeAlias(names, fp, hdr);
++        if (s) {
++            *s++ = ',';
++            fputs(",\n\t", fp);
++        }
++        names = s;
++    }
++}
++
++DeAlias(name, fp, hdr)
++char *name;
++FILE *fp;
++char *hdr;
++{
++    struct alias *tmpalias;
++    char *end, savechar;
++
++    while (isspace((unsigned char) *name)) ++name;
++    end = name+strlen(name)-1;
++    while (isspace((unsigned char) *end)) --end;
++    ++end;
++    savechar = *end;
++    for (tmpalias=FirstAlias; tmpalias; tmpalias = tmpalias->next) {
++        if (!strcmp(tmpalias->shortname, name)) { 
++/*        if (!lc2strcmp(name, tmpalias->shortname)) { */
++            *end = savechar;
++            EmitAddresses(fp, tmpalias->longname, hdr);
++            return;
++        }
++    }
++    *end = savechar;
++    HeaderFputs(name, fp, hdr);
++}
++
++
++WriteCtypeNicely(fp, ct)
++FILE *fp;
++char *ct;
++{
++    char *semi, *slash, *eq, *s;
++
++    for (s = ct; *s; ++s) {
++        if (*s == '\n') *s = ' ';
++    }
++    semi = (char *) index(ct, ';');
++    if (semi) *semi = '\0';
++    slash = (char *) index(ct, '/');
++    fputs(ct, fp);
++    if (!slash) fputs("/unknown", fp);
++    while (semi) {
++        ct = semi + 1;
++        *semi = ';';
++        semi = (char *) index(ct, ';');
++        if (semi) *semi = '\0';
++        eq = (char *) index(ct, '=');
++        if (eq) *eq = '\0';
++        fputs(";\n\t", fp);
++        while (isspace((unsigned char) *ct)) ++ct;
++        fputs(ct, fp);
++        if (eq) {
++            s = eq;
++            fputs("=", fp);
++            ++s;
++            while (isspace((unsigned char) *s)) ++s;
++            fputsquoting(s, fp);
++            *eq = '=';
++        }
++    }
++}
++
++fputsquoting(s, fp)
++char *s;
++FILE *fp;
++{
++    char *end = s + strlen(s) - 1;
++    while (isspace((unsigned char) *end) && end > s) --end;
++    if (*s == '\"') {
++        putc(*s, fp);
++        while (*++s) {
++            if (*s == '\"') break; /* MAY TERMINATE EARLY! */
++            if (*s == '\\') {
++                putc(*s, fp);
++                ++s; /* Don't check this next char */
++                if (!*s) break;
++            }
++            putc(*s, fp);
++        }
++        putc('\"', fp);
++    } else {
++        putc('\"', fp);
++        putc(*s, fp);
++        while (*++s) {
++            if (*s == '\"' || *s == '\\') {
++                putc('\\', fp);
++            }
++            putc(*s, fp);
++        }
++        putc('\"', fp);
++    }
++}
++        
++        
++controlputc(c)
++char c;
++{
++    fputc(c, stdout);
++}
++
++/* Do the equivalent of an fputs for the terminal escape stuff */
++
++tfputs(s)
++char *s;
++{
++    tputs(s, 1, controlputc);
++}
++
++ContainsEightBitChar(fname)
++char *fname;
++{
++    int c, eightBitSeen = 0;
++    FILE *fp = fopen(fname, "r");
++    if (!fp) {
++        /* If the stupid editing program forks, this actually will do a
++              reasonable thing as long as it saves the file before the mail is sent */
++        return(1); /* safest */
++    }
++    while ((c = getc(fp)) != EOF) {
++        if (c>127) {
++            eightBitSeen = 1;
++            break;
++        }
++    }
++    fclose(fp);
++    return(eightBitSeen);
++}
++
++SwitchToEuropean() {
++    printf("WARNING:  You have entered 8-bit characters in what is supposed to be\n");
++    printf("plain ASCII text.  If you are using a non-ASCII character set, you should\n");
++    printf("declare this to be the case with the MM_CHARSET environment variable.\n");
++    printf("For now, I am assuming you are using the iso-8859-1 character set,\n");
++    printf("but this may be false.\n");
++    CharacterSet = malloc(12);
++    if (!CharacterSet) nomemabort();
++    strcpy(CharacterSet, "iso-8859-1");
++}
++
++    
+--- metamail-2.7.orig/bin/Makefile.am
++++ metamail-2.7/bin/Makefile.am
+@@ -0,0 +1,9 @@
++MAINTAINERCLEANFILES    = Makefile.in
++
++bin_SCRIPTS		= audiocompose audiosend extcompose getfilename \
++			mailserver mailto-hebrew metasend mimeit \
++			patch-metamail rcvAppleSingle showaudio showexternal \
++			shownonascii showpartial showpicture sndAppleSingle \
++			sun-audio-file sun-message sun-message.csh \
++			sun-to-mime sun2mime uudepipe uuenpipe
++
+--- metamail-2.7.orig/bin/mailserver
++++ metamail-2.7/bin/mailserver
+@@ -1,4 +1,4 @@
+-#!/bin/csh -fb
++#!/bin/csh -efb
+ # (The "-fb" might need to be changed to "-f" on some systems)
+ #
+ # Mailserver -- a simple MIME mailserver script.
+@@ -18,17 +18,15 @@
+ set LOCALADDR=mail-server
+ set ROOTDIR=/usr/spool/ftp
+ set MAINTAINER=postmaster
+-set METAMAILDIR=/usr/local/bin
+ set LOGADDR=andrew@thumper.bellcore.com
+ # If LOGADDR is the empty string, no logging is done.
+ #
+ # The real program begins here.
+ 
+-setenv PATH ${METAMAILDIR}:${PATH}
+ rehash
+ set FromName=""
+ set Subject=""
+-set TmpFile=/tmp/ms.$$
++set TmpFile=`tempfile -p metamail -m 600`
+ set FOORAW=$<
+ while ("$FOORAW" != "") 
+ set FOO=(` echo "$FOORAW" | tr "[" "x"`)
+@@ -68,7 +66,7 @@
+ probably run in some circumstance other than mail delivery.
+ --------------------
+ !
+-	cat $TmpFile - | /usr/lib/sendmail $MAINTAINER
++	cat $TmpFile - | /usr/sbin/sendmail $MAINTAINER
+ 	# Takes the rest of the message from standard input
+ 	rm $TmpFile
+ 	exit 0
+@@ -86,7 +84,7 @@
+ 
+ The file you requested, if it exists, will not be sent to you.
+ !
+-	/usr/lib/sendmail -t < $TmpFile
++	/usr/sbin/sendmail -t < $TmpFile
+ 	rm $TmpFile
+ 	exit 0
+ endif
+@@ -107,7 +105,7 @@
+ --------------------------------
+ !
+ 	ls -R >> $TmpFile
+-	/usr/lib/sendmail -t < $TmpFile
++	/usr/sbin/sendmail -t < $TmpFile
+ 	rm $TmpFile
+ 	exit 0
+ endif
+@@ -135,13 +133,13 @@
+   metasend -b -t "$FromName" -f "$Subject" -m "$ct" -s "Re: $Subject"
+ 
+ !
+-	/usr/lib/sendmail -t < $TmpFile
++	/usr/sbin/sendmail -t < $TmpFile
+ 	rm $TmpFile
+ 	exit 0
+ endif
+ 
+ if ("$LOGADDR" != "") then
+-	/usr/lib/sendmail -t <<!
++	/usr/sbin/sendmail -t <<!
+ From: ${LOCALADDR}@`hostname`
+ To: $LOGADDR
+ Subject: Autosend delivery report
+--- metamail-2.7.orig/bin/getfilename
++++ metamail-2.7/bin/getfilename
+@@ -1,16 +1,36 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
++# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++# 
++# Permission to use, copy, modify, and distribute this material 
++# for any purpose and without fee is hereby granted, provided 
++# that the above copyright notice and this permission notice 
++# appear in all copies, and that the name of Bellcore not be 
++# used in advertising or publicity pertaining to this 
++# material without the specific, prior written permission 
++# of an authorized representative of Bellcore.  BELLCORE 
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+ 
+ echo -n "Enter the name of a file in '$1' format: "
+-set fnam=$<
+-if ("" == "$fnam") then
+-    echo Aborted
+-    exit -1
+-endif
+-if (! -r  $fnam) then
+-    echo No such file
+-    exit -1
+-endif
+-cp $fnam $2
+-exit 0
++read fnam
++if test ! -r "$fnam"
++then
++	echo No such file
++	exit 1
++fi
++
++cp "$fnam" "$2"
+--- metamail-2.7.orig/bin/audiosend
++++ metamail-2.7/bin/audiosend
+@@ -1,6 +1,4 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
+ # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ # 
+ # Permission to use, copy, modify, and distribute this material 
+@@ -13,97 +11,114 @@
+ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+-#
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
+ 
+ # This is to make metamail/showaudio do playback on the speaker, not the phone.
+-setenv AUDIOSPEAKERFORCE 1 
++AUDIOSPEAKERFORCE=1 ; export AUDIOSPEAKERFORCE
++
++if test -d /usr/sony
++then
++	dev=/dev/sb0
++else
++	dev=/dev/audio
++fi
+ 
+-if (-d /usr/sony) then
+-    set dev=/dev/sb0
++if test -f /usr/sbin/sendmail
++then
++    MAILCOMMAND=/usr/sbin/sendmail
+ else
+-    set dev=/dev/audio
+-endif
++    MAILCOMMAND=mail
++fi
+ 
+-if ( $#argv == 1 ) then
+-    set to = $1
++if test ! -z "${1:-}"
++then
++    to=$1
+ else
+     echo -n "To: "
+-    set to = $<
+-endif
++    read to
++fi
+ echo -n "Subject: "
+-set subject = $<
++read subject
+ echo -n "CC: "
+-set cc = $<
++read cc
+ 
+-record:
+-echo -n "Press RETURN when you are ready to start recording: "
+-set foo = $<
+-
+-set fname = ${METAMAIL_TMPDIR}/audio-out.$$
+-set fnameraw = ${METAMAIL_TMPDIR}/audio-raw.$$
+-
+-echo "To: " "$to" > $fname
+-echo "Subject: " "$subject" >> $fname
+-echo "CC: " "$cc" >> $fname
+-echo "MIME-Version: 1.0" >> $fname
+-echo "Content-Type: audio/basic" >> $fname
+-echo "Content-Transfer-Encoding: base64" >> $fname
+-echo  "" >> $fname
+-# THIS IS UNBELIEVABLY GRUBBY
+-onintr cleanup
+-if (! $?RECORD_AUDIO) then
+-    (/bin/cat < $dev > $fnameraw) &
+-else
+-    ($RECORD_AUDIO > $fnameraw) &
+-endif
+-jobs -l > ${METAMAIL_TMPDIR}/AUDCAT.$$
+-set foo=`/bin/cat ${METAMAIL_TMPDIR}/AUDCAT.$$`
+-/bin/rm ${METAMAIL_TMPDIR}/AUDCAT.$$
+-set PID=$foo[2]
+-echo -n "press RETURN when you are done recording: "
+-set foo=$<
+-echo One moment please...
+-/bin/sleep 1
+-echo -n Killing recording job...
+-/bin/kill -9 $PID >& /dev/null
+-mimencode -b < $fnameraw >> $fname
+-/bin/rm $fnameraw
+-echo "" >> $fname
+-
+-whatnext:
+-echo ""
+-echo "What do you want to do?"
+-echo ""
+-echo "1 -- Send mail"
+-echo "2 -- Listen to recorded message"
+-echo "3 -- Replace with a new recording"
+-echo "4 -- Quit"
+-set which = $<
+-    switch ("$which")
+-        case 1:
+-          echo -n "Sending mail, please wait...  "
+-          /usr/lib/sendmail $to  $cc < $fname
+-          if (! $status) then
+-            echo "Done."
+-            rm $fname
+-            exit
+-          else
+-            echo Mail delivery failed, draft mail is in $fname
+-          endif
+-          breaksw
+-        case 2:
+-          metamail -d $fname
+-          breaksw
+-        case 3:
+-          goto record
+-        case 4:
+-          exit
+-    endsw
+-goto whatnext
+-exit 0
+-cleanup:
+-kill -9 $PID >& /dev/null
++record=1
++
++while true
++do
++	if test $record -eq 1
++	then
++		echo -n "Press RETURN when you are ready to start recording: "
++		read foo
++
++		fname=`tempfile -p metamail -m 600`
++		fnameraw=`tempfile -p metamail -m 600`
++
++		echo "To: $to" > $fname
++		echo "Subject: $subject" >> $fname
++		echo "CC: $cc" >> $fname
++		echo "MIME-Version: 1.0" >> $fname
++		echo "Content-Type: audio/basic" >> $fname
++		echo "Content-Transfer-Encoding: base64" >> $fname
++		echo "" >> $fname
++
++		trap "kill -9 $! > /dev/null 2>&1" HUP INT TERM
++
++		if test -z "RECORD_AUDIO"
++		then
++			(cat < $dev > $fnameraw) &
++		else
++			($RECORD_AUDIO > $fnameraw) &
++		fi
++		echo -n "press RETURN when you are done recording: "
++		read foo
++		echo One moment please...
++		sleep 1
++		echo -n Killing recording job...
++		kill -9 $! > /dev/null 2>&1
++		mimencode -b < $fnameraw >> $fname
++		rm $fnameraw
++		echo "" >> $fname
++	fi
++	record=0
++
++	echo ""
++	echo "What do you want to do?"
++	echo ""
++	echo "1 -- Send mail"
++	echo "2 -- Listen to recorded message"
++	echo "3 -- Replace with a new recording"
++	echo "4 -- Quit"
++	read which
++	case $which in
++		1) echo -n "Sending mail, please wait...  "
++		  $MAILCOMMAND $to $cc < $fname
++
++		  if test $? -eq 0
++		  then
++			echo Done.
++			rm $fname
++			exit 0
++		  else
++			echo Mail delivery failed, draft is in $fname
++		  fi ;;
++		2) metamail -d $fname ;;
++		3) record=1 ;;
++		4) exit 0 ;;
++	esac
++done
+--- metamail-2.7.orig/bin/mailto-hebrew
++++ metamail-2.7/bin/mailto-hebrew
+@@ -0,0 +1,76 @@
++#!/bin/sh -e
++# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++# 
++# Permission to use, copy, modify, and distribute this material 
++# for any purpose and without fee is hereby granted, provided 
++# that the above copyright notice and this permission notice 
++# appear in all copies, and that the name of Bellcore not be 
++# used in advertising or publicity pertaining to this 
++# material without the specific, prior written permission 
++# of an authorized representative of Bellcore.  BELLCORE 
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Conversion from C shell to Bourne shell
++# by Bob Glickstein, Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp. (Z-Code)
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
++
++MYFONTDIR=/usr/lib/X11/fonts/misc
++
++if test ! -z "${MM_CHARSET:-}"
++then
++	if test "$MM_CHARSET" = iso-8859-8
++	then
++		mailto $*
++		exit 0
++	fi
++fi
++
++if test ! -d "$MYFONTDIR"
++then
++	echo The Hebrew font has not been installed properly on this machine.
++	exit 1
++fi
++
++if test -z "${DISPLAY:-}"
++then
++	echo Hebrew mail may only be composed under X11 or on a Hebrew terminal.
++	exit 1
++fi
++
++#
++# Do we have a font server?
++#
++FSGREP=`xset q | grep "tcp/localhost:7100"`
++if test ! -z "${FSGREP:-}"
++then
++        FPGREP=`xset q | grep $MYFONTDIR`
++        if test -z "${FPGREP:-}"
++        then
++            echo Adding $MYFONTDIR to your font path.
++            xset +fp "$MYFONTDIR"
++        else
++            echo Your font path appears to be correctly set.
++        fi
++else
++    echo Your font path appears to be correctly set.
++fi
++
++echo Running xterm to compose mail in iso-8859-8, please wait...
++
++MM_CHARSET=iso-8859-8; export MM_CHARSET
++xterm -fn \*iso-8859-8 -e mailto $*
+--- metamail-2.7.orig/bin/Makefile.in
++++ metamail-2.7/bin/Makefile.in
+@@ -0,0 +1,217 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++MAINTAINERCLEANFILES = Makefile.in
++
++bin_SCRIPTS = audiocompose audiosend extcompose getfilename 			mailserver mailto-hebrew metasend mimeit 			patch-metamail rcvAppleSingle showaudio showexternal 			shownonascii showpartial showpicture sndAppleSingle 			sun-audio-file sun-message sun-message.csh 			sun-to-mime sun2mime uudepipe uuenpipe
++
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = ../metamail/config.h
++CONFIG_CLEAN_FILES = 
++SCRIPTS =  $(bin_SCRIPTS)
++
++DIST_COMMON =  Makefile.am Makefile.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++all: all-redirect
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++install-binSCRIPTS: $(bin_SCRIPTS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	@list='$(bin_SCRIPTS)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
++	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	  else if test -f $(srcdir)/$$p; then \
++	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
++	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	  else :; fi; fi; \
++	done
++
++uninstall-binSCRIPTS:
++	@$(NORMAL_UNINSTALL)
++	list='$(bin_SCRIPTS)'; for p in $$list; do \
++	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	done
++tags: TAGS
++TAGS:
++
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = bin
++
++distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign bin/Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am: install-binSCRIPTS
++install-exec: install-exec-am
++
++install-data-am:
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-binSCRIPTS
++uninstall: uninstall-am
++all-am: Makefile $(SCRIPTS)
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++	$(mkinstalldirs)  $(DESTDIR)$(bindir)
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-generic clean-am
++	-rm -f libtool
++
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-generic distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-am
++
++.PHONY: uninstall-binSCRIPTS install-binSCRIPTS tags distdir info-am \
++info dvi-am dvi check check-am installcheck-am installcheck \
++install-exec-am install-exec install-data-am install-data install-am \
++install uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/bin/showpicture
++++ metamail-2.7/bin/showpicture
+@@ -1,6 +1,4 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
+ # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ # 
+ # Permission to use, copy, modify, and distribute this material 
+@@ -13,84 +11,111 @@
+ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+-#
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
+-
+-if (! $?X_VIEWER) then
+-set X_VIEWER="xloadimage -view -quiet -geometry +1+1"
+-# set X_VIEWER="xv -geometry +1+1"
+-endif
+-if ($1 == "-viewer" && $#argv > 1) then
+-    set X_VIEWER = "$2"
+-    shift
+-    shift
+-endif
+-
+-if (! $?MM_NOTTTY) then
+-    set MM_NOTTTY=0
+-endif
+-if (! $?DISPLAY) then
+-    echo ""
+-    echo This message contains a picture, which can currently only be
+-    echo viewed when running X11.  If you read this message while running
+-    echo X11, and have your DISPLAY variable set, you will then
+-    echo be able to see the picture properly.
+-    echo ""
+-    if ($MM_NOTTTY) then
+-        set fname=${METAMAIL_TMPDIR}/sp.$$
+-        echo "The picture is being automatically stored in the file $fname"
+-        echo "If you do not want this file, please delete it."
+-    else
+-        echo -n "Do you want to write the picture out to a file [y] ? "
+-        set ANS=$<
+-        if ("$ANS" =~ n* ||  "$ANS" =~ N* ) exit 0
+-        while ( 1 == 1)
+-            echo -n "File name:"
+-            set fname=$<
+-            if (! -f $fname) then
+-                break
+-            else
+-                echo "$fname already exists. Try again"
+-            endif
+-        end
+-    endif
+-    cp $1 $fname
+-    if ($status == 0) echo Wrote file $fname
+-    exit 0
+-endif
+-
+-if ($#argv == 0) then
+-    set SQUIRREL=${METAMAIL_TMPDIR}/sp.$$
+-    cat > $SQUIRREL
+-else
+-    set SQUIRREL="$*"
+-endif
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
+ 
+-echo NOTE:  TO MAKE THE PICTURE WINDOW GO AWAY, JUST TYPE 'q' IN IT.
+-if ($#argv == 0) then
+-    echo "==> TO SAVE THIS IMAGE, COPY THE FILE $SQUIRREL BEFORE EXITING"
+-    echo ""
+-    $X_VIEWER $SQUIRREL
+-    rm $SQUIRREL
++if test -z "${X_VIEWER:-}"
++then
++	X_VIEWER="xloadimage -view -quiet"
++# X_VIEWER="xv"
++fi
++
++if test "$1" = "-viewer" -a ! -z "$2"
++then
++	X_VIEWER=$2
++	shift
++	shift
++fi
++
++if test -z "${MM_NOTTY:-}"
++then
++	MM_NOTTY=0
++fi
++if test -z "${DISPLAY:-}"
++then
++	echo ""
++	echo This message contains a picture, which can currently only be
++	echo viewed when running X11.  If you read this message while running
++	echo X11, you will be able to see the picture properly.
++	if test $MM_NOTTY -eq 1
++	then
++		fname=$(mktemp /tmp/metamail.XXXXXX)
++		echo "The picture is being automatically stored in the file $fname"
++		echo "If you do not want this file, please delete it."
++	else
++		echo -n "Do you want to write the picture out to a file [y] ? "
++		read ANS
++		case "$ANS" in
++		    [Nn]*)	exit 0;;
++		    *)	looping=1
++			while test $looping -eq 1
++			do
++				echo -n "File name: "
++				read fname
++				if test -f "$fname"
++				then
++					echo "$fname already exists. Try again"
++				else
++					looping=0
++				fi
++			done ;;
++		esac
++	fi
++	cp "$1" "$fname"
++	if test $? -eq 0
++	then
++		echo Wrote file "$fname"
++	fi
++	exit 0
++fi
++
++if test -z "$1"
++then
++	SQUIRREL=$(mktemp /tmp/metamail.XXXXXX)
++	cat > $SQUIRREL
+ else
++	SQUIRREL="$*"
++fi
+ 
+-foreach i ($*)
+-    echo "==> TO SAVE THIS IMAGE, COPY THE FILE $i BEFORE EXITING"
+-    echo ""
+-    set dir=$i:h
+-    if ($dir != $i) then
+-	# Make the ln sure to work	
+-	cd $dir
+-    endif
+-    ln $i $$.PRESS-q-TO-EXIT 
+-    if (! $status) then 
+-        sh -c "$X_VIEWER $$.PRESS-q-TO-EXIT"
+-        rm $$.PRESS-q-TO-EXIT 
+-    else
+-        sh -c "$X_VIEWER $i"
+-    endif
+-end
+-endif
++
++echo NOTE: TO MAKE THE PICTURE WINDOW GO AWAY, JUST TYPE 'q' IN IT.
++if test -z "$1"
++then
++	echo "==> TO SAVE THIS IMAGE, COPY THE FILE $SQUIRREL BEFORE EXITING"
++	echo
++	$X_VIEWER $SQUIRREL
++	rm $SQUIRREL
++else
++	for i in $SQUIRREL
++	do
++		echo "==> TO SAVE THIS IMAGE, COPY THE FILE $i BEFORE EXITING"
++		echo
++		dir=$(dirname $i)
++		base=$(basename $i)
++		if test ! "$base" = "$i"
++		then
++			cd $dir
++		fi
++		if ln $i $$.PRESS-q-TO-EXIT  > /dev/null 2>&1
++		then
++		    $X_VIEWER $$.PRESS-q-TO-EXIT
++		    rm $$.PRESS-q-TO-EXIT 
++		else
++		    $X_VIEWER $i
++		fi
++	done
++fi
+--- metamail-2.7.orig/bin/showpartial
++++ metamail-2.7/bin/showpartial
+@@ -1,92 +1,156 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
+-
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
+-
+-set TREEROOT=${METAMAIL_TMPDIR}/m-prts-`whoami`
+-if ($#argv < 3 || $#argv > 4) then
+-    echo "Usage:  showpartial file id partnum totalnum"
+-    exit -1
+-endif
+-set file=$1
++#!/bin/sh -e
++# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++# 
++# Permission to use, copy, modify, and distribute this material 
++# for any purpose and without fee is hereby granted, provided 
++# that the above copyright notice and this permission notice 
++# appear in all copies, and that the name of Bellcore not be 
++# used in advertising or publicity pertaining to this 
++# material without the specific, prior written permission 
++# of an authorized representative of Bellcore.  BELLCORE 
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++if [ -z "$METAMAIL_TMPDIR" ]
++then
++	METAMAIL_TMPDIR=/tmp
++fi
++
++
++
++if test -z "$3" -o ! -z "$5"
++then
++	echo "Usage: showpartial file id partnum totalnum"
++	exit 1
++fi
++
++file=$1
++
+ # This next line is because message-id can contain weird chars
+-set id=`echo $2 | tr -d  \!\$\&\*\(\)\|\'\"\;\/\<\>\\` 
+-@ partnum = $3
+-if ($#argv == 3 || $4 == "") then
+-    set totalnum=-1
++id=$(echo "$2" | tr -d \!\$\&\*\(\)\|\'\"\;\/\<\>\\\\ )
++
++partnum=$3
++
++if test -z "$4"
++then
++	totalnum=-1
++else
++	totalnum=$4
++fi
++
++if [ -n "$HOME" ] ; then
++# If we have a home directory, create a temporary dir and
++# store the name there unless the file already exists
++# and the directory it points to is valid directory
++	[ -e "$HOME/.metamail_treeroot" ] && TREEROOT=`cat $HOME/.metamail_treeroot`
++	[ -e "$TREEROOT" ] && [ ! -d "$TREEROOT" ] && rm -f "$TREEROOT" 
++	if [ ! -e "$HOME/.metamail_treeroot" ] || [ ! -e "$TREEROOT" ]; then
++		TREEROOT=`mktemp -d -t msg-parts.XXXXXX` || { echo "$0: Cannot create temporary dir!" >&2 ; exit 1; }
++		echo $TREEROOT >$HOME/.metamail_treeroot
++	fi
+ else
+-    @ totalnum = $4
+-endif
++	TREEROOT=$METAMAIL_TMPDIR/msg-parts-`whoami`
++	# Sanity check: is this a directory?
++	[ -e "$TREEROOT" ] && [ ! -d "$TREEROOT" ] && rm -f "$TREEROOT" 
++	# Sanity check, does it belong to us?
++	if [ -d "$TREEROOT" ] ; then
++		treeuid=`stat -c %u "$TREEROOT"`
++		if [ "$treeuid" -ne "`id -u`" ]; then
++			echo "$0: Tried to use $TREEROOT but it does not belong to us! Aborting." >&2
++			exit 1
++		fi
++	else
++		mkdir -p "$TREEROOT" || { echo "$0: Cannot create dir $TREEROOT!" >&2 ; exit 1; }
++	fi
++
++fi
++if test ! -d "${TREEROOT}/$id"
++then
++	mkdir "${TREEROOT}/$id"
++	if test $? -ne 0
++	then
++	        echo mkdir "${TREEROOT}/$id" failed
++		exit 1
++	fi
++fi
+ 
+-if (! -d  $TREEROOT)  then
+-    mkdir $TREEROOT
+-    if ($status) then 
+-        echo mkdir $TREEROOT failed
+-        exit -1
+-    endif
+-endif
+-if (! -d ${TREEROOT}/$id) then 
+-    mkdir ${TREEROOT}/$id
+-    if ($status) then 
+-        echo mkdir ${TREEROOT}/$id failed
+-        exit -1
+-    endif
+-endif
+-cp $file ${TREEROOT}/$id/$partnum
+-if ($status) then 
+-    echo cp $file ${TREEROOT}/$id/$partnum failed
+-    exit -1
+-endif
+-if ($totalnum == -1) then
+-    if (-e ${TREEROOT}/$id/CT) then
+-	set totalnum=`cat ${TREEROOT}/$id/CT`
+-    else
+-    	set totalnum=-1  #GROSS HACK
+-    endif
++cp $file "${TREEROOT}/$id/$partnum"
++if test $? -ne 0
++then
++	echo cp $file "${TREEROOT}/$id/$partnum" failed
++	exit 1
++fi
++
++if test $totalnum -eq -1
++then
++	if test -r "${TREEROOT}/$id/CT"
++	then
++		totalnum=`cat "${TREEROOT}/$id/CT"`
++	else
++    		totalnum=-1
++	fi
+ else
+-    echo $totalnum >! ${TREEROOT}/$id/CT
+-endif
++	echo $totalnum > "${TREEROOT}/$id/CT"
++fi
++
+ # Slightly bogus here -- the shell messes up the newlines in the headers
+-# If you put $MM_HEADERS in quotes, it doesn't help.
+ # if ($partnum == 1) then
+-#     echo $MM_HEADERS > ${TREEROOT}/$id/HDRS
++#     echo $MM_HEADERS > "${TREEROOT}/$id/HDRS"
+ # endif
+-set found=0
+-set ix=1
+-set list=""
+-set limit=$totalnum
+-if ($limit == -1) set limit=25
+-while ($ix <= $limit)
+-    if (-e ${TREEROOT}/$id/$ix) then
+-	set list="$list $ix"
+-	@ found ++
+-    endif
+-    @ ix ++
+-end
+-if ($found == $totalnum) then
+-    cd ${TREEROOT}/$id
+-    cat $list > ${TREEROOT}/$id/FULL
+-#    cat ${TREEROOT}/$id/HDRS $list > ${TREEROOT}/$id/FULL
+-    rm $list
+-    echo All parts of this ${totalnum}-part message have now been read.
+-    metamail -d  ${TREEROOT}/$id/FULL
+-    echo WARNING:  To save space, the full file is now being deleted.  
+-    echo You will have to read all $totalnum parts again to see the full message again.
+-    rm ${TREEROOT}/$id/FULL
+-    rm ${TREEROOT}/$id/CT
+-#    rm ${TREEROOT}/$id/HDRS
+-    cd
+-    rmdir ${TREEROOT}/$id
+-    rmdir ${TREEROOT} >& /dev/null
++found=0
++ix=1
++list=
++limit=$totalnum
++if test "$limit" -eq -1
++then
++	limit=25
++fi
++
++while test "$ix" -le "$limit"
++do
++	if test -f "${TREEROOT}/$id/$ix"
++	then
++		list="$list $ix"
++		found=$(($found + 1))
++	fi
++	ix=`expr $ix + 1`
++done
++
++if test $found = "$totalnum"
++then
++	cd "${TREEROOT}/$id"
++	cat $list > "${TREEROOT}/$id/FULL"
++	rm $list
++	echo All parts of this "${totalnum}"-part message have now been read.
++	metamail -d < "${TREEROOT}/$id/FULL"
++	echo WARNING:  To save space, the full file is now being deleted.  
++	echo You will have to read all "$totalnum" parts again to see the full message again.
++	rm "${TREEROOT}/$id/FULL"
++	rm "${TREEROOT}/$id/CT"
++	cd ${METAMAIL_TMPDIR}
++	rmdir "${TREEROOT}/$id"
++	rmdir ${TREEROOT} > /dev/null 2>&1
++	[ -e "$HOME/.metamail_treeroot" ] && > "$HOME/.metamail_treeroot" 
+ else
+-    if (${totalnum} == -1) then
+-        echo So far you have only read $found of the several parts of this message.
+-    else
+-        echo So far you have only read $found of the $totalnum parts of this message.
+-    endif
+-    echo When you have read them all, then you will see the message in full.
+-endif
+-    
++	if test "$totalnum" -eq -1
++	then
++		echo So far you have only read $found of the several parts of this message.
++	else
++		echo So far you have only read $found of the "$totalnum" parts of this message.
++	fi
++	echo When you have read them all, then you will see the message in full.
++fi
+--- metamail-2.7.orig/bin/showexternal
++++ metamail-2.7/bin/showexternal
+@@ -1,6 +1,4 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
+ # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ # 
+ # Permission to use, copy, modify, and distribute this material 
+@@ -13,142 +11,174 @@
+ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+-# 
+ 
+-onintr cleanup
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
+-if (! $?FTP) then
+-    set FTP=ftp
+-endif
+-
+-if ($#argv <3) then
+-    echo "Usage: showexternal body-file access-type name [site [directory [mode [server]]]]"
+-    exit -1
+-endif
+-set bodyfile=$1
+-set atype=`echo $2 | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+-set name=$3
+-if ($#argv > 3) then
+-    set site=$4
+-else 
+-    set site=""
+-endif
+-if ($#argv > 4) then
+-    set dir=$5
+-else
+-    set dir=""
+-endif
+-if ($#argv > 5) then
+-    set mode=$6
+-else
+-    set mode=""
+-endif
+-if ($#argv > 6) then
+-    set server=$7
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
++
++if test -f /usr/sbin/sendmail
++then
++    MAILCOMMAND=/usr/sbin/sendmail
+ else
+-    set server=""
+-endif
++    MAILCOMMAND=/bin/mail
++fi
+ 
+-if ("$server" == "" && $atype == "mail-server") then
+-# Backward compatibility with some broken stuff
+-    set server=${name}@${site}
+-    echo WARNING -- old style mailserver syntax, using server $server
+-endif
+-
+-set ctype="`grep -i content-type: $bodyfile | sed -e 's/............: //'`"
+-if ("$ctype" == "") set ctype="text/plain"
+-set cenc=`grep -i content-transfer-encoding: $bodyfile | sed -e 's/.........................: //'`
+-set username=""
+-set pass=""
+-set TMPDIR=${METAMAIL_TMPDIR}/XXXternal.$$
++if test "$#" -lt 3
++then
++	echo "Usage: showexternal body-file access-type name [site [directory [mode]]]"
++	exit 1
++fi
++
++if [ -z "$METAMAIL_TMPDIR" ]
++then
++	METAMAIL_TMPDIR=/tmp
++fi
++
++# Check argument integrity. Don't trust mail headers
++if echo "$1$2$3$4$5$6$7" | grep -q '[[:space:]]'
++then
++	echo "Illegal white space in arguments -- possibly a mail bomb?!"
++	echo "Command was:"
++	echo \'$0\' \'$1\' \'$2\' \'$3\' \'$4\' \'$5\' \'$6\' \'$7\'
++	exit 2
++fi
++
++bodyfile=$1
++atype=$(echo "$2" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)
++name=$3
++
++site=$4
++
++dir=$5
++
++mode=$6
++
++server=$7
++
++if test -z "$server" -a $atype = "mail-server"
++then
++	server=${name}@${site}
++	echo WARNING -- old style mailserver syntax, using server "$server"
++fi
++
++ctype=$(grep -i content-type: "$bodyfile" | sed -e 's/............: //')
++if test -z "$ctype"
++then ctype="text/plain"
++fi
++cenc=$(grep -i content-transfer-encoding: "$bodyfile" | sed -e 's/.........................: //')
++username=
++pass=
++TMPDIR=$METAMAIL_TMPDIR/XXXternal.$$
++trap 'cd $METAMAIL_TMPDIR ; rmdir "$TMPDIR" >/dev/null 2>&1' 1 2 3 15
+ mkdir $TMPDIR
+-pushd $TMPDIR
+-set NEWNAME="mm.ext.$$"
+-set NEEDSCONFIRMATION=1
+-switch ("$atype")
+-    case anon-ftp:
+-	echo "This mail message contains a POINTER (reference) to data that is "
+-	echo not included in the message itself.  Rather, the data can be retrieved 
+-	echo automatically using  anonymous FTP to a site on the network.
+-	breaksw
+-    case ftp:
+-	echo "This mail message contains a POINTER (reference) to data that is "
+-	echo not included in the message itself.  Rather, the data can be retrieved 
+-	echo automatically using  the FTP protocol to a site on the network.
+-	breaksw
+-    case mail-server:  
+-	cat > ${METAMAIL_TMPDIR}/ext.junk.$$ <<!
+-This mail message contains a POINTER (reference) to data that is 
+-not included in the message itself.  Rather, the data can be retrieved 
+-by sending a special mail message to a mail server on the network.
+-However, doing this automatically is slightly dangerous, because  someone
+-might be using this mechanism to cause YOU to send obnoxious mail.
+-For that reason, the mail message that WOULD be sent is being shown to you
+-first for your approval.
++PUSHED_DIR=`pwd`
++cd $TMPDIR
++NEWNAME="mm.ext.$$"
++NEEDSCONFIRMATION=1
++
++case $atype in
++	anon-ftp)
++		echo "This mail message contains a POINTER (reference) to data that is "
++		echo not included in the message itself.  Rather, the data can be retrieved 
++		echo automatically using anonymous FTP to a site on the network. ;;
++		
++	ftp)
++		echo "This mail message contains a POINTER (reference) to data that is "
++		echo not included in the message itself.  Rather, the data can be retrieved 
++		echo automatically using the FTP protocol to a site on the network. ;;
++
++	mail-server)
++		TMPF=$(mktemp /tmp/ext.junk.XXXXXX)
++		cat > $TMPF <<!
++This mail message contains a POINTER (reference) to data that is not
++included in the message itself.  Rather, the data can be retrieved by
++sending a special mail message to a mail server on the network.
++However, doing this automatically is slightly dangerous, because
++someone might be using this mechanism to cause YOU to send obnoxious
++mail.  For that reason, the mail message that WOULD be sent is being
++shown to you first for your approval.
+ 
+ This is the message that will be sent if you choose to go ahead and
+-retreive the external data:
++retrieve the external data:
+ 
+ Subject: Automated Mail Server Request
+-To: ${server}
++To: $server
+ 
+ !
+-	sed -e 1,/^\$/d < $bodyfile >> ${METAMAIL_TMPDIR}/ext.junk.$$
+-	more ${METAMAIL_TMPDIR}/ext.junk.$$
+-	rm ${METAMAIL_TMPDIR}/ext.junk.$$
+-	breaksw
+-    default:
+-	# IGNORE ALL THE OTHERS -- AUTOMATIC FOR LOCAL-FILE, AFS.
+-	set NEEDSCONFIRMATION=0
+-endsw
++		sed -e 1,/^\$/d < "$bodyfile" >> $TMPF
++		sensible-pager $TMPF
++		rm $TMPF ;;
++
++	*)
++		NEEDSCONFIRMATION=0 ;;
++esac
+ 
+-if ($NEEDSCONFIRMATION) then
++if test $NEEDSCONFIRMATION -ne 0
++then
+ 	echo ""
+-	echo -n "Do you want to proceed with retrieving the external data [y] ? "
+-	set ANS=$<
+-	if ("$ANS" =~ n* ||  "$ANS" =~ N* ) then
+-		cd ${METAMAIL_TMPDIR}
+-		rm -rf $TMPDIR
+-		exit 0
+-	endif
+-endif
+-
+-switch ("$atype")
+-    case anon-ftp:
+-	set username=anonymous
+-	set pass=`whoami`@`hostname`
+-	# DROP THROUGH
+-    case ftp:
+-	if ("$site" == "") then
+-	    echo -n "Site for ftp access: "
+-	    set site=$<
+-	endif
+-	if ("$username" == "") then
+-	    echo -n "User name at site ${site}: "
+-	    set username=$<
+-	endif
+-	if ("$pass" == "") then
+-	    echo -n "Password for user $username at site ${site}: "
+-	    stty -echo
+-	    set pass=$<
+-	    stty echo
+-	    echo ""
+-	endif
+-	if ("$dir" == "") then
+-	    set DIRCMD=""
+-	else
+-	    set DIRCMD="cd $dir"
+-	endif
+-	if ("$mode" == "") then
+-	    set MODECMD=""
+-	else
+-	    set MODECMD="type $mode"
+-	endif
+-	echo OBTAINING MESSAGE BODY USING FTP
+-	echo SITE: $site USER $username
+-	$FTP -n <<!
++	echo -n "Do you want to proceed with retrieving the external data? [y] "
++	read ANS
++	case "$ANS" in
++		[Nn]*)	cd $METAMAIL_TMPDIR
++			rm -rf $TMPDIR;
++			exit 0 ;;
++	esac
++fi
++
++case "$atype" in
++	anon-ftp | ftp)
++		case "$atype" in
++		anon-ftp )
++			username=anonymous
++			pass=`whoami`@`hostname`
++			;;
++		esac
++
++		if test -z "$site"
++		then
++			echo -n "Site for ftp access: "
++			read site
++		fi
++		if test -z "$username"
++		then
++			echo -n "User name at site ${site}: "
++			read username
++		fi
++		if test -z "$pass"
++		then
++			echo -n "Password for user $username at site ${site}: "
++			stty -echo
++			read pass
++			stty echo
++			echo ""
++		fi
++		if test -z "$dir"
++		then
++			DIRCMD=""
++		else
++			DIRCMD="cd $dir"
++		fi
++		if test -z "$mode"
++		then
++			MODECMD=""
++		else
++			MODECMD="type $mode"
++		fi
++		echo OBTAINING MESSAGE BODY USING FTP
++		echo SITE: "$site" USER: "$username"
++		${FTP:-ftp} -n <<!
+ open $site
+ user $username $pass
+ $DIRCMD
+@@ -156,91 +186,92 @@
+ get $name $NEWNAME
+ quit
+ !
+-	if (! -e $NEWNAME) then
+-	    echo FTP failed.
+-	    cd ${METAMAIL_TMPDIR}
+-	    rm -rf $TMPDIR
+-	    exit -1
+-	endif
+-	breaksw
+-    case afs:
+-    case local-file:
+-	if (! -e $name) then
+-	    echo local file not found
+-	    cd ${METAMAIL_TMPDIR}
+-	    rm -rf $TMPDIR
+-	    exit -1
+-	endif
+-    	set NEWNAME=$name
+-	echo GETTING BODY FROM FILE NAMED: $NEWNAME
+-	breaksw
+-    case mail-server:  # A very special case
+-	if ("$bodyfile" == "") then
+-	    echo mail-server access-type requires a body file
+-	    cd ${METAMAIL_TMPDIR}
+-	    rm -rf $TMPDIR
+-	    exit -1
+-	endif
+-	echo Subject: Automated Mail Server Request > $NEWNAME
+-	echo To: ${server} >> $NEWNAME
+-	echo "" >> $NEWNAME
+-	sed -e 1,/^\$/d < $bodyfile >> $NEWNAME
+-	echo "" >> $NEWNAME
+-	/usr/lib/sendmail -t  < $NEWNAME
+-	if ($status) then
+-	    echo sendmail failed
+-	    cd ${METAMAIL_TMPDIR}
+-	    rm -rf $TMPDIR
+-	    exit -1
+-	endif
+-	cd ${METAMAIL_TMPDIR}
+-	rm -rf $TMPDIR
+-	echo Your $ctype data has been requested from a mail server.
+-	exit 0
+-    default:
+-	echo UNRECOGNIZED ACCESS-TYPE
+-	cd ${METAMAIL_TMPDIR}
+-	rm -rf $TMPDIR
+-	exit -1
+-endsw
+-if ($cenc == base64) then
+-	mimencode -u -b < $NEWNAME > OUT
+-	mv OUT $NEWNAME
+-else if ($cenc == quoted-printable) then
+-	mimencode -u -q < $NEWNAME > OUT
+-	mv OUT $NEWNAME
+-endif
+-
+-popd
+-if ($atype == "local-file") then
+-    metamail -p  -b -c "$ctype" $NEWNAME
+-else
+-    metamail -p -b -c "$ctype" $TMPDIR/$NEWNAME
+-endif
++		if test ! -r "$NEWNAME"
++		then
++			echo FTP failed.
++			cd $METAMAIL_TMPDIR
++			rm -rf $TMPDIR
++			exit 1
++		fi
++		;;
++
++	afs|local-file)
++		if test ! -r "$name"
++		then
++			echo local file not found
++			cd $METAMAIL_TMPDIR
++			rm -rf $TMPDIR
++			exit 1
++		fi
++		NEWNAME=$name
++		echo GETTING BODY FROM FILE NAMED: "$NEWNAME" ;;
++
++	mail-server)
++		if test -z "$bodyfile"
++		then
++			echo mail-server access-type requires a body file
++			cd $METAMAIL_TMPDIR
++			rm -rf $TMPDIR
++			exit 1
++		fi
++		echo Subject: Automated Mail Server Request > "$NEWNAME"
++		echo To: "$server" >> "$NEWNAME"
++		echo >> "$NEWNAME"
++		sed -e 1,/^\$/d < "$bodyfile" >> "$NEWNAME"
++		$MAILCOMMAND -t < "$NEWNAME"
++		if test $? -ne 0
++		then
++			echo sendmail failed
++			cd $METAMAIL_TMPDIR
++			rm -rf $TMPDIR
++			exit 1
++		fi
++		cd $METAMAIL_TMPDIR
++		rm -rf $TMPDIR
++		echo Your "$ctype" data has been requested from a mail server.
++		exit 0 ;;
++	*)
++		echo UNRECOGNIZED ACCESS-TYPE
++		cd $METAMAIL_TMPDIR
++		rm -rf $TMPDIR
++		exit 1 ;;
++esac
++
++if test "$cenc" = base64
++then
++	mimencode -u -b < "$NEWNAME" > OUT
++	mv OUT "$NEWNAME"
++elif test "$cenc" = quoted-printable
++then
++	mimencode -u -q < "$NEWNAME" > OUT
++	mv OUT "$NEWNAME"
++fi
++
++cd $PUSHED_DIR
++case "$atype" in
++    local-file ) metamail -b -p -c "$ctype" "$NEWNAME" ;;
++    * ) metamail -b -p -c "$ctype" "$TMPDIR/$NEWNAME" ;;
++esac
+ 
+-if ($status) then
++if test $? -ne 0
++then
+ 	echo metamail failed
+-	cd ${METAMAIL_TMPDIR}
++	cd $METAMAIL_TMPDIR
+ 	rm -rf $TMPDIR
+-	exit -1
+-endif
++	exit 1
++fi
+ 
+-if ($NEWNAME != $name) then
++if test ! "$NEWNAME" = "$name"
++then
+ 	echo ""
+-	echo The data just displayed is stored in the file $TMPDIR/$NEWNAME
++	echo The data just displayed is stored in the file "$TMPDIR/$NEWNAME"
+ 	echo "Do you want to delete it?"
+-	rm -i $TMPDIR/$NEWNAME
+-endif
++	rm -i "$TMPDIR/$NEWNAME"
++fi
+ 
+-if (! -e ${TMPDIR}/${NEWNAME}) then
+-    cd ${METAMAIL_TMPDIR}
+-    rmdir $TMPDIR
+-endif
+-exit 0
+-
+-cleanup:
+-cd ${METAMAIL_TMPDIR}
+-if (-e $TMPDIR) then    
+-    rmdir $TMPDIR
+-endif
+-exit -1
++if test ! -r "${TMPDIR}/${NEWNAME}"
++then
++	cd /
++	cd $METAMAIL_TMPDIR
++	rmdir $TMPDIR
++fi
+--- metamail-2.7.orig/bin/rcvAppleSingle
++++ metamail-2.7/bin/rcvAppleSingle
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/sh -e
+ #
+ # Very simple shellscript to support recieving Macintosh files
+ # and store them in a UNIX filesystem used by the CAP AUFS program.
+--- metamail-2.7.orig/bin/patch-metamail
++++ metamail-2.7/bin/patch-metamail
+@@ -1,20 +1,58 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
+-set HOSTNAME=thumper.bellcore.com
+-set DIRNAME=pub/nsb
+-set PREFIX="mm.patch."
+-
+-if ($#argv < 2 || $#argv > 5) then
+-	echo Usage:  patch-metamail source-tree-root patch-number [hostname [dirname [prefix]]]
+-	exit -1
+-endif
+-
+-set TREEROOT=$1
+-set PATCHNUMBER=$2
+-if ($#argv > 2) set HOSTNAME=$3
+-if ($#argv > 3) set DIRNAME=$4
+-if ($#argv > 4) set PREFIX=$5
++#!/bin/sh -e
++# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++# 
++# Permission to use, copy, modify, and distribute this material 
++# for any purpose and without fee is hereby granted, provided 
++# that the above copyright notice and this permission notice 
++# appear in all copies, and that the name of Bellcore not be 
++# used in advertising or publicity pertaining to this 
++# material without the specific, prior written permission 
++# of an authorized representative of Bellcore.  BELLCORE 
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Conversion from C shell to Bourne shell
++# by Bob Glickstein, Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp. (Z-Code)
++# 
++# Permission to use, copy, modify, and distribute this material for
++# any purpose and without fee is hereby granted, provided that the
++# above copyright notice and this permission notice appear in all
++# copies, and that the name of Z-Code not be used in advertising or
++# publicity pertaining to this material without the specific, prior
++# written permission of an authorized representative of Z-Code.
++# Z-CODE MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY OF
++# THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", WITHOUT ANY
++# EXPRESS OR IMPLIED WARRANTIES.
++
++HOSTNAME=thumper.bellcore.com
++DIRNAME=pub/nsb
++PREFIX=mm.patch.
++
++if test -z "$2" -o ! -z "$6"
++then
++	echo "Usage: patch-metamail source-tree-root patch-number [hostname [dirname [prefix]]]"
++	exit 1
++fi
++
++TREEROOT=$1
++PATCHNUMBER=$2
++
++if test ! -z "$3"
++then
++	HOSTNAME=$3
++fi
++
++if test ! -z "$4"
++then
++	DIRNAME=$4
++fi
++
++if test ! -z "$5"
++then
++	PREFIX=$5
++fi
+ 	
+ echo WARNING:  This program, if allowed to do so, will attempt to 
+ echo install a PATCH file for your metamail sources which are rooted 
+@@ -22,15 +60,16 @@
+ echo ""
+ echo It will use a patch file that it retrieves via anonymous ftp
+ echo from the host $HOSTNAME, in the directory $DIRNAME, 
+-echo with filenames starting with ${PREFIX}.
++echo with filenames starting with $PREFIX.
+ echo ""
+-echo -n "Do you want to install the patch in directory $TREEROOT [y/n] ? "
+-set ans=$<
+-if ($ans == "y" || $ans == "Y") then
+-    cd $TREEROOT
+-    set ident=`whoami`@`hostname`
+-    echo Using anonymous ftp with password $ident
+-    ftp -n <<!
++echo -n "Do you want to install the patch in directory $TREEROOT (y/n)? [n] "
++read ans
++
++case "$ans" in
++	[Yy]*) cd $TREEROOT
++	       ident=`whoami`@`hostname`
++	       echo Using anonymous ftp with password $ident
++	       ftp -n <<!
+ open $HOSTNAME
+ user anonymous $ident
+ cd $DIRNAME
+@@ -38,8 +77,6 @@
+ get ${PREFIX}${PATCHNUMBER}
+ quit
+ !
+-    patch -p < ${PREFIX}${PATCHNUMBER}
+-else
+-	echo Patch not installed
+-endif
+-
++	       patch -p < ${PREFIX}${PATCHNUMBER} ;;
++	*) echo Patch not installed
++esac
+--- metamail-2.7.orig/bin/showaudio
++++ metamail-2.7/bin/showaudio
+@@ -1,6 +1,4 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
+ # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ # 
+ # Permission to use, copy, modify, and distribute this material 
+@@ -13,200 +11,309 @@
+ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+-#
+ 
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
+-
+-# First, figure out which machine to play it on!
+-set thishost=`hostname`
+-
+-# Note that there are some special lines in here that only work at Bellcore,
+-# Specifically involving phone playback from the machine "greenbush".
+-# Everything should work fine at other sites, though
+-set AUDIOBINDIR=/u/andrew/phone-sau/bin
+-set AUDIOPHONEHOST=greenbush
+-set AUDIOPHONEHOSTLONG=greenbush.bellcore.com
+-set AUDIOLOGMAIL=andrew@thumper.bellcore.com
+-set ORG="Bellcore"
+-set STDINPUT=0
+-if ("$1" == "-p") then
+-    set AUDIOPHONE=$2
+-    shift
+-    shift
+-endif
+-if ("$1" == "-s") then
+-    set AUDIOSPEAKERFORCE = 1
+-    shift
+-endif
+-if ($?AUDIOPHONE || $?AUDIOPHONEFORCE) then
+-    goto playphone
+-endif
+-if (! -d $AUDIOBINDIR) then
+-    set AUDIOSPEAKERFORCE=1
+-endif
+-
+-if ("$1" == "-") then
+-    set STDINPUT=1
+-    shift
+-endif
+-if ($#argv < 1) then
+-    set STDINPUT=1
+-endif
+-	
+-if (! $STDINPUT && ! $?AUDIOSPEAKERFORCE && ! $?AUDIOPHONEFORCE) then
+-    if ($?MM_NOTTTY) then
+-	if ($MM_NOTTTY == 1) then
+-	    setenv MM_NOTTTY 0
+-	    xterm -e showaudio $*
+-	    exit 0
+-	endif
+-    endif
+-choosehardware:
+-    echo This program can display audio on the speakers of some workstations, 
+-    echo "or (at some sites) it can call you on the telephone.  Please choose one:"
+-    echo ""
+-    echo "1 -- Use the computer's speaker"
+-    echo "2 -- Call me on the telephone"
+-    echo ""
+-    echo -n "Which do you prefer (1 or 2)? "
+-    set ans=$<
+-    if ($ans == 2)  then
+-	echo "OK, we'll use the telephone..."
+-	set AUDIOPHONEFORCE=1
+-	echo "In the future, you can avoid this question by setting the environment variable"
+-	echo "AUDIOPHONEFORCE to 1"
+-	goto playphone
+-    else if ($ans == 1) then
+-    	echo "OK, Attempting to play the audio using your computer's speaker.."
+-    	set AUDIOSPEAKERFORCE=1
+-	echo "In the future, you can avoid this question by setting the environment variable"
+-	echo "AUDIOSPEAKERFORCE to 1"
+-    else
+-	echo "That is NOT one of your choices."
+-	goto choosehardware
+-    endif
+-endif
+-
+-set audiohost=$thishost
+-if ($?DISPLAY) then
+-    set audiohost=`echo $DISPLAY | sed -e 's/:.*//'`
+-    if ($audiohost == "unix") set audiohost=$thishost
+-    if ($audiohost == "") set audiohost=$thishost
+-endif
+-if ($?AUDIOHOST) then
+-	set audiohost=$AUDIOHOST
+-endif
+-
+-if ($audiohost != $thishost) then
+-    echo Sending audio to $audiohost...
+-    if ($?MMS_AUDIO) then
+-        if ($STDINPUT) then
+-            cat | mms -host $audiohost "show audio/basic" -
+-        else
+-            cat $* | mms -host $audiohost "show audio/basic" -
+-        endif
+-        exit 0
+-    endif
+-
+-# The next two lines are very inefficient, but not everyone has their path right for an rsh
+-    pushd ~ >& /dev/null
+-    set thisprog=`which showaudio`
+-    popd >& /dev/null
+-    if ($STDINPUT) then
+-        cat | rsh $audiohost $thisprog -s -
+-    else
+-        cat $* | rsh $audiohost $thisprog  -s -
+-    endif
+-    exit 0
+-endif
+-
+-if (-f /usr/sbin/sfplay) then
+-    if ($#argv >= 1) then
+-	exec /usr/sbin/sfplay -i mu-law chan 1 rate 8000 end $*
+-    else
+-	cat > ${METAMAIL_TMPDIR}/audio.$$
+-	/usr/sbin/sfplay -i mu-law chan 1 rate 8000 end ${METAMAIL_TMPDIR}/audio.$$
+-	rm ${METAMAIL_TMPDIR}/audio.$$
+-	exit 0
+-    endif
+-else if (-d /usr/sony) then
+-    set dev=/dev/sb0
+-else if (-e /usr/bin/audioplay) then
+-#  Solaris 2.0
+-    /usr/bin/audioconvert -i raw,voice -f sun $* | /usr/bin/audioplay
+-    exit $status
+-else if (-e /bin/audioplay) then
+-#  Solaris 2.0
+-    /bin/audioconvert -i raw,voice -f sun $* | /bin/audioplay
+-    exit $status
+-else
+-    set dev=/dev/audio
+-endif
+-
+-if (-w $dev) then
+-echo Playing audio on $thishost using $dev, one moment please...
+-if ($#argv >= 1) then
+-        cat $* > $dev
++# Brought into line with metamail 2.7 beta release Csh version
++# Added sox support
++#    Dave Shield	February 1994
++
++thishost=`hostname`
++
++AUDIOBINDIR=/u/andrew/phone-sau/bin
++AUDIOPHONEHOST=greenbush
++AUDIOPHONEHOSTLONG=greenbush.bellcore.com
++AUDIOLOGMAIL=greenbush.bellcore.com
++ORG=Bellcore
++STDINPUT=0
++
++if test -x /usr/bin/remsh
++then
++			# Probably a System V based system
++			#  "rsh" is likely to be "restricted shell"
++	RSH=remsh
+ else
+-        cat > $dev
+-endif
+-exit 0
+-endif
++	RSH=rsh
++fi
++# SOX=/usr/remote/bin9/sox
++
++if test "$1" = "-p"
++then
++	AUDIOPHONE=$2
++	shift
++	shift
++fi
++
++if test "$1" = "-s"
++then
++	AUDIOSPEAKERFORCE=1
++	shift
++fi
++
++playphone=0
++if test ! -z "${AUDIOPHONE:-}" -o ! -z "${AUDIOPHONEFORCE:-}"
++then
++	playphone=1
++fi
++
++if test $playphone -eq 0
++then
++	if test ! -d "$AUDIOBINDIR"
++	then
++		AUDIOSPEAKERFORCE=1
++	fi
++
++	if test "$1" = "-"
++	then
++		STDINPUT=1
++		shift
++	fi
++	if test $# -eq 0
++	then
++		STDINPUT=1
++	fi
++
++	if test $STDINPUT -eq 0 -a -z "${AUDIOSPEAKERFORCE:-}" -a -z "${AUDIOPHONEFORCE:-}"
++	then
++		if test ! -z "${MM_NOTTTY:-}"
++		then
++			if test $MM_NOTTTY -eq 1
++			then
++				MM_NOTTTY=0; export MM_NOTTTY
++				xterm -e showaudio $*
++				exit 0
++			fi
++		fi
++		looping=1
++		while test $looping -eq 1
++		do
++		    echo This program can display audio on the speakers of some workstations, 
++		    echo "or (at some sites) it can call you on the telephone.  Please choose one:"
++		    echo ""
++		    echo "1 -- Use the computer's speaker"
++		    echo "2 -- Call me on the telephone"
++		    echo ""
++		    echo -n "Which do you prefer (1 or 2)? [1] "
++		    read ans
++		    if test "$ans" -eq 2
++		    then
++			echo "OK, we'll use the telephone..."
++			AUDIOPHONEFORCE=1
++			echo "In the future, you can avoid this question by setting the environment variable"
++			echo "AUDIOPHONEFORCE to 1"
++			playphone=1
++			looping=0
++		    elif test "$ans" -eq 1
++		    then
++			echo "OK, Attempting to play the audio using your computer's speaker.."
++			AUDIOSPEAKERFORCE=1
++			echo "In the future, you can avoid this question by setting the environment variable"
++			echo "AUDIOSPEAKERFORCE to 1"
++			looping=0
++		    else
++			echo "That is NOT one of your choices."
++		    fi
++		done
++	fi
++fi
++
++if test $playphone -eq 0
++then
++	audiohost=$thishost
++	if test ! -z "${DISPLAY:-}"
++	then
++		audiohost=`echo $DISPLAY | sed -e 's/:.*//'`
++		if test "$audiohost" = unix -o "$audiohost" = localhost
++		then
++			audiohost=$thishost
++		fi
++		if test -z "$audiohost"
++		then
++			audiohost=$thishost
++		fi
++	fi
++	if test ! -z "${AUDIOHOST:-}"
++	then
++		audiohost=$AUDIOHOST
++	fi
++
++	if test ! "$audiohost" = "$thishost"
++	then
++		echo Sending audio to $audiohost...
++		if test ! -z "${MMS_AUDIO}"
++		then
++			if test $STDINPUT -eq 1
++			then
++				cat | mms -host $audiohost "show audio/basic"
++			else
++				cat $* | mms -host $audiohost "show audio/basic"
++			fi
++			exit 0
++		fi
++		thisprog=`(cd; which showaudio)`
++		if test $STDINPUT -eq 1
++		then
++			cat | $RSH $audiohost $thisprog -s
++		else
++			cat $* | $RSH $audiohost $thisprog -s
++		fi
++		exit 0
++	fi
++
++
++	if test -f /usr/sbin/sfplay
++	then
++		if test $# -ne 0
++		then
++			exec /usr/sbin/sfplay -i mu-law chan 1 rate 8000 end $*
++		else
++			fname=$(mktemp /tmp/audio.XXXXXX)
++			cat > $fname
++			/usr/sbin/sfplay -i mu-law chan 1 rate 8000 end $fname
++			rm $fname
++			exit 0
++		fi
++	elif test -f /usr/bin/audioplay
++	then
++	# Solaris 2.0
++		/usr/bin/audioconvert -i raw,voice -f sun $* | /usr/bin/audioplay
++		exit $?
++	elif test -f /bin/audioplay
++	then
++	# Solaris 2.0
++		/bin/audioconvert -i raw,voice -f sun $* | /bin/audioplay
++		exit $?
++	elif test -d /usr/sony
++	then
++		dev=/dev/sb0
++	else
++		dev=/dev/audio
++	fi
+ 
+-playphone:
+-if (-d $AUDIOBINDIR) then
+-              set thisprog=`which showaudio`
+-	if (! $?AUDIOPHONE) then
+-	    if ($?MM_NOTTTY) then
+-		if ($MM_NOTTTY == 1) then
+-		    setenv MM_NOTTTY 0
+-		    xterm -e $thisprog $*
+-		    exit 0
+-		endif
+-	    endif
+-	    echo This message contains audio, which can be sent to your telephone.
+-	    echo Please enter the telephone number at which you would like to hear this
+-	    echo -n "audio message as you would dial it from INSIDE ${ORG}:  "
+-	    set AUDIOPHONE=$<
+-	endif
+-	if ($thishost == $AUDIOPHONEHOST || $thishost == $AUDIOPHONEHOSTLONG) then
+-	    echo Calling Phone number $AUDIOPHONE
+-	    echo "You MUST SAY HELLO when you answer the phone, or you will not hear the message."
+-	    mail -s "showaudio: `whoami` called $AUDIOPHONE" $AUDIOLOGMAIL < /dev/null
+-	    if ($STDINPUT) then
+-	        cat $AUDIOBINDIR/../GREET.au $* - | $AUDIOBINDIR/play -\# $AUDIOPHONE -
+-	    else
+-	        cat $AUDIOBINDIR/../GREET.au $* | $AUDIOBINDIR/play -\# $AUDIOPHONE -
+-	    endif
+-	    echo All done
+-	    exit 0
++	if test -w $dev
++	then
++		echo Playing audio on $thishost using $dev, one moment please...
++		if test $# -ne 0
++		then
++			if test ! -z "${SOX:-}"
++			then
++			    for ii in $*
++			    do
++#
++#  The "approved magic" to translate arbitary sounds
++#	to AU format is as follows:
++#
++#				$SOX -t auto $ii -c 1 -t aiff - | \
++#				$SOX -t aiff - -U -b -t au -c 1 -r 8000 $dev
++#
++#  But the following "direct" translation also seems to work
++				$SOX -t auto $ii -c 1 -t au -c 1 -r 8000 $dev
++			    done
++			else
++				cat $* > $dev
++			fi
++		else
++			if test ! -z "${SOX:-}"
++			then
++				fname=$(mktemp /tmp/audio.XXXXXX)
++				cat > $fname
++#
++#  See also above
++#
++				$SOX -t auto $fname -c 1 -t au -c 1 -r 8000 $dev
++				rm $fname
++			else
++				cat > $dev
++			fi
++		fi
++		exit 0
++	fi
++fi
++
++if test -d "$AUDIOBINDIR"
++then
++	thisprog=`which showaudio`
++	if test -z "${AUDIOPHONE:-}"
++	then
++		if test ! -z "${MM_NOTTTY:-}"
++		then
++			if test $MM_NOTTTY -eq 1
++			then
++				MM_NOTTTY=0; export MM_NOTTTY
++				xterm -e $thisprog $*
++				exit 0
++			fi
++		fi
++		echo This message contains audio, which can be sent to your telephone.
++		echo Please enter the telephone number at which you would like to hear this
++		echo -n "audio message as you would dial it from inside ${ORG}: "
++		read AUDIOPHONE
++	fi
++
++	if test "$thishost" = "$AUDIOPHONEHOST" \
++		-o "$thishost" = "$AUDIOPHONEHOSTLONG"
++	then
++		echo Calling Phone number $AUDIOPHONE
++		echo "You MUST SAY HELLO when you answer the phone, or you will not hear the message."
++		mail -s "showaudio: `whoami` called $AUDIOPHONE" $AUDIOLOGMAIL < /dev/null
++		if test $STDINPUT -eq 1
++		then
++			cat $AUDIOBINDIR/../GREET.au $* - | $AUDIOBINDIR/play -\# $AUDIOPHONE -
++		else
++			cat $AUDIOBINDIR/../GREET.au $* | $AUDIOBINDIR/play -\# $AUDIOPHONE -
++		fi
++		echo All done
++		exit 0
+ 	else
+-	    echo Trying to rsh to $AUDIOPHONEHOST to send audio via telephone
+-	    cat $* | rsh $AUDIOPHONEHOST $thisprog -p $AUDIOPHONE -
+-	    exit 0
+-	endif
+-endif
++		echo Trying to rsh to $AUDIOPHONEHOST to send audio via telephone
++		if test $STDINPUT -eq 1
++		then
++			cat $* - | $RSH $AUDIOPHONEHOST $thisprog -p $AUDIOPHONE -
++		else
++			cat $* | $RSH $AUDIOPHONEHOST $thisprog -p $AUDIOPHONE -
++		fi
++		exit 0
++	fi
++fi
+ echo ""
+-echo This message contains an audio mesage, which can not currently be
+-echo played on this type of workstation.   If you log into an appropriate 
+-echo "machine (currently a SPARCstations or Sony News workstation)"
+-echo and read this message there, you should be able to hear the audio
+-echo message.  
++echo "This message contains an audio mesage, which can not currently be"
++echo "played on this type of workstation.   If you log into an appropriate"
++echo "machine (currently a SPARCstation or Sony News workstation)"
++echo "and read this message there, you should be able to hear the audio"
++echo "message."
+ echo ""
+-if (! $?MM_NOTTTY) set MM_NOTTTY=0
+-if ($MM_NOTTTY == 1) then
+-    set fname=/tmp/mm.aud.$$
++
++if test -z "${MM_NOTTY:-}"
++then
++	MM_NOTTY=0
++fi
++if test $MM_NOTTY -eq 1
++then
++	fname=$(mktemp /tmp/metamail.XXXXXX)
+ else
+-    echo -n "Do you want to write the audio out to a file [y] ? "
+-    set ANS=$<
+-    if ("$ANS" =~ n* ||  "$ANS" =~ N* ) exit 0
+-    echo -n "File name:"
+-    set fname=$<
+-endif
+-cp $1 $fname
+-if ($status == 0) echo Wrote raw audio file: $fname
++	echo -n "Do you want to write the audio out to a file [y] ? "
++	read ANS
++	case "$ANS" in
++		[Nn]*)	exit 0 ;;
++	esac
++
++	echo -n "File name:"
++	read fname
++fi
++cp "$1" "$fname"
++if test $? -eq 0
++then
++	echo Wrote raw audio file: "$fname"
++fi
+ exit 0
+-
+--- metamail-2.7.orig/bin/sun-to-mime
++++ metamail-2.7/bin/sun-to-mime
+@@ -1,14 +1,20 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
+-# Provide VERY minimal support for mail generated by Sun's Openwindows mailtool.
+-# Basically, this lets you see the text part, but not much else...
++#!/bin/sh -e
++# This file Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
+ 
+-set TMPFILE=${METAMAIL_TMPDIR}/suntomime.$$
++TMPFILE=`tempfile -p metamail -m 600`
+ echo "Content-type: multipart/mixed; boundary=--------" > $TMPFILE
+ echo "" >> $TMPFILE
+ sed -e 's/X-Sun-Data-Type:/Content-type:/' >> $TMPFILE < $1
+--- metamail-2.7.orig/bin/audiocompose
++++ metamail-2.7/bin/audiocompose
+@@ -1,6 +1,4 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
+ # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ # 
+ # Permission to use, copy, modify, and distribute this material 
+@@ -13,64 +11,71 @@
+ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+-#
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+ 
+ # This is to make metamail/showaudio do playback on the speaker, not the phone.
+-setenv AUDIOSPEAKERFORCE 1 
++AUDIOSPEAKERFORCE=1; export AUDIOSPEAKERFORCE
+ 
+-if (-d /usr/sony) then
+-    set dev=/dev/sb0
++if test -d /usr/sony
++then
++	dev=/dev/sb0
+ else
+-    set dev=/dev/audio
+-endif
++	dev=/dev/audio
++fi
+ 
+-set audiofile=$1
+-if (-e $audiofile && ! -z $audiofile) goto whatnext
++audiofile=$1
+ 
+-record:
+-echo -n "Press RETURN when you are ready to start recording: "
+-set foo = $<
+-
+-# THIS IS UNBELIEVABLY GRUBBY
+-onintr cleanup
+-if (! $?RECORD_AUDIO) then
+-    (/bin/cat < $dev > $audiofile) &
++if test -f "$audiofile" -a -s "$audiofile"
++then
++	whatnext=1
+ else
+-    ($RECORD_AUDIO > $audiofile) &
+-endif
+-jobs -l > ${METAMAIL_TMPDIR}/AUDCAT.$$
+-set foo=`/bin/cat ${METAMAIL_TMPDIR}/AUDCAT.$$`
+-/bin/rm ${METAMAIL_TMPDIR}/AUDCAT.$$
+-set PID=$foo[2]
+-echo -n "press RETURN when you are done recording: "
+-set foo=$<
+-echo One moment please...
+-/bin/sleep 1
+-echo -n Killing recording job...
+-/bin/kill -9 $PID >& /dev/null
+-
+-whatnext:
+-echo ""
+-echo "What do you want to do?"
+-echo ""
+-echo "1 -- Listen to recorded message"
+-echo "2 -- Replace with a new recording"
+-echo "3 -- All Done, Quit"
+-set which = $<
+-    switch ("$which")
+-        case 1:
+-          cat $audiofile > $dev
+-          breaksw
+-        case 2:
+-          goto record
+-        case 3:
+-          exit
+-    endsw
+-goto whatnext
+-exit 0
+-cleanup:
+-kill -9 $PID >& /dev/null
++	whatnext=0
++fi
++
++while true
++do
++	if test $whatnext -eq 1
++	then
++		echo ""
++		echo "What do you want to do?"
++		echo ""
++		echo "1 -- Listen to recorded message"
++		echo "2 -- Replace with a new recording"
++		echo "3 -- All Done, Quit"
++		read which
++		case $which in
++			1) cat "$audiofile" > $dev ;;
++			2) whatnext=0 ;;
++			3) exit 0 ;;
++		esac
++	fi
++	echo -n "Press RETURN when you are ready to start recording: "
++	read foo
++
++	trap "kill -9 $! > /dev/null 2>&1" 1 2 15
++	if test -z "$RECORD_AUDIO"
++	then
++		(cat < $dev > "$audiofile") &
++	else
++		($RECORD_AUDIO > "$audiofile") &
++	fi
++	echo -n "press RETURN when you are done recording: "
++	read foo
++	echo One moment please...
++	/bin/sleep 1
++	echo -n Killing recording job...
++	/bin/kill -9 $! > /dev/null 2>&1
++	whatnext=1
++done
+--- metamail-2.7.orig/bin/mimeit
++++ metamail-2.7/bin/mimeit
+@@ -0,0 +1,27 @@
++#!/bin/sh -e
++# mimeit - mail base64-encoded stdin
++#    with content-type $1
++#    to recipient $2
++#    with subject $3
++# All other arguments are passed on to splitmail 
++
++if [ $# -lt 3 ]; then
++	echo "Usage: $0 <content-type> <recipient> <subject> [splitmail-options]" >&2
++	exit 1
++fi
++
++ct="$1"
++to="$2"
++sub="$3"
++
++shift
++shift
++shift
++
++( echo Mime-Version: 1.0 ; \
++  echo Content-type: "$ct" ; \
++  echo To: "$to" ; \
++  echo Subject: "$sub" ; \
++  echo Content-Transfer-Encoding: base64 ;
++  echo "" ; \
++  mimencode -b ) | splitmail -d $*
+--- metamail-2.7.orig/bin/sun-message
++++ metamail-2.7/bin/sun-message
+@@ -0,0 +1,56 @@
++#!/bin/sh -e
++#
++#  This is sun-message.
++#  It looks at $2 to figure out how to decode $1,
++#  then gives the user a short menu of choices:
++#    display, save or quit.
++
++if [ "$2" = "uuencode" ]
++then 
++	fn=`tempfile -p metamail -m 600`
++	uudecode -o $fn "$1"
++
++	echo "The following file was uudecoded:"
++	echo
++
++	defans=1
++	while :
++	do
++		ls -l $fn
++
++		echo
++		echo "Please choose one:"
++		echo
++		echo "1 -- Display it as ASCII text"
++		echo "2 -- Save it as a file"
++		echo "3 -- Quit this menu"
++		echo
++		echo -n "Which do you prefer (1 - 3)? [$defans] "
++
++		read ans
++		if test -z "${ans:-}"
++		then
++			ans=$defans
++		fi
++
++		case $ans in
++			1)	sensible-pager $fn ;;
++			2)	echo -n "Save as: $HOME/"
++				read nfn
++				if test ! -z "${nfn:-}"
++				then
++					cp $fn "$HOME/$nfn"
++				else
++					echo Not Saved.
++				fi
++				;;
++			3)	rm "$1" $fn
++				exit 0
++				;;
++			*)	echo Invalid choice. ;;
++		esac
++		defans=3
++	done
++else
++	sensible-pager "$1"
++fi
+--- metamail-2.7.orig/bin/uudepipe
++++ metamail-2.7/bin/uudepipe
+@@ -0,0 +1,13 @@
++#!/bin/sh -e
++# This file Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++uudecode -o /dev/stdout -- ${1+"$1"}
+--- metamail-2.7.orig/bin/shownonascii
++++ metamail-2.7/bin/shownonascii
+@@ -0,0 +1,104 @@
++#!/bin/sh -e
++# Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++# 
++# Permission to use, copy, modify, and distribute this material 
++# for any purpose and without fee is hereby granted, provided 
++# that the above copyright notice and this permission notice 
++# appear in all copies, and that the name of Bellcore not be 
++# used in advertising or publicity pertaining to this 
++# material without the specific, prior written permission 
++# of an authorized representative of Bellcore.  BELLCORE 
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
++
++MYFONTDIR=/usr/lib/X11/fonts/misc
++
++CHARSET=$1
++shift
++
++if test "$1" = "-e"
++then
++	shift
++	CMD="$*"
++	RIGHTTERMCMD="$*"
++else
++	CMD="more $* /dev/null"
++	RIGHTTERMCMD="more $*"
++fi
++
++if test ! -z "${MM_CHARSET:-}"
++then
++	if test "$MM_CHARSET" = "$CHARSET"
++	then
++		$RIGHTTERMCMD
++		exit 0
++	fi
++fi
++for f in "${MM_AUXCHARSETS:-}"
++do
++	if test "$f" = "$CHARSET"
++	then
++		$RIGHTTERMCMD
++		exit 0
++	fi
++done
++
++if test ! -d "$MYFONTDIR"
++then
++	echo This message contains non-ASCII text, but the $CHARSET font
++	echo has not yet been installed on this machine.  What follows
++	echo "may be partially unreadable, but the English (ASCII) parts"
++	echo "should still be readable."
++	cat $*
++	exit 0
++fi
++
++if test -z "${DISPLAY:-}"
++then
++	echo This message contains non-ASCII text, which can only be displayed
++	echo properly if you are running X11.  What follows
++	echo "may be partially unreadable, but the English (ASCII) parts"
++	echo "should still be readable."
++	cat $*
++	exit 0
++fi
++
++#
++# Do we have a font server?
++#
++if xset q | grep -q tcp/localhost:7100
++then
++    echo Your font path appears to be correctly set.
++else
++	if xset q | grep -q $MYFONTDIR
++	then
++	    echo Your font path appears to be correctly set.
++	else
++	    echo Adding $MYFONTDIR to your font path.
++	    xset +fp "$MYFONTDIR"
++	fi
++fi
++
++echo Running xterm to display text in $CHARSET, please wait...
++
++# Bogus -- need to unsetenv MM_NOTTTY, but can't in Bourne shell.  --bobg.
++MM_NOTTTY=''
++XCHARSET=\*`echo $CHARSET | sed -e s/iso-/iso/`
++xterm -fn $XCHARSET -e $CMD
+--- metamail-2.7.orig/bin/sun2mime
++++ metamail-2.7/bin/sun2mime
+@@ -1,4 +1,4 @@
+-#!/bin/sh -f
++#!/bin/sh -e
+ #
+ # This is sun2mime.  It makes a bold attempt to transform a Sun mailtool message into
+ # MIME format.
+@@ -6,12 +6,9 @@
+ # This program is for use with sun-message which takes an arg to figure out how
+ # (or if) the message is encoded.
+ #
+-if [ x$METAMAIL_TMPDIR = x ]; then
+-    METAMAIL_TMPDIR=/tmp
+-fi
+-TMPFILE=${METAMAIL_TMPDIR}/suntomime.$$
++TMPFILE=`tempfile -p metamail -m 600`
+ 
+-/bin/nawk '
++nawk '
+   BEGIN { printf("Content-type: multipart/mixed; boundary=--------\n\n")
+           RS=""; FS="\n"; mode="HEADER" }
+   mode == "HEADER" {
+@@ -36,8 +33,8 @@
+       print
+   }
+   END { printf("----------\n") }
+-' $1 > $TMPFILE
++' "$1" > $TMPFILE
+ 
+ metamail -z $TMPFILE
+-rm -f $TMPFILE
+-
++rm $TMPFILE
++exit 0
+--- metamail-2.7.orig/bin/sndAppleSingle
++++ metamail-2.7/bin/sndAppleSingle
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/sh -e
+ #
+ # Very simple shellscript to support sending Macintosh files
+ # which are stored in a UNIX filesystem by the CAP AUFS program.
+--- metamail-2.7.orig/bin/sun-audio-file
++++ metamail-2.7/bin/sun-audio-file
+@@ -1,12 +1,20 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
++# This file Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
+ 
+-cd ${METAMAIL_TMPDIR}
+-uudecode < $1
+-audiotool audio-file
+-rm -f audio-file $1
++audio-file=`tempfile -p metamail -m 600`
++uudecode -o $audio-file "$1"
++audiotool $audio-file
++rm $audio-file "$1"
+--- metamail-2.7.orig/bin/uuenpipe
++++ metamail-2.7/bin/uuenpipe
+@@ -0,0 +1,13 @@
++#!/bin/sh -e
++# This file Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++uuencode -- ${1+"$1"} "$(basename "${1-UUPIPEOUT}")"
+--- metamail-2.7.orig/bin/metasend
++++ metamail-2.7/bin/metasend
+@@ -1,6 +1,4 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
++#!/bin/sh -e
+ # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ # 
+ # Permission to use, copy, modify, and distribute this material 
+@@ -13,487 +11,591 @@
+ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ # OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+-#
+ 
+-if (! $?METAMAIL_TMPDIR) then
+-    set METAMAIL_TMPDIR=/tmp
+-endif
+-
+-set hname = `hostname`
+-set idctr=0
+-set MustDelete=0
+-set batchmode=0
+-set multipart = 1
+-if ($?SPLITSIZE) then
+-    set splitsize=$SPLITSIZE
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++
++# Brought into line with metamail 2.7 beta release Csh version
++#    Dave Shield	February 1994
++
++hname=`hostname`
++idctr=0
++MustDelete=0
++batchmode=0
++multipart=1
++if test ! -z "${SPLITSIZE:-}"
++then
++	splitsize=$SPLITSIZE
+ else
+-    set splitsize = 100000
+-endif
+-set outputfile = ""
+-set multipartsubtype = "mixed"
+-set cdescrip = "An object packed by metasend"
+-set isentity=0
+-set newid=`date | tr " :" "__"`
+-set cid="<${newid}_$idctr@${hname}>"
+-@ idctr++
+-
+-while ($#argv > 0)
+-    switch ("$1")
+-        case "-S":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-S requires a following argument, the SPLIT threshhold"
+-                exit -1
+-            endif
+-            set splitsize=$1
+-            shift
+-            breaksw
+-        case "-b":
+-            # Batch mode -- ALL args must be on command line
+-            set batchmode = 1
+-            shift
+-            breaksw
+-        case "-c":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-c requires a following argument, the CC address"
+-                exit -1
+-            endif
+-            set cc="$1"
+-            shift
+-            breaksw
+-        case "-i":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-i requires a following argument, the Content-ID value"
+-                exit -1
+-            endif
+-            set cid=$1
+-            shift
+-            breaksw
+-        case "-I":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-I requires a following argument, the multipart Content-ID value"
+-                exit -1
+-            endif
+-            set multicid=$1
+-            shift
+-            breaksw
+-        case "-s":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-s requires a following argument, the SUBJECT"
+-                exit -1
+-            endif
+-            set subject="$1"
+-            shift
+-            breaksw
+-        case "-t":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-t requires a following argument, the TO address"
+-                exit -1
+-            endif
+-            set to="$1"
+-            shift
+-            breaksw
+-        case "-F":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-F requires a following argument, the FROM address"
+-                exit -1
+-            endif
+-            set from="$1"
+-            shift
+-            breaksw
+-        case "-P":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-P requires a following argument, the preamble file name"
+-                exit -1
+-            endif
+-            set preamblefile="$1"
+-            shift
+-            breaksw
+-        case "-e":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-e requires a following argument, the ENCODING value"
+-                exit -1
+-            endif
+-            set encode=$1
+-            if ($encode == "base64") then
+-	    set encodingprog = "mimencode -b"
+-            else if ($encode == "x-uue") then
+-	        set encodingprog = "uuencode mail-body"
+-            else if ($encode == "7bit") then
+-	        set encodingprog = cat
+-           else
+-	        set encodingprog = "mimencode -q"
+-	        set encode = "quoted-printable"
+-           endif 
+-           shift
+-            breaksw
+-        case "-f":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-f requires a following argument, the DATA FILE"
+-                exit -1
+-            endif
+-            set datafile=$1
+-            if (! -e  $datafile) then
+-                echo The file $datafile does not exist.
+-                exit -1
+-            endif
+-            shift
+-            breaksw
+-        case "-m":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-m requires a following argument, the MIME CONTENT-TYPE"
+-                exit -1
+-            endif
+-#            set ctyperaw = $1
+-#            set  ctype=`echo $ctyperaw | tr \" \'`
+-	set ctype = "$1"
+-	if (`echo $ctype | grep /` == "") then
+-	    echo "Invalid content-type specified"
+-	    exit -1
+-	endif
+-            shift
+-            breaksw
+-        case "-o":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-o requires a following argument, the output file name"
+-                exit -1
+-            endif
+-            set outputfile="$1"
+-            shift
+-            breaksw
+-        case "-/":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-/ requires a following argument, the multipart subtype"
+-                exit -1
+-            endif
+-            set multipartsubtype="$1"
+-            shift
+-            breaksw
+-        case "-D":
+-            shift
+-            if ($#argv == 0) then
+-                echo "-D requires a following argument, the Content-Description value"
+-                exit -1
+-            endif
+-            set cdescrip="$1"
+-            shift
+-            breaksw
+-        case "-E":
+-            set isentity=1
+-            shift
+-            breaksw
+-        case "-z":
+-            set MustDelete=1
+-            shift
+-            breaksw
+-        case "-n":
+-            if ($isentity) then
+-              if (! $?encode) then 
+-                set encode=7bit
+-                set encodingprog=cat
+-              endif
+-              if (! $?ctype) then
+-                  set ctype=bogus
+-                  # Never used
+-               endif
+-	if ( ! $?datafile) then
+-	    echo One part is incomplete -- each part needs at least -f and -E
+-	    exit -1
+-	endif
+-            else 
+-	if ( ! $?ctype || ! $?datafile) then
+-	    echo One part is incomplete -- each part needs at least -f and -m
+-	    exit -1
+-	endif
+-            endif
+-	if (! $?encode) then
+-	        if ("$ctype" =~ text*) then
+-	              set encodingprog = "mimencode -q"
+-		set encode = "quoted-printable"
+-	        else
+-	            set encode = base64
+-	            set encodingprog = "mimencode -b"
+-	        endif
+-	endif
+-	set ctype${multipart} = "$ctype"
+-	set datafile${multipart} = $datafile
+-	set encode${multipart} = $encode
+-	set cdescrip${multipart} = "$cdescrip"
+-	set cid${multipart} = "$cid"
+-	set isentity${multipart} = $isentity
+-	set encodingprog${multipart} = "$encodingprog"
+-	unset ctype
+-	unset datafile
+-	unset encode
+-	unset encodingprog
+-	set newid=`date | tr " :" "__"`
+-	set cid="<${newid}_$idctr@${hname}>"
+-	@ idctr++
+-	set cdescrip = "An object packed by metasend"
+-	set isentity=0
+-            @  multipart++
+-	shift
+-	breaksw
+-        default:
+-            echo UNRECOGNIZED METASEND OPTION: $1
+-            exit -1
+-    endsw
+-end
+-if ($batchmode == 0) then
+-    if (! $?to) then
+-        echo -n "To: "
+-        set to = $<
+-    endif
+-    if (! $?subject) then
+-        echo -n "Subject: "
+-        set subject = $<
+-    endif
+-    if (! $?cc) then
+-        echo -n "CC: "
+-        set cc = $<
+-    endif
+-anotherpart:
+-    if (! $?ctype) then
+-        echo -n "Content-type: "
+-#        set ctyperaw = $<
+-#        set  ctype=`echo $ctyperaw | tr \" \'`
+-        set ctype = "$<"
+-    endif
+-    if (`echo $ctype | grep /` == "") then
+-        echo "Invalid content-type specified"
+-        unset ctype
+-        goto anotherpart
+-    endif
+-#    if ($ctype != $ctyperaw)  echo Double  quotes not allowed, using $ctype
+-    if (! $?datafile) then
+-        getfile:
+-        echo -n "Name of file containing $ctype data: "
+-        set datafile = $<
+-        if (! -e  $datafile) then
+-            echo The file $datafile does not exist.
+-            goto getfile
+-        endif
+-    endif
+-    if (! $?encode) then
+-        retry:
+-        echo "Do you want to encode this data for sending through the mail?"
+-        echo "  1 -- No, it is already in 7 bit ASCII"
+-        echo "  2 -- Yes, encode in base64 (most efficient)"
+-        echo "  3 -- Yes, encode in quoted-printable (less efficient, more readable)"
+-        echo "  4 -- Yes, encode it using uuencode (not standard, being phased out)"
+-        set encode=$<
+-        switch ("$encode")
+-            case 1:
+-                set encodingprog = cat
+-	  set encode = 7bit
+-                breaksw
+-            case 2:
+-                set encodingprog = "mimencode -b"
+-	  set encode = base64
+-                breaksw
+-            case 3:
+-                set encodingprog = "mimencode -q"
+-	  set encode = quoted-printable
+-                breaksw
+-            case 4:
+-                set encodingprog = "uuencode $datafile"
+-	  set encode = x-uue
+-                breaksw
+-            default:
+-                echo Unrecognized answer, please try again.
+-                goto retry
+-        endsw
+-    endif
+-    echo -n "Do you want to include another file too (y/n) [n] ? "
+-    set ans=$<
+-    if  ("$ans" =~ y*) then
+-	set ctype${multipart} = "$ctype"
+-	set datafile${multipart} = $datafile
+-	set encode${multipart} = $encode
+-	set encodingprog${multipart} = "$encodingprog"
+-	set cdescrip${multipart} = "$cdescrip"
+-	set cid${multipart} = "$cid"
+-	set isentity${multipart} = $isentity
+-	set cdescrip = "An object packed by metasend"
+-	set isentity=0
+-	unset ctype
+-	unset datafile
+-	unset encode
+-	unset encodingprog
+-	set newid=`date | tr " :" "__"`
+-	set cid="<${newid}_$idctr@${hname}>"
+-	@ idctr++
+-            @  multipart++
+-            goto anotherpart
+-     endif
++	splitsize=100000
++fi
++
++ouputfile=
++multipartsubtype=mixed
++cdescrip=    # -Immi
++attachfilename=    # -Immi
++isentity=0
++newid=`date | tr " :" "__"`
++cid="<${newid}_$idctr@${hname}>"
++idctr=`expr $idctr + 1`
++
++while test ! -z "$*"
++do
++	case $1 in
++		-S) shift
++		    if test -z "$*"
++		    then
++			echo "-S requires a following argument, the SPLIT threshhold"
++			exit 1
++		    fi
++		    splitsize=$1
++		    shift ;;
++
++		-b) batchmode=1
++		    shift ;;
++
++		-c) shift
++		    if test -z "$*"
++		    then
++		    	echo "-c requires a following argument, the CC address"
++			exit 1
++		    fi
++		    cc=$1
++		    shift ;;
++
++		-i) shift
++		    if test -z "$*"
++		    then
++			echo "-i requires a following argument, the Content-ID value"
++			exit 1
++		    fi
++		    cid=$1
++		    shift ;;
++
++		-I) shift
++		    if test -z "$*"
++		    then
++			echo "-I requires a following argument, the multipart Content-ID value"
++			exit 1
++		    fi
++		    multicid=$1
++		    shift ;;
++
++		-s) shift
++		    if test -z "$*"
++		    then
++			echo "-s requires a following argument, the SUBJECT"
++			exit 1
++		    fi
++		    subject=$1
++		    shift ;;
++
++		-t) shift
++		    if test -z "$*"
++		    then
++			echo "-t requires a following argument, the TO address"
++			exit 1
++		    fi
++		    to=$1
++		    shift ;;
++
++		-F) shift
++		    if test -z "$*"
++		    then
++			echo "-F requires a following argument, the FROM address"
++			exit 1
++		    fi
++		    from=$1
++		    shift ;;
++
++		-P) shift
++		    if test -z "$*"
++		    then
++			echo "-P requires a following argument, the preamble file name"
++			exit 1
++		    fi
++		    preamblefile=$1
++		    shift ;;
++
++		-e) shift
++		    if test -z "$*"
++		    then
++			echo "-e requires a following argument, the ENCODING value"
++			exit 1
++		    fi
++		    encode=$1
++		    case "$encode" in
++			"base64")	encodingprog="mimencode -b";;
++			"x-uue")	encodingprog="uuencode \$datafile";;
++			"7bit")		encodingprog=cat;;
++			"8bit")		encodingprog=cat;;
++			*)		encodingprog="mimencode -q"
++					encode=quoted-printable ;;
++		    esac
++		    shift ;;
++
++		-f) shift
++		    if test -z "$*"
++		    then
++			echo "-f requires a following argument, the DATA FILE"
++			exit 1
++		    fi
++		    datafile=$1
++		    if test ! -r "$datafile"
++		    then
++			echo The file "$datafile" does not exist
++			exit 1
++		    fi
++		    shift ;;
++
++		-m) shift
++		    if test -z "$*"
++		    then
++			echo "-m requires a following argument, the MIME CONTENT-TYPE"
++			exit 1
++		    fi
++		    ctype=$1
++		    if test "`echo $ctype | grep /`" = ""
++		    then
++			echo Invalid content-type specified
++			exit 1
++		    fi
++		    shift ;;
++
++		-o) shift
++		    if test -z "$*"
++		    then
++			echo "-o requires a following argument, the output file name"
++			exit 1
++		    fi
++		    outputfile=$1
++		    shift ;;
++
++		-/) shift
++		    if test -z "$*"
++		    then
++			echo "-/ requires a following argument, the multipart subtype"
++			exit 1
++		    fi
++		    multipartsubtype=$1
++		    shift ;;
++
++		-D) shift
++		    if test -z "$*"
++		    then
++			echo "-D requires a following argument, the Content-Description value"
++			exit 1
++		    fi
++		    cdescrip=$1
++		    shift ;;
++
++# begin immi
++		-A) shift
++		    if test -z "$*"
++		    then
++			echo "-A requires a following argument, the attachment file name"
++			exit 1
++		    fi
++		    attachfilename=$1
++		    shift ;;
++#end immi
++
++		-E) isentity=1
++		    shift ;;
++
++		-z) MustDelete=1
++		    shift ;;
++
++		-n) if test $isentity -ne 0
++		    then
++			if test -z "${encode:-}"
++			then
++				encode=7bit
++				encodingprog=cat
++			fi
++			if test -z "${ctype:-}"
++			then
++				ctype=bogus
++				# Never used
++			fi
++			if test -z "${datafile:-}"
++			then
++				echo One part is incomplete -- each part needs at least -f and -E
++				exit 1
++			fi
++		    else
++			if test -z "${ctype:-}" || test -z "${datafile:-}"
++			then
++				echo One part is incomplete -- each part needs at least -f and -m
++				exit 1
++			fi
++		    fi
++		    if test -z "${encode:-}"
++		    then
++		    	case "$ctype" in
++				text*)	encodingprog="mimencode -q"
++					encode=quoted-printable ;;
++				*)	encodingprog="mimencode -b"
++					encode=base64 ;;
++			esac
++		    fi
++		    eval ctype${multipart}=\"$ctype\"
++		    eval datafile${multipart}=$datafile
++		    eval encode${multipart}=$encode
++		    eval cdescrip${multipart}=\"$cdescrip\"
++		    eval attachfilename${multipart}=\"$attachfilename\"   # -Immi
++		    eval cid${multipart}=\"$cid\"
++		    eval isentity${multipart}=$isentity
++		    eval encodingprog${multipart}=\"\$encodingprog\"
++
++		    ctype=
++		    datafile=
++		    encode=
++		    encodingprog=
++		    newid=`date | tr " :" "__"`
++		    cid="<${newid}_$idctr@${hname}>"
++		    idctr=`expr $idctr + 1`
++		    cdescrip=             # -Immi
++		    attachfilename=       # -Immi
++		    isentity=0
++		    multipart=`expr $multipart + 1`
++		    shift ;;
++
++		*) echo UNRECOGNIZED METASEND OPTION: "$1"
++		   exit 1 ;;
++	esac
++done
++
++if test $batchmode -eq 0
++then
++	if test -z "${to:-}"
++	then
++		echo -n "To: "
++		read to
++	fi
++	if test -z "${subject:-}"
++	then
++        	echo -n "Subject: "
++		read subject
++	fi
++	if test -z "${cc:-}"
++	then
++		echo -n "CC: "
++		read cc
++	fi
++
++	anotherpart=1
++	while test $anotherpart -eq 1
++	do
++	    looping=1
++	    while test $looping -ne 0
++	    do
++	        if test -z "${ctype:-}"
++	        then
++        		echo -n "Content-type: "
++			read ctype
++		fi
++		if test "`echo $ctype | grep /`" = ""
++		then
++			echo Invalid content-type specified
++			ctype=
++		else
++			looping=0
++		fi
++	    done
++	    if test -z "${datafile:-}"
++	    then
++		looping=1
++		while test $looping -eq 1
++		do
++			echo -n "Name of file containing $ctype data: "
++			read datafile
++			if test -r "$datafile"
++			then
++				looping=0
++			else
++				echo "The file $datafile does not exist."
++			fi
++		done
++	    fi
++
++	    if test -z "${encode:-}"
++	    then
++		looping=1
++		while test $looping -eq 1
++		do
++			echo "Do you want to encode this data for sending through the mail?"
++			echo "  1 -- No, it is already in 7 bit ASCII"
++			echo "  2 -- Yes, encode in base64 (most efficient)"
++			echo "  3 -- Yes, encode in quoted-printable (less efficient, more readable)"
++			echo "  4 -- Yes, encode it using uuencode (not standard, being phased out)"
++			echo "  5 -- No, it is 8 bit extended ASCII"
++			read encode
++			looping=0
++			case "$encode" in
++				1) encodingprog=cat
++				   encode=7bit ;;
++				2) encodingprog="mimencode -b"
++				   encode=base64 ;;
++				3) encodingprog="mimencode -q"
++				   encode=quoted-printable ;;
++				4) encodingprog="uuencode $datafile"
++				   encode=x-uue ;;
++ 				5) encodingprog=cat
++ 				   encode=8bit ;;
++				*) echo Unrecognized answer, please try again.
++				   looping=1 ;;
++			esac
++		done
++	    fi
++
++	    echo -n "Do you want to include another file too (y/n) [n] ? "
++	    read ans
++	    case $ans in
++		[Yy]*)	
++		    eval ctype${multipart}=\"$ctype\"
++		    eval datafile${multipart}=$datafile
++		    eval encode${multipart}=$encode
++		    eval encodingprog${multipart}=\"\$encodingprog\"
++		    eval cdescrip${multipart}=\"$cdescrip\"
++		    eval attachfilename${multipart}=\"$attachfilename\"   # -Immi
++		    eval cid${multipart}=\"$cid\"
++		    eval isentity${multipart}=$isentity
++		    cdescrip=         # -Immi
++		    attachfilename=   # -Immi
++		    isentity=0
++		    ctype=
++		    datafile=
++		    encode=
++		    encodingprog=
++		    newid=`date | tr " :" "__"`
++		    cid="<${newid}_$idctr@${hname}>"
++		    idctr=`expr $idctr + 1`
++		    multipart=`expr $multipart + 1`
++		    ;;
++		*)
++		    anotherpart=0;;
++	    esac
++	done
++
+ else
+-    if ($outputfile == "") then
+-      if (! $?to || ! $?subject || ! $?ctype || ! $?datafile) then
+-        echo metasend: in batch mode, if output is not directed to a file,-t, -s, -f, and -m are all required
+-        exit -1
+-      endif
+-    else
+-      if (! $?datafile) then
+-        echo metasend:  in batch mode, -f is required.
+-      endif
+-      if ($isentity) then
+-        if (! $?ctype) then
+-          set ctype=bogus
+-          # will not be used anyway really
+-        endif
+-      endif
+-      if (! $?ctype  ) then
+-        echo metasend: in batch mode, with output directed to a file, -E or -m is required
+-        exit -1
+-      endif
+-    endif    
+-    if (! -e  $datafile) then
+-        echo metasend:  The file $datafile does not exist
+-        exit -1
+-    endif
+-#    if (! $?cc) set cc=""
+-#     if ($ctype != $ctyperaw)  echo Double  quotes not allowed, using $ctype
+-    if (! $?encode) then
+-        if ("$ctype" =~ text*) then
+-	set encodingprog = "mimencode -q"
+-	set encode = "quoted-printable"
+-        else
+-            set encodingprog = "mimencode -b"
+-            set encode = base64
+-        endif
+-    else if ($encode == "base64") then
+-        set encodingprog = "mimencode -b"
+-    else if ($encode == "x-uue") then
+-        set encodingprog = "uuencode mail-body"
+-    else if ($encode == "7bit") then
+-        set encodingprog = cat
+-    else
+-        set encodingprog = "mimencode -q"
+-        set encode = "quoted-printable"
+-    endif
+-endif
+-
+-if (! $?encode) then
+-        if ("$ctype" =~ text*) then
+-	set encode = "quoted-printable"
+-	set encodingprog = "mimencode -q"
+-        else
+-            set encode = base64
+-            set encodingprog = "mimencode -b"
+-        endif
+-endif
+-set ctype${multipart} = "$ctype"
+-set datafile${multipart} = $datafile
+-set encode${multipart} = $encode
+-set cdescrip${multipart} = "$cdescrip"
+-set cid${multipart} = "$cid"
+-set isentity${multipart} = $isentity
+-set encodingprog${multipart} = "$encodingprog"
++	if test -z "${outputfile:-}"
++	then
++	    if test -z "${to:-}" \
++		-o -z "${subject:-}" \
++		-o -z "${ctype:-}" \
++		-o -z "${datafile:-}"
++	    then
++		echo "metasend: in batch mode, if output is not directed to a file,  -t, -s, -f, and -m are all required"
++		exit 1
++	    fi
++	else
++	    if test -z "${datafile:-}"
++	    then
++		echo "metasend: in batch mode, -f is required."
++		exit 1
++	    fi
++	    if test $isentity -ne 0
++	    then
++	        if test -z "${ctype:-}"
++	        then
++			ctype=bogus
++			#  will not be used anyway
++		fi
++	    fi
++	    if test -z "${ctype:-}"
++	    then
++		echo "metasend: in batch mode, with output directed to a file, -E or -m is required."
++		exit 1
++	    fi
++	fi
++
++
++	if test ! -r "$datafile"
++	then
++		echo "metasend: The file $datafile does not exist"
++		exit 1
++	fi
++
++#	if test -z "${cc:-}"
++#	then
++#		cc=''
++#	fi
++
++	if test -z "${encode:-}"
++	then
++		case "$ctype" in
++			text*) encodingprog="mimencode -q"
++			       encode=quoted-printable ;;
++			*) encodingprog="mimencode -b"
++			   encode=base64 ;;
++		esac
++	else
++		case "$encode" in
++			base64) encodingprog="mimencode -b" ;;
++			x-uue)  encodingprog="uuencode $datafile" ;;
++			7bit)   encodingprog=cat ;;
++			8bit)   encodingprog=cat ;;
++			*) encodingprog="mimencode -q"
++			   encode=quoted-printable ;;
++		esac
++	fi
++fi
++
++if test -z "${encode:-}"
++then
++	case "$ctype" in
++		text*) encodingprog="mimencode -q"
++		       encode=quoted-printable ;;
++		*) encodingprog="mimencode -b"
++		   encode=base64 ;;
++	esac
++fi
++
++eval ctype${multipart}=\"$ctype\"
++eval datafile${multipart}=$datafile
++eval encode${multipart}=$encode
++eval cdescrip${multipart}=\"$cdescrip\"
++eval attachfilename${multipart}=\"$attachfilename\"   # -Immi
++eval cid${multipart}=\"$cid\"
++eval isentity${multipart}=$isentity
++eval encodingprog${multipart}=\"\$encodingprog\"
+ 
+-set fname = ${METAMAIL_TMPDIR}/metasend.$$
++fname=`tempfile -p metamail -m 600`
+ echo "MIME-Version: 1.0" > $fname
+-if ($?to) then
+-    echo "To: " "$to" >> $fname
+-endif
+-if ($?subject) then
+-    echo "Subject: " "$subject" >> $fname
+-endif
+-if ($?cc) then
+-    echo "CC: " "$cc" >> $fname
+-endif
+-if ($?from) then
+-    echo "From: " "$from" >> $fname
+-endif
+-if ($multipart > 1) then
+-    set  boundary = ${hname}.$$.`date | tr "  " .`
+-    set newid=`date | tr " :" "__"`
+-    if ($?multicid) then
+-        echo "Content-ID: $multicid"   >> $fname
+-    else
+-        echo "Content-ID: <${newid}_$idctr@${hname}>"   >> $fname
+-        @ idctr++
+-    endif
+-    echo "Content-type: multipart/$multipartsubtype;" >> $fname
+-    echo "	boundary="\"$boundary\" >> $fname
+-    echo "" >> $fname
+-    if ($?preamblefile) then
+-        cat $preamblefile >> $fname
+-    else
+-        echo "This is  a multimedia message in MIME  format.  If you are reading this" >> $fname
+-        echo "prefix, your mail reader does  not understand MIME.  You may wish" >> $fname
+-        echo "to look into upgrading to a newer version of  your mail reader." >> $fname
+-    endif
+-    set i=1
+-    set junkfile=${METAMAIL_TMPDIR}/mmjunk.$$
+-    while  ($multipart >= $i)
++
++if test ! -z "${to:-}"
++then echo "To: $to" >> $fname
++fi
++if test ! -z "${subject:-}"
++then echo "Subject: $subject" >> $fname
++fi
++if test ! -z "${cc:-}"
++then echo "CC: $cc" >> $fname
++fi
++if test ! -z "${from:-}"
++then echo "From: $from" >> $fname
++fi
++
++if test $multipart -gt 1
++then
++	boundary=${hname}.$$.`date | tr "  " .`
++	newid=`date | tr " :" "__"`
++	if test ! -z "${multicid:-}"
++	then
++		echo "Content-ID: $multicid" >> $fname
++	else
++		echo "Content-ID: ${newid}_$idctr@${hname}" >> $fname
++		idctr=`expr $idctr + 1`
++	fi
++	echo "Content-type: multipart/$multipartsubtype;" >> $fname
++	echo "	boundary="\"$boundary\" >> $fname
++	echo "" >> $fname
++	if test ! -z "${preamblefile:-}"
++	then
++		cat $preamblefile >> $fname
++	else
++		echo "This is  a multimedia message in MIME  format.  If you are reading this" >> $fname
++		echo "prefix, your mail reader does  not understand MIME.  You may wish" >> $fname
++		echo "to look into upgrading to a newer version of  your mail reader." >> $fname
++	fi
++
++	i=1
++	while test $multipart -ge $i
++	do
++		echo "" >> $fname
++		echo --$boundary >> $fname
++		eval isentity=\$isentity$i
++
++		if test $isentity -eq 0
++		then
++			eval echo "Content-ID: \$cid$i" >> $fname
++			eval echo "Content-type: \$ctype$i" >> $fname
++#begin immi
++			eval cdescrip=\$cdescrip$i
++			if test ! -z "$cdescrip"
++			then
++				echo "Content-Description: $cdescrip" >> $fname
++			fi
++			eval attachfilename=\$attachfilename$i
++			if test ! -z "$attachfilename"
++			then
++				echo "Content-Disposition: attachment; filename=\"$attachfilename\"" >> $fname
++			fi
++#end immi
++			eval echo "Content-Transfer-Encoding: \$encode$i" >> $fname
++			echo "" >> $fname
++		fi
++		eval \$encodingprog$i \< \"\$datafile$i\" \>\> $fname
++		i=`expr $i + 1`
++	done
++	echo "" >> $fname
++	echo --${boundary}-- >> $fname
+ 	echo "" >> $fname
+-	echo --$boundary >> $fname
+-	echo set isentity=\$isentity$i > $junkfile
+-	source $junkfile
+-	if (! $isentity) then
+-	    echo -n "Content-ID: "   >> $fname
+-	    echo echo \$cid$i \>\>  $fname > $junkfile
+-	    source $junkfile 
+-	    echo -n "Content-type: ">>$fname
+-	    echo echo \$ctype$i \>\>  $fname > $junkfile
+-	    source $junkfile 
+-	    echo -n "Content-Description: ">>$fname
+-	    echo echo \"\$cdescrip$i \" \>\>  $fname > $junkfile
+-	    source $junkfile 
+-	    echo -n "Content-Transfer-Encoding: " >>$fname
+-	    echo echo \$encode$i \>\> $fname > $junkfile
+-	    source $junkfile 
+-	    echo ""  >> $fname
+-	endif
+-	echo \$encodingprog$i \< \$datafile$i \>\> $fname > $junkfile
+-	source $junkfile 
+-	@ i++
+-    end
+-    rm $junkfile
+-    echo "" >> $fname
+-    echo --${boundary}-- >> $fname
+-    echo "" >> $fname
+-else 
+-    if (! $isentity) then
+-        echo "Content-ID: $cid"   >> $fname
+-        echo "Content-type: " $ctype >> $fname
+-        echo "Content-Description: " $cdescrip >> $fname
+-        echo "Content-Transfer-Encoding: " $encode >> $fname
+-    endif
+-    echo  "" >> $fname
+-    $encodingprog < $datafile >> $fname
+-    # Ensure last line has trailing carriage return
+-    echo "" >> $fname
+-endif
+-if ($outputfile == "") then
+-    if ($batchmode == 0) echo -n "Delivering mail, please wait...  "
+-    splitmail -s $splitsize -d $fname
+-    if (! $status) then
+-        if ($batchmode == 0) echo "Mail delivery apparently succeeded."
+-        rm $fname
+-    else if ($MustDelete == 1) then
+-        echo Mail delivery failed
+-        rm $fname
+-        exit -1
+-    else
+-        echo Mail delivery failed, draft mail is in $fname
+-        exit -1
+-    endif
+ else
+-    mv $fname $outputfile
+-    if ($status) exit -1
+-endif
++	if test $isentity -eq 0
++	then
++		echo "Content-ID: $cid" >> $fname
++		echo "Content-type: $ctype" >> $fname
++#begin immi
++		if test ! -z "$cdescrip"
++		then
++			echo "Content-Description: $cdescrip" >> $fname
++		fi
++		if test ! -z "$attachfilename"
++		then
++			echo "Content-Disposition: attachment; filename=\"$attachfilename\"" >> $fname
++		fi
++#end immi
++		echo "Content-Transfer-Encoding: $encode" >> $fname
++	fi
++	echo "" >> $fname
++	$encodingprog < "$datafile" >> $fname
++	# Ensure last line has trailing carriage return
++	echo "" >> $fname
++fi
++
++if test -z "${outputfile:-}"
++then
++	if test $batchmode = 0
++	then
++		echo -n "Delivering mail, please wait...  "
++	fi
++	splitmail -s "$splitsize" -d $fname
++
++	if test $? -eq 0
++	then
++		if test $batchmode = 0
++		then
++			echo "Mail delivery apparently succeeded."
++		fi
++		rm $fname
++	elif test "$MustDelete" -eq 1
++	then
++		echo Mail delivery failed
++		rm $fname
++		exit -1
++	else
++		echo "Mail delivery failed, draft mail is in $fname"
++		exit -1
++	fi
++else
++	mv $fname "$outputfile"
++	if test $? -ne 0
++	then
++		exit -1
++	fi
++fi
+ exit 0
+ 
++
+--- metamail-2.7.orig/bin/extcompose
++++ metamail-2.7/bin/extcompose
+@@ -1,103 +1,126 @@
+-#!/bin/csh -fb
+-# (The "-fb" might need to be changed to "-f" on some systems)
+-#
+-
+-if ($#argv < 1) then
+-    echo "Usage:  extcompose output-file-name"
++#!/bin/sh -e
++# This file Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++if [ $# -lt 1 ]
++then
++    echo "Usage:  $0 output-file-name" 1>&2
+     exit 1
+-endif
+-set OUTFNAME=$1
++fi
++OUTFNAME=$1
++
++choosing=yes
++while [ $choosing = yes ]
++do
++    echo ""
++    echo "Where is the external data that you want this mail message to reference?"
++    echo "    1 -- In a local file"
++    echo "    2 -- In an AFS file"
++    echo "    3 -- In an anonymous FTP directory on the Internet"
++    echo "    4 -- In an Internet FTP directory that requires a valid login"
++    echo "    5 -- Under the control of a mail server that will send the data on request"
++    echo ""
++    echo -n "Please enter a number from 1 to 5: \c"
++    read ans
++    case "$ans" in
++        1) accesstype=local-file ;;
++	2) accesstype=afs ;;
++	3) accesstype=anon-ftp ;;
++	4) accesstype=ftp ;;
++	5) accesstype=mail-server ;;
++	* ) echo "That is NOT one of your choices." 1>&2; continue ;;
++    esac
++
++    case "$accesstype" in
++        ftp | anon-ftp )
++	    echo -n "Enter the full Internet domain name of the FTP site: "
++	    read site
++	    echo -n "Enter the name of the directory containing the file (RETURN for top-level): "
++	    read directory
++	    echo -n "Enter the name of the file itself: "
++	    read name
++	    echo -n "Enter the transfer mode (type 'image' for binary data, RETURN otherwise): "
++	    read mode
++	    if [ -n "$mode" ]
++	    then mode=ascii
++	    fi
++	    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"\; > "$OUTFNAME"
++	    echo -n "    site="\"$site\" >> "$OUTFNAME"
++	    if [ -n "$directory" ]
++	    then echo -n "; directory="\"$directory\">> "$OUTFNAME"
++	    fi
++	    echo -n "; mode="\"$mode\">> "$OUTFNAME"
++	    echo "">> "$OUTFNAME"
++	    choosing=no
++	    ;;
+ 
+-chooseaccesstype:
+-echo ""
+-echo "Where is the external data that you want this mail message to reference?"
+-echo "    1 -- In a local file"
+-echo "    2 -- In an AFS file"
+-echo "    3 -- In an anonymous FTP directory on the Internet"
+-echo "    4 -- In an Internet FTP directory that requires a valid login"
+-echo "    5 -- Under the control of a mail server that will send the data on request"
+-echo ""
+-echo -n "Please enter a number from 1 to 5: "
+-set ans=$<
+-if ($ans == 1)  then
+-    set accesstype=local-file
+-else if ($ans == 2) then
+-    set accesstype=afs
+-else if ($ans == 3) then
+-    set accesstype=anon-ftp
+-else if ($ans == 4) then
+-    set accesstype=ftp
+-else if ($ans == 5) then
+-    set accesstype=mail-server
+-else
+-    echo "That is NOT one of your choices."
+-    goto chooseaccesstype
+-endif
+-if ($accesstype == "ftp" || $accesstype == "anon-ftp") then
+-    echo -n "Enter the full Internet domain name of the FTP site: "
+-    set site=$<
+-    echo -n "Enter the name of the directory containing the file (RETURN for top-level): "
+-    set directory=$<
+-    echo -n "Enter the name of the file itself: "
+-    set name = $<
+-    echo -n "Enter the transfer mode (type 'image' for binary data, RETURN otherwise): "
+-    set mode = $<
+-    if ($mode == "") set mode=ascii
+-    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"\; > $OUTFNAME
+-    echo -n "    site="\"$site\" >> $OUTFNAME
+-    if ($directory != "") echo -n "; directory="\"$directory\">> $OUTFNAME
+-    if ($mode != "") echo -n "; mode="\"$mode\">> $OUTFNAME
+-    echo "">> $OUTFNAME
+-else if ($accesstype == "local-file" || $accesstype == "afs") then
+-fname:
+-    echo -n "Enter the full path name for the file: "
+-    set name = $<
+-    if (! -e $name) then
+-	echo "The file $name does not seem to exist."
+-	goto fname
+-    endif
+-    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"> $OUTFNAME
+-else if ($accesstype == "mail-server") then
+-    echo -n "Enter the full email address for the mailserver: "
+-    set server=$<
+-    echo "Content-type: message/external-body; access-type=$accesstype; server="\"$server\"> $OUTFNAME
+-else
+-    echo accesstype $accesstype not yet implemented
+-    goto chooseaccesstype
+-endif
++	local-file | afs )
++	    name=
++	    while [ -z "$name" ]
++	    do
++	        echo -n "Enter the full path name for the file: "
++		read name
++		if [ ! -f "$name" ]
++		then
++		    echo "The file $name does not seem to exist."
++		    name=
++		fi
++	    done
++	    echo "Content-type: message/external-body; access-type=$accesstype; name="\"$name\"> "$OUTFNAME"
++	    choosing=no
++	    ;;
++	
++	mail-server )
++	    echo -n "Enter the full email address for the mailserver: "
++	    read server
++	    echo "Content-type: message/external-body; access-type=$accesstype; server="\"$server\"> "$OUTFNAME"
++	    choosing=no
++	    ;;
++	
++	* )
++	    echo accesstype "$accesstype" not yet implemented
++	    ;;
++    esac
++done
+ 
+ echo -n "Please enter the MIME content-type for the externally referenced data: "
+-set ctype = $<
+-getcenc:
+-echo "Is this data already encoded for email transport?"
+-echo "  1 -- No, it is not encoded"
+-echo "  2 -- Yes, it is encoded in base64"
+-echo "  3 -- Yes, it is encoded in quoted-printable"
+-echo "  4 -- Yes, it is encoded using uuencode"
+-set encode=$<
+-switch ("$encode")
+-    case 1:
+-        set cenc=""
+-        breaksw
+-    case 2:
+-        set cenc="base64"
+-        breaksw
+-    case 3:
+-        set cenc="quoted-printable"
+-        breaksw
+-    case 4:
+-        set cenc="x-uue"
+-        breaksw
+-    default:
+-        echo "That is not one of your choices."
+-        goto getcenc
+-endsw
+-echo "" >> $OUTFNAME
+-echo "Content-type: " $ctype >> $OUTFNAME
+-if ($cenc != "") echo "Content-transfer-encoding: " $cenc >> $OUTFNAME
+-echo "" >> $OUTFNAME
+-if ($accesstype == "mail-server") then
++read ctype
++
++choosing=yes
++while [ $choosing = yes ]
++do
++    echo "Is this data already encoded for email transport?"
++    echo "  1 -- No, it is not encoded"
++    echo "  2 -- Yes, it is encoded in base64"
++    echo "  3 -- Yes, it is encoded in quoted-printable"
++    echo "  4 -- Yes, it is encoded using uuencode"
++    read encode
++    case "$encode" in
++	1 ) cenc="" choosing=no ;;
++	2 ) cenc="base64" choosing=no ;;
++	3 ) cenc="quoted-printable" choosing=no ;;
++	4 ) cenc="x-uue" choosing=no ;;
++	* ) echo "That is not one of your choices." ;;
++    esac
++done
++
++echo >> "$OUTFNAME"
++echo "Content-type: " "$ctype" >> "$OUTFNAME"
++if [ -n "$cenc" ]
++then echo "Content-transfer-encoding: " "$cenc" >> "$OUTFNAME"
++fi
++echo >> "$OUTFNAME"
++if [ "$accesstype" = "mail-server" ]
++then
+     echo "Please enter all the data to be sent to the mailserver in the message body, "
+     echo "ending with ^D or your usual end-of-data character:"
+-    cat >> $OUTFNAME
+-endif
++    cat >> "$OUTFNAME"
++fi
+--- metamail-2.7.orig/aclocal.m4
++++ metamail-2.7/aclocal.m4
+@@ -0,0 +1,3824 @@
++dnl aclocal.m4 generated automatically by aclocal 1.4-p6
++
++dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++dnl This program is distributed in the hope that it will be useful,
++dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++dnl PARTICULAR PURPOSE.
++
++# Like AC_CONFIG_HEADER, but automatically create stamp file.
++
++AC_DEFUN([AM_CONFIG_HEADER],
++[AC_PREREQ([2.12])
++AC_CONFIG_HEADER([$1])
++dnl When config.status generates a header, we must update the stamp-h file.
++dnl This file resides in the same directory as the config header
++dnl that is generated.  We must strip everything past the first ":",
++dnl and everything past the last "/".
++AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
++ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
++<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
++<<am_indx=1
++for am_file in <<$1>>; do
++  case " <<$>>CONFIG_HEADERS " in
++  *" <<$>>am_file "*<<)>>
++    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
++    ;;
++  esac
++  am_indx=`expr "<<$>>am_indx" + 1`
++done<<>>dnl>>)
++changequote([,]))])
++
++# Do all the work for Automake.  This macro actually does too much --
++# some checks are only needed if your package does certain things.
++# But this isn't really a big deal.
++
++# serial 1
++
++dnl Usage:
++dnl AM_INIT_AUTOMAKE(package,version, [no-define])
++
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++AC_REQUIRE([AC_PROG_INSTALL])
++PACKAGE=[$1]
++AC_SUBST(PACKAGE)
++VERSION=[$2]
++AC_SUBST(VERSION)
++dnl test to see if srcdir already configured
++if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
++  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++fi
++ifelse([$3],,
++AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
++AC_REQUIRE([AM_SANITY_CHECK])
++AC_REQUIRE([AC_ARG_PROGRAM])
++dnl FIXME This is truly gross.
++missing_dir=`cd $ac_aux_dir && pwd`
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
++AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
++AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
++AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
++AC_REQUIRE([AC_PROG_MAKE_SET])])
++
++# Copyright 2002  Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
++
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION so it can be traced.
++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++	 [AM_AUTOMAKE_VERSION([1.4-p6])])
++
++#
++# Check to make sure that the build environment is sane.
++#
++
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftestfile
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
++   if test "[$]*" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftestfile`
++   fi
++   if test "[$]*" != "X $srcdir/configure conftestfile" \
++      && test "[$]*" != "X conftestfile $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
++alias in your environment])
++   fi
++
++   test "[$]2" = conftestfile
++   )
++then
++   # Ok.
++   :
++else
++   AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++rm -f conftest*
++AC_MSG_RESULT(yes)])
++
++dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
++dnl The program must properly implement --version.
++AC_DEFUN([AM_MISSING_PROG],
++[AC_MSG_CHECKING(for working $2)
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf.  Sigh.
++if ($2 --version) < /dev/null > /dev/null 2>&1; then
++   $1=$2
++   AC_MSG_RESULT(found)
++else
++   $1="$3/missing $2"
++   AC_MSG_RESULT(missing)
++fi
++AC_SUBST($1)])
++
++# Add --enable-maintainer-mode option to configure.
++# From Jim Meyering
++
++# serial 1
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++  dnl maintainer-mode is disabled by default
++  AC_ARG_ENABLE(maintainer-mode,
++[  --enable-maintainer-mode enable make rules and dependencies not useful
++                          (and sometimes confusing) to the casual installer],
++      USE_MAINTAINER_MODE=$enableval,
++      USE_MAINTAINER_MODE=no)
++  AC_MSG_RESULT($USE_MAINTAINER_MODE)
++  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST(MAINT)dnl
++]
++)
++
++# Define a conditional.
++
++AC_DEFUN([AM_CONDITIONAL],
++[AC_SUBST($1_TRUE)
++AC_SUBST($1_FALSE)
++if $2; then
++  $1_TRUE=
++  $1_FALSE='#'
++else
++  $1_TRUE='#'
++  $1_FALSE=
++fi])
++
++# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
++
++# serial 46 AC_PROG_LIBTOOL
++
++AC_DEFUN([AC_PROG_LIBTOOL],
++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
++
++# Prevent multiple expansion
++define([AC_PROG_LIBTOOL], [])
++])
++
++AC_DEFUN([AC_LIBTOOL_SETUP],
++[AC_PREREQ(2.13)dnl
++AC_REQUIRE([AC_ENABLE_SHARED])dnl
++AC_REQUIRE([AC_ENABLE_STATIC])dnl
++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_LD])dnl
++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
++AC_REQUIRE([AC_PROG_NM])dnl
++AC_REQUIRE([LT_AC_PROG_SED])dnl
++
++AC_REQUIRE([AC_PROG_LN_S])dnl
++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++AC_REQUIRE([AC_OBJEXT])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++dnl
++
++_LT_AC_PROG_ECHO_BACKSLASH
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    AC_PATH_MAGIC
++  fi
++  ;;
++esac
++
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
++
++ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
++ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
++enable_win32_dll=yes, enable_win32_dll=no)
++
++AC_ARG_ENABLE(libtool-lock,
++  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++    [AC_LANG_SAVE
++     AC_LANG_C
++     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++     AC_LANG_RESTORE])
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++
++ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
++[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++  AC_CHECK_TOOL(AS, as, false)
++  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++
++  # recent cygwin and mingw systems supply a stub DllMain which the user
++  # can override, but on older systems we have to supply one
++  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
++    [AC_TRY_LINK([],
++      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
++      DllMain (0, 0, 0);],
++      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
++
++  case $host/$CC in
++  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
++    # old mingw systems require "-dll" to link a DLL, while more recent ones
++    # require "-mdll"
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$CFLAGS -mdll"
++    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
++      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
++    CFLAGS="$SAVE_CFLAGS" ;;
++  *-*-cygwin* | *-*-pw32*)
++    # cygwin systems need to pass --dll to the linker, and not link
++    # crt.o which will require a WinMain@16 definition.
++    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
++  esac
++  ;;
++  ])
++esac
++
++_LT_AC_LTCONFIG_HACK
++
++])
++
++# AC_LIBTOOL_HEADER_ASSERT
++# ------------------------
++AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
++[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
++    [lt_cv_func_assert_works],
++    [case $host in
++    *-*-solaris*)
++      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
++        case `$CC --version 2>/dev/null` in
++        [[12]].*) lt_cv_func_assert_works=no ;;
++        *)        lt_cv_func_assert_works=yes ;;
++        esac
++      fi
++      ;;
++    esac])
++
++if test "x$lt_cv_func_assert_works" = xyes; then
++  AC_CHECK_HEADERS(assert.h)
++fi
++])# AC_LIBTOOL_HEADER_ASSERT
++
++# _LT_AC_CHECK_DLFCN
++# --------------------
++AC_DEFUN([_LT_AC_CHECK_DLFCN],
++[AC_CHECK_HEADERS(dlfcn.h)
++])# _LT_AC_CHECK_DLFCN
++
++# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++# ---------------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
++[AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([AC_PROG_NM])
++AC_REQUIRE([AC_OBJEXT])
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++AC_MSG_CHECKING([command to parse $NM output])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
++
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[[BCDEGRST]]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[[BCDT]]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[[ABCDGISTW]]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++irix* | nonstopux*)
++  symcode='[[BCDEGRST]]'
++  ;;
++osf*)
++  symcode='[[BCDEGQRST]]'
++  ;;
++solaris* | sysv5*)
++  symcode='[[BDT]]'
++  ;;
++sysv4)
++  symcode='[[DFNSTU]]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $host_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
++  symcode='[[ABCDGISTW]]'
++fi
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if AC_TRY_EVAL(ac_compile); then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
++	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr void *
++#else
++# define lt_ptr char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr address;
++}
++lt_preloaded_symbols[[]] =
++{
++EOF
++	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  save_LIBS="$LIBS"
++	  save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$no_builtin_flag"
++	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$save_LIBS"
++	  CFLAGS="$save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
++    fi
++  else
++    echo "$progname: failed program was:" >&AC_FD_CC
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++])
++global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  global_symbol_to_cdecl=
++  global_symbol_to_c_name_address=
++else
++  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
++  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
++fi
++if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
++then
++  AC_MSG_RESULT(failed)
++else
++  AC_MSG_RESULT(ok)
++fi
++]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++
++# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
++# ---------------------------------
++AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
++[# Find the correct PATH separator.  Usually this is `:', but
++# DJGPP uses `;' like DOS.
++if test "X${PATH_SEPARATOR+set}" != Xset; then
++  UNAME=${UNAME-`uname 2>/dev/null`}
++  case X$UNAME in
++    *-DOS) lt_cv_sys_path_separator=';' ;;
++    *)     lt_cv_sys_path_separator=':' ;;
++  esac
++  PATH_SEPARATOR=$lt_cv_sys_path_separator
++fi
++])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
++
++# _LT_AC_PROG_ECHO_BACKSLASH
++# --------------------------
++# Add some code to the start of the generated configure script which
++# will find an echo command which doesn't interpret backslashes.
++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
++[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++			      [AC_DIVERT_PUSH(NOTICE)])
++_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
++
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++  ;;
++esac
++
++echo=${ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X[$]1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
++fi
++
++if test "X[$]1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "[$]0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
++
++AC_SUBST(ECHO)
++AC_DIVERT_POP
++])# _LT_AC_PROG_ECHO_BACKSLASH
++
++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
++#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
++# ------------------------------------------------------------------
++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
++[if test "$cross_compiling" = yes; then :
++  [$4]
++else
++  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++[#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}]
++EOF
++  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) $1 ;;
++      x$lt_dlneed_uscore) $2 ;;
++      x$lt_unknown|x*) $3 ;;
++    esac
++  else :
++    # compilation failed
++    $3
++  fi
++fi
++rm -fr conftest*
++])# _LT_AC_TRY_DLOPEN_SELF
++
++# AC_LIBTOOL_DLOPEN_SELF
++# -------------------
++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
++[if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  *)
++    AC_CHECK_FUNC([shl_load],
++          [lt_cv_dlopen="shl_load"],
++      [AC_CHECK_LIB([dld], [shl_load],
++            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++	[AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++      ])
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    AC_CACHE_CHECK([whether a program can dlopen itself],
++	  lt_cv_dlopen_self, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
++	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++    ])
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
++    	  lt_cv_dlopen_self_static, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
++	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
++      ])
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++])# AC_LIBTOOL_DLOPEN_SELF
++
++AC_DEFUN([_LT_AC_LTCONFIG_HACK],
++[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++need_locks="$enable_libtool_lock"
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
++
++if test x"$host" != x"$build"; then
++  ac_tool_prefix=${host_alias}-
++else
++  ac_tool_prefix=
++fi
++
++# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
++case $host_os in
++linux-gnu*) ;;
++linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
++esac
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++
++# Allow CC to be a program name with arguments.
++set dummy $CC
++compiler="[$]2"
++
++AC_MSG_CHECKING([for objdir])
++rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  objdir=_libs
++fi
++rmdir .libs 2>/dev/null
++AC_MSG_RESULT($objdir)
++
++
++AC_ARG_WITH(pic,
++[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
++pic_mode="$withval", pic_mode=default)
++test -z "$pic_mode" && pic_mode=default
++
++# We assume here that the value for lt_cv_prog_cc_pic will not be cached
++# in isolation, and that seeing it set (from the cache) indicates that
++# the associated values are set (in the cache) correctly too.
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++AC_CACHE_VAL(lt_cv_prog_cc_pic,
++[ lt_cv_prog_cc_pic=
++  lt_cv_prog_cc_shlib=
++  lt_cv_prog_cc_wl=
++  lt_cv_prog_cc_static=
++  lt_cv_prog_cc_no_builtin=
++  lt_cv_prog_cc_can_build_shared=$can_build_shared
++
++  if test "$GCC" = yes; then
++    lt_cv_prog_cc_wl='-Wl,'
++    lt_cv_prog_cc_static='-static'
++
++    case $host_os in
++    aix*)
++      # Below there is a dirty hack to force normal static linking with -ldl
++      # The problem is because libdl dynamically linked with both libc and
++      # libC (AIX C++ library), which obviously doesn't included in libraries
++      # list by gcc. This cause undefined symbols with -static flags.
++      # This hack allows C programs to be linked with "-static -ldl", but
++      # not sure about C++ programs.
++      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_cv_prog_cc_pic='-fno-common'
++      ;;
++    cygwin* | mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	 lt_cv_prog_cc_pic=-Kconform_pic
++      fi
++      ;;
++    *)
++      lt_cv_prog_cc_pic='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for PIC flags for the system compiler.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      lt_cv_prog_cc_wl='-Wl,'
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_cv_prog_cc_static='-Bstatic'
++      else
++	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
++      lt_cv_prog_cc_pic='+Z'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static='-non_shared'
++      # PIC (with -KPIC) is the default.
++      ;;
++
++    cygwin* | mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++      ;;
++
++    newsos6)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      ;;
++
++    osf3* | osf4* | osf5*)
++      # All OSF/1 code is PIC.
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_cv_prog_cc_pic='-Kpic'
++      lt_cv_prog_cc_static='-dn'
++      lt_cv_prog_cc_shlib='-belf'
++      ;;
++
++    solaris*)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Wl,'
++      ;;
++
++    sunos4*)
++      lt_cv_prog_cc_pic='-PIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Qoption ld '
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Wl,'
++      ;;
++
++    uts4*)
++      lt_cv_prog_cc_pic='-pic'
++      lt_cv_prog_cc_static='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_cv_prog_cc_pic='-Kconform_pic'
++	lt_cv_prog_cc_static='-Bstatic'
++      fi
++      ;;
++
++    *)
++      lt_cv_prog_cc_can_build_shared=no
++      ;;
++    esac
++  fi
++])
++if test -z "$lt_cv_prog_cc_pic"; then
++  AC_MSG_RESULT([none])
++else
++  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
++
++  # Check to make sure the pic_flag actually works.
++  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
++  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
++    save_CFLAGS="$CFLAGS"
++    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
++    AC_TRY_COMPILE([], [], [dnl
++      case $host_os in
++      hpux9* | hpux10* | hpux11*)
++	# On HP-UX, both CC and GCC only warn that PIC is supported... then
++	# they create non-PIC objects.  So, if there were any warnings, we
++	# assume that PIC is not supported.
++	if test -s conftest.err; then
++	  lt_cv_prog_cc_pic_works=no
++	else
++	  lt_cv_prog_cc_pic_works=yes
++	fi
++	;;
++      *)
++	lt_cv_prog_cc_pic_works=yes
++	;;
++      esac
++    ], [dnl
++      lt_cv_prog_cc_pic_works=no
++    ])
++    CFLAGS="$save_CFLAGS"
++  ])
++
++  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
++    lt_cv_prog_cc_pic=
++    lt_cv_prog_cc_can_build_shared=no
++  else
++    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
++  fi
++
++  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
++fi
++
++# Check for any special shared library compilation flags.
++if test -n "$lt_cv_prog_cc_shlib"; then
++  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
++  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
++  else
++   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
++    lt_cv_prog_cc_can_build_shared=no
++  fi
++fi
++
++AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
++AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
++  lt_cv_prog_cc_static_works=no
++  save_LDFLAGS="$LDFLAGS"
++  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
++  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
++  LDFLAGS="$save_LDFLAGS"
++])
++
++# Belt *and* braces to stop my trousers falling down:
++test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
++AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
++
++pic_flag="$lt_cv_prog_cc_pic"
++special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
++wl="$lt_cv_prog_cc_wl"
++link_static_flag="$lt_cv_prog_cc_static"
++no_builtin_flag="$lt_cv_prog_cc_no_builtin"
++can_build_shared="$lt_cv_prog_cc_can_build_shared"
++
++
++# Check to see if options -o and -c are simultaneously supported by compiler
++AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
++AC_CACHE_VAL([lt_cv_compiler_c_o], [
++$rm -r conftest 2>/dev/null
++mkdir conftest
++cd conftest
++echo "int some_variable = 0;" > conftest.$ac_ext
++mkdir out
++# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
++# that will create temporary files in the current directory regardless of
++# the output directory.  Thus, making CWD read-only will cause this test
++# to fail, enabling locking or at least warning the user not to do parallel
++# builds.
++chmod -w .
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
++compiler_c_o=no
++if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
++  # The compiler can only warn and ignore the option if not recognized
++  # So say no if there are warnings
++  if test -s out/conftest.err; then
++    lt_cv_compiler_c_o=no
++  else
++    lt_cv_compiler_c_o=yes
++  fi
++else
++  # Append any errors to the config.log.
++  cat out/conftest.err 1>&AC_FD_CC
++  lt_cv_compiler_c_o=no
++fi
++CFLAGS="$save_CFLAGS"
++chmod u+w .
++$rm conftest* out/*
++rmdir out
++cd ..
++rmdir conftest
++$rm -r conftest 2>/dev/null
++])
++compiler_c_o=$lt_cv_compiler_c_o
++AC_MSG_RESULT([$compiler_c_o])
++
++if test x"$compiler_c_o" = x"yes"; then
++  # Check to see if we can write to a .lo
++  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
++  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
++  lt_cv_compiler_o_lo=no
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -c -o conftest.lo"
++  save_objext="$ac_objext"
++  ac_objext=lo
++  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
++    # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++    if test -s conftest.err; then
++      lt_cv_compiler_o_lo=no
++    else
++      lt_cv_compiler_o_lo=yes
++    fi
++  ])
++  ac_objext="$save_objext"
++  CFLAGS="$save_CFLAGS"
++  ])
++  compiler_o_lo=$lt_cv_compiler_o_lo
++  AC_MSG_RESULT([$compiler_o_lo])
++else
++  compiler_o_lo=no
++fi
++
++# Check to see if we can do hard links to lock some files if needed
++hard_links="nottested"
++if test "$compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  AC_MSG_CHECKING([if we can lock with hard links])
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  AC_MSG_RESULT([$hard_links])
++  if test "$hard_links" = no; then
++    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++if test "$GCC" = yes; then
++  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
++  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
++  echo "int some_variable = 0;" > conftest.$ac_ext
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
++  compiler_rtti_exceptions=no
++  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
++    # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++    if test -s conftest.err; then
++      compiler_rtti_exceptions=no
++    else
++      compiler_rtti_exceptions=yes
++    fi
++  ])
++  CFLAGS="$save_CFLAGS"
++  AC_MSG_RESULT([$compiler_rtti_exceptions])
++
++  if test "$compiler_rtti_exceptions" = "yes"; then
++    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
++  else
++    no_builtin_flag=' -fno-builtin'
++  fi
++fi
++
++# See if the linker supports building shared libraries.
++AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
++
++allow_undefined_flag=
++no_undefined_flag=
++need_lib_prefix=unknown
++need_version=unknown
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++archive_cmds=
++archive_expsym_cmds=
++old_archive_from_new_cmds=
++old_archive_from_expsyms_cmds=
++export_dynamic_flag_spec=
++whole_archive_flag_spec=
++thread_safe_flag_spec=
++hardcode_into_libs=no
++hardcode_libdir_flag_spec=
++hardcode_libdir_separator=
++hardcode_direct=no
++hardcode_minus_L=no
++hardcode_shlibpath_var=unsupported
++runpath_var=
++link_all_deplibs=unknown
++always_export_symbols=no
++export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
++# include_expsyms should be a list of space-separated symbols to be *always*
++# included in the symbol list
++include_expsyms=
++# exclude_expsyms can be an egrep regular expression of symbols to exclude
++# it will be wrapped by ` (' and `)$', so one must not match beginning or
++# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++# as well as any symbol that contains `d'.
++exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++# platforms (ab)use it in PIC code, but their linkers get confused if
++# the symbol is explicitly referenced.  Since portable code cannot
++# rely on this symbol name, it's probably fine to never include it in
++# preloaded symbol tables.
++extract_expsyms_cmds=
++
++case $host_os in
++cygwin* | mingw* | pw32*)
++  # FIXME: the MSVC++ port hasn't been tested in a loooong time
++  # When not using gcc, we currently assume that we are using
++  # Microsoft Visual C++.
++  if test "$GCC" != yes; then
++    with_gnu_ld=no
++  fi
++  ;;
++openbsd*)
++  with_gnu_ld=no
++  ;;
++esac
++
++ld_shlibs=yes
++if test "$with_gnu_ld" = yes; then
++  # If archive_cmds runs LD, not CC, wlarc should be empty
++  wlarc='${wl}'
++
++  # See if GNU ld supports shared libraries.
++  case $host_os in
++  aix3* | aix4* | aix5*)
++    # On AIX, the GNU linker is very broken
++    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
++    ld_shlibs=no
++    cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++
++    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++    # that the semantics of dynamic libraries on AmigaOS, at least up
++    # to version 4, is to share data among multiple programs linked
++    # with the same dynamic library.  Since this doesn't match the
++    # behavior of shared libraries on other platforms, we can use
++    # them.
++    ld_shlibs=no
++    ;;
++
++  beos*)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      allow_undefined_flag=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec='-L$libdir'
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++
++    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
++      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
++      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
++      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
++      else $CC -o impgen impgen.c ; fi)~
++      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
++
++    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
++
++    # cygwin and mingw dlls have different entry points and sets of symbols
++    # to exclude.
++    # FIXME: what about values for MSVC?
++    dll_entry=__cygwin_dll_entry@12
++    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
++    case $host_os in
++    mingw*)
++      # mingw values
++      dll_entry=_DllMainCRTStartup@12
++      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
++      ;;
++    esac
++
++    # mingw and cygwin differ, and it's simplest to just exclude the union
++    # of the two symbol sets.
++    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
++
++    # recent cygwin and mingw systems supply a stub DllMain which the user
++    # can override, but on older systems we have to supply one (in ltdll.c)
++    if test "x$lt_cv_need_dllmain" = "xyes"; then
++      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
++      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
++	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
++    else
++      ltdll_obj=
++      ltdll_cmds=
++    fi
++
++    # Extract the symbol export list from an `--export-all' def file,
++    # then regenerate the def file from the symbol export list, so that
++    # the compiled dll only exports the symbol export list.
++    # Be careful not to strip the DATA tag left be newer dlltools.
++    export_symbols_cmds="$ltdll_cmds"'
++      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
++      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
++
++    # If the export-symbols file already is a .def file (1st line
++    # is EXPORTS), use it as is.
++    # If DATA tags from a recent dlltool are present, honour them!
++    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname-def;
++      else
++	echo EXPORTS > $output_objdir/$soname-def;
++	_lt_hint=1;
++	cat $export_symbols | while read symbol; do
++	 set dummy \$symbol;
++	 case \[$]# in
++	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
++	   4) echo "   \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
++	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
++	 esac;
++	 _lt_hint=`expr 1 + \$_lt_hint`;
++	done;
++      fi~
++      '"$ltdll_cmds"'
++      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
++      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
++      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++      wlarc=
++    else
++      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    fi
++    ;;
++
++  solaris* | sysv5*)
++    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
++      ld_shlibs=no
++      cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  sunos4*)
++    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    wlarc=
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++  esac
++
++  if test "$ld_shlibs" = yes; then
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    case $host_os in
++    cygwin* | mingw* | pw32*)
++      # dlltool doesn't understand --whole-archive et. al.
++      whole_archive_flag_spec=
++      ;;
++    *)
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++	whole_archive_flag_spec=
++      fi
++      ;;
++    esac
++  fi
++else
++  # PORTME fill in a description of your system's linker (not GNU ld)
++  case $host_os in
++  aix3*)
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++    # Note: this linker hardcodes the directories in LIBPATH if there
++    # are no directories specified by -L.
++    hardcode_minus_L=yes
++    if test "$GCC" = yes && test -z "$link_static_flag"; then
++      # Neither direct hardcoding nor static linking is supported with a
++      # broken collect2.
++      hardcode_direct=unsupported
++    fi
++    ;;
++
++  aix4* | aix5*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	  ;;
++	  esac
++	done
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    hardcode_direct=yes
++    archive_cmds=''
++    hardcode_libdir_separator=':'
++    if test "$GCC" = yes; then
++      case $host_os in aix4.[[012]]|aix4.[[012]].*)
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	  strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  hardcode_direct=yes
++	else
++	  # We have old collect2
++	  hardcode_direct=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  hardcode_minus_L=yes
++	  hardcode_libdir_flag_spec='-L$libdir'
++	  hardcode_libdir_separator=
++	fi
++      esac
++
++      shared_flag='-shared'
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	shared_flag='${wl}-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
++
++    # It seems that -bexpall can do strange things, so it is better to
++    # generate a list of symbols to export.
++    always_export_symbols=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      allow_undefined_flag='-berok'
++      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
++      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++    else
++      if test "$host_cpu" = ia64; then
++	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++	allow_undefined_flag="-z nodefs"
++	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag='${wl}-berok'
++	# This is a bit strange, but is similar to how AIX traditionally builds
++	# it's shared libraries.
++	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    # see comment about different semantics on the GNU ld section
++    ld_shlibs=no
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec=' '
++    allow_undefined_flag=unsupported
++    # Tell ltmain to make .lib files, not .a files.
++    libext=lib
++    # FIXME: Setting linknames here is a bad hack.
++    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++    # The linker will automatically build a .lib file if we build a DLL.
++    old_archive_from_new_cmds='true'
++    # FIXME: Should let the user specify the lib program.
++    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++    fix_srcfile_path='`cygpath -w "$srcfile"`'
++    ;;
++
++  darwin* | rhapsody*)
++    case "$host_os" in
++    rhapsody* | darwin1.[[012]])
++      allow_undefined_flag='-undefined suppress'
++      ;;
++    *) # Darwin 1.3 on
++      allow_undefined_flag='-flat_namespace -undefined suppress'
++      ;;
++    esac
++    # FIXME: Relying on posixy $() will cause problems for
++    #        cross-compilation, but unfortunately the echo tests do not
++    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
++    #	     `"' quotes if we put them in here... so don't!
++    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
++    # We need to add '_' to the symbols in $export_symbols first
++    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    whole_archive_flag_spec='-all_load $convenience'
++    ;;
++
++  freebsd1*)
++    ld_shlibs=no
++    ;;
++
++  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++  # support.  Future versions do this automatically, but an explicit c++rt0.o
++  # does not break anything, and helps significantly (at the cost of a little
++  # extra space).
++  freebsd2.2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++  freebsd2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++  freebsd*)
++    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  hpux9* | hpux10* | hpux11*)
++    case $host_os in
++    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
++    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
++    esac
++    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_direct=yes
++    hardcode_minus_L=yes # Not in the search PATH, but as the default
++			 # location of the library.
++    export_dynamic_flag_spec='${wl}-E'
++    ;;
++
++  irix5* | irix6* | nonstopux*)
++    if test "$GCC" = yes; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    else
++      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='-rpath $libdir'
++    fi
++    hardcode_libdir_separator=:
++    link_all_deplibs=yes
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++    else
++      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++    fi
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  newsos6)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_shlibpath_var=no
++    ;;
++
++  openbsd*)
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec='${wl}-E'
++    else
++      case "$host_os" in
++      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_libdir_flag_spec='-R$libdir'
++        ;;
++      *)
++        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++        ;;
++      esac
++    fi
++    ;;
++
++  os2*)
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    allow_undefined_flag=unsupported
++    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++    ;;
++
++  osf3*)
++    if test "$GCC" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++
++  osf4* | osf5*)	# as osf3* with the addition of -msym flag
++    if test "$GCC" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++      #Both c and cxx compiler support -rpath directly
++      hardcode_libdir_flag_spec='-rpath $libdir'
++    fi
++    hardcode_libdir_separator=:
++    ;;
++
++  sco3.2v5*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_shlibpath_var=no
++    runpath_var=LD_RUN_PATH
++    hardcode_runpath_var=yes
++    export_dynamic_flag_spec='${wl}-Bexport'
++    ;;
++
++  solaris*)
++    # gcc --version < 3.0 without binutils cannot create self contained
++    # shared libraries reliably, requiring libgcc.a to resolve some of
++    # the object symbols generated in some cases.  Libraries that use
++    # assert need libgcc.a to resolve __eprintf, for example.  Linking
++    # a copy of libgcc.a into every shared library to guarantee resolving
++    # such symbols causes other problems:  According to Tim Van Holder
++    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
++    # (to the application) exception stack for one thing.
++    no_undefined_flag=' -z defs'
++    if test "$GCC" = yes; then
++      case `$CC --version 2>/dev/null` in
++      [[12]].*)
++	cat <<EOF 1>&2
++
++*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
++*** create self contained shared libraries on Solaris systems, without
++*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
++*** -no-undefined support, which will at least allow you to build shared
++*** libraries.  However, you may find that when you link such libraries
++*** into an application without using GCC, you have to manually add
++*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
++*** upgrade to a newer version of GCC.  Another option is to rebuild your
++*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
++
++EOF
++        no_undefined_flag=
++	;;
++      esac
++    fi
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_shlibpath_var=no
++    case $host_os in
++    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++    esac
++    link_all_deplibs=yes
++    ;;
++
++  sunos4*)
++    if test "x$host_vendor" = xsequent; then
++      # Use $CC to link under sequent, because it throws in some extra .o
++      # files that make .init and .fini sections work.
++      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++    else
++      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++    fi
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4)
++    case $host_vendor in
++      sni)
++        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++        hardcode_direct=yes # is this really true???
++        ;;
++      siemens)
++        ## LD is ld it makes a PLAMLIB
++        ## CC just makes a GrossModule.
++        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++        reload_cmds='$CC -r -o $output$reload_objs'
++        hardcode_direct=no
++        ;;
++      motorola)
++        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++        ;;
++    esac
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4.3*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_shlibpath_var=no
++    export_dynamic_flag_spec='-Bexport'
++    ;;
++
++  sysv5*)
++    no_undefined_flag=' -z text'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++    hardcode_libdir_flag_spec=
++    hardcode_shlibpath_var=no
++    runpath_var='LD_RUN_PATH'
++    ;;
++
++  uts4*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  dgux*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4*MP*)
++    if test -d /usr/nec; then
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ld_shlibs=yes
++    fi
++    ;;
++
++  sysv4.2uw2*)
++    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_minus_L=no
++    hardcode_shlibpath_var=no
++    hardcode_runpath_var=yes
++    runpath_var=LD_RUN_PATH
++    ;;
++
++  sysv5uw7* | unixware7*)
++    no_undefined_flag='${wl}-z ${wl}text'
++    if test "$GCC" = yes; then
++      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++    else
++      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++    fi
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    ld_shlibs=no
++    ;;
++  esac
++fi
++AC_MSG_RESULT([$ld_shlibs])
++test "$ld_shlibs" = no && can_build_shared=no
++
++# Check hardcoding attributes.
++AC_MSG_CHECKING([how to hardcode library paths into programs])
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
++   test -n "$runpath_var"; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$hardcode_shlibpath_var" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++AC_MSG_RESULT([$hardcode_action])
++
++striplib=
++old_striplib=
++AC_MSG_CHECKING([whether stripping libraries is possible])
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  AC_MSG_RESULT([yes])
++else
++  AC_MSG_RESULT([no])
++fi
++
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++
++# PORTME Fill in your ld.so characteristics
++AC_MSG_CHECKING([dynamic linker characteristics])
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}.so$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[[01]] | aix4.[[01]].*)
++	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	     echo ' yes '
++	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	  :
++	else
++	  can_build_shared=no
++	fi
++	;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can
++    # not hardcode correct soname into executable. Probably we can
++    # add versioning support to collect2, so additional links can
++    # be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}.so$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  hardcode_into_libs=yes
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}.so'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  export_dynamic_flag_spec=-rdynamic
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  need_version=no
++  need_lib_prefix=no
++  case $GCC,$host_os in
++  yes,cygwin*)
++    library_names_spec='$libname.dll.a'
++    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
++    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog .libs/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    ;;
++  yes,mingw*)
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
++    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
++    ;;
++  yes,pw32*)
++    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
++    ;;
++  *)
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  # FIXME: Relying on posixy $() will cause problems for
++  #        cross-compilation, but unfortunately the echo tests do not
++  #        yet detect zsh echo's removal of \ escapes.
++  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
++  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++freebsd*-gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU/FreeBSD ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  *)
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  dynamic_linker="$host_os dld.sl"
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  shlibpath_var=SHLIB_PATH
++  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
++  soname_spec='${libname}${release}.sl$major'
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)          version_type=irix ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux-gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++    soname_spec='${libname}${release}.so$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case "$host_os" in
++    openbsd2.[[89]] | openbsd2.[[89]].*)
++      shlibpath_overrides_runpath=no
++      ;;
++    *)
++      shlibpath_overrides_runpath=yes
++      ;;
++    esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++os2*)
++  libname_spec='$name'
++  need_lib_prefix=no
++  library_names_spec='$libname.dll $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_version=no
++  need_lib_prefix=no
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  hardcode_into_libs=yes
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
++    soname_spec='$libname.so.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++AC_MSG_RESULT([$dynamic_linker])
++test "$dynamic_linker" = no && can_build_shared=no
++
++# Report the final consequences.
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
++
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix4*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++  ;;
++esac
++AC_MSG_RESULT([$enable_shared])
++
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
++
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++AC_LIBTOOL_DLOPEN_SELF
++
++if test "$enable_shared" = yes && test "$GCC" = yes; then
++  case $archive_cmds in
++  *'~'*)
++    # FIXME: we may have to deal with multi-command sequences.
++    ;;
++  '$CC '*)
++    # Test whether the compiler implicitly links with -lc since on some
++    # systems, -lgcc has to come before -lc. If gcc already passes -lc
++    # to ld, don't add -lc before -lgcc.
++    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
++    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
++    [$rm conftest*
++    echo 'static int dummy;' > conftest.$ac_ext
++
++    if AC_TRY_EVAL(ac_compile); then
++      soname=conftest
++      lib=conftest
++      libobjs=conftest.$ac_objext
++      deplibs=
++      wl=$lt_cv_prog_cc_wl
++      compiler_flags=-v
++      linker_flags=-v
++      verstring=
++      output_objdir=.
++      libname=conftest
++      save_allow_undefined_flag=$allow_undefined_flag
++      allow_undefined_flag=
++      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
++      then
++	lt_cv_archive_cmds_need_lc=no
++      else
++	lt_cv_archive_cmds_need_lc=yes
++      fi
++      allow_undefined_flag=$save_allow_undefined_flag
++    else
++      cat conftest.err 1>&5
++    fi])
++    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
++    ;;
++  esac
++fi
++need_lc=${lt_cv_archive_cmds_need_lc-yes}
++
++# The second clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  :
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  test -f Makefile && make "$ltmain"
++fi
++
++if test -f "$ltmain"; then
++  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
++  $rm -f "${ofile}T"
++
++  echo creating $ofile
++
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS SED \
++    AR AR_FLAGS CC LD LN_S NM SHELL \
++    reload_flag reload_cmds wl \
++    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
++    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
++    library_names_spec soname_spec \
++    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
++    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
++    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
++    old_striplib striplib file_magic_cmd export_symbols_cmds \
++    deplibs_check_method allow_undefined_flag no_undefined_flag \
++    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
++    global_symbol_to_c_name_address \
++    hardcode_libdir_flag_spec hardcode_libdir_separator  \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++
++    case $var in
++    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
++    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  cat <<__EOF__ > "${ofile}T"
++#! $SHELL
++
++# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996-2000 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# 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.
++
++# A sed that does not truncate output.
++SED=$lt_SED
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="${SED} -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++# ### BEGIN LIBTOOL CONFIG
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$need_lc
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# The default C compiler.
++CC=$lt_CC
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC
++
++# The linker used to build libraries.
++LD=$lt_LD
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_wl
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_pic_flag
++pic_mode=$pic_mode
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_compiler_c_o
++
++# Can we write directly to a .lo ?
++compiler_o_lo=$lt_compiler_o_lo
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_link_static_flag
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_no_builtin_flag
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
++
++# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
++
++# ### END LIBTOOL CONFIG
++
++__EOF__
++
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "${ofile}T"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  case $host_os in
++  cygwin* | mingw* | pw32* | os2*)
++    cat <<'EOF' >> "${ofile}T"
++      # This is a source program that is used to create dlls on Windows
++      # Don't remove nor modify the starting and closing comments
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
++#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++	# This is a source program that is used to create import libraries
++	# on Windows for dlls which lack them. Don't remove nor modify the
++	# starting and closing comments
++# /* impgen.c starts here */
++# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
++#
++#  This file is part of GNU libtool.
++#
++#  This program is free software; you can redistribute it and/or modify
++#  it under the terms of the GNU General Public License as published by
++#  the Free Software Foundation; either version 2 of the License, or
++#  (at your option) any later version.
++#
++#  This program is distributed in the hope that it will be useful,
++#  but WITHOUT ANY WARRANTY; without even the implied warranty of
++#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#  GNU General Public License for more details.
++#
++#  You should have received a copy of the GNU General Public License
++#  along with this program; if not, write to the Free Software
++#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#  */
++#
++# #include <stdio.h>		/* for printf() */
++# #include <unistd.h>		/* for open(), lseek(), read() */
++# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
++# #include <string.h>		/* for strdup() */
++#
++# /* O_BINARY isn't required (or even defined sometimes) under Unix */
++# #ifndef O_BINARY
++# #define O_BINARY 0
++# #endif
++#
++# static unsigned int
++# pe_get16 (fd, offset)
++#      int fd;
++#      int offset;
++# {
++#   unsigned char b[2];
++#   lseek (fd, offset, SEEK_SET);
++#   read (fd, b, 2);
++#   return b[0] + (b[1]<<8);
++# }
++#
++# static unsigned int
++# pe_get32 (fd, offset)
++#     int fd;
++#     int offset;
++# {
++#   unsigned char b[4];
++#   lseek (fd, offset, SEEK_SET);
++#   read (fd, b, 4);
++#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++# }
++#
++# static unsigned int
++# pe_as32 (ptr)
++#      void *ptr;
++# {
++#   unsigned char *b = ptr;
++#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++# }
++#
++# int
++# main (argc, argv)
++#     int argc;
++#     char *argv[];
++# {
++#     int dll;
++#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
++#     unsigned long export_rva, export_size, nsections, secptr, expptr;
++#     unsigned long name_rvas, nexp;
++#     unsigned char *expdata, *erva;
++#     char *filename, *dll_name;
++#
++#     filename = argv[1];
++#
++#     dll = open(filename, O_RDONLY|O_BINARY);
++#     if (dll < 1)
++# 	return 1;
++#
++#     dll_name = filename;
++#
++#     for (i=0; filename[i]; i++)
++# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
++# 	    dll_name = filename + i +1;
++#
++#     pe_header_offset = pe_get32 (dll, 0x3c);
++#     opthdr_ofs = pe_header_offset + 4 + 20;
++#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
++#
++#     if (num_entries < 1) /* no exports */
++# 	return 1;
++#
++#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
++#     export_size = pe_get32 (dll, opthdr_ofs + 100);
++#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
++#     secptr = (pe_header_offset + 4 + 20 +
++# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
++#
++#     expptr = 0;
++#     for (i = 0; i < nsections; i++)
++#     {
++# 	char sname[8];
++# 	unsigned long secptr1 = secptr + 40 * i;
++# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
++# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
++# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
++# 	lseek(dll, secptr1, SEEK_SET);
++# 	read(dll, sname, 8);
++# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
++# 	{
++# 	    expptr = fptr + (export_rva - vaddr);
++# 	    if (export_rva + export_size > vaddr + vsize)
++# 		export_size = vsize - (export_rva - vaddr);
++# 	    break;
++# 	}
++#     }
++#
++#     expdata = (unsigned char*)malloc(export_size);
++#     lseek (dll, expptr, SEEK_SET);
++#     read (dll, expdata, export_size);
++#     erva = expdata - export_rva;
++#
++#     nexp = pe_as32 (expdata+24);
++#     name_rvas = pe_as32 (expdata+32);
++#
++#     printf ("EXPORTS\n");
++#     for (i = 0; i<nexp; i++)
++#     {
++# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
++# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
++#     }
++#
++#     return 0;
++# }
++# /* impgen.c ends here */
++
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
++
++  mv -f "${ofile}T" "$ofile" || \
++    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
++  chmod +x "$ofile"
++fi
++
++])# _LT_AC_LTCONFIG_HACK
++
++# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
++AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
++
++# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
++AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
++
++# AC_ENABLE_SHARED - implement the --enable-shared flag
++# Usage: AC_ENABLE_SHARED[(DEFAULT)]
++#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
++#   `yes'.
++AC_DEFUN([AC_ENABLE_SHARED],
++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE(shared,
++changequote(<<, >>)dnl
++<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
++changequote([, ])dnl
++[p=${PACKAGE-default}
++case $enableval in
++yes) enable_shared=yes ;;
++no) enable_shared=no ;;
++*)
++  enable_shared=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_shared=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac],
++enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
++])
++
++# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
++AC_DEFUN([AC_DISABLE_SHARED],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_SHARED(no)])
++
++# AC_ENABLE_STATIC - implement the --enable-static flag
++# Usage: AC_ENABLE_STATIC[(DEFAULT)]
++#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
++#   `yes'.
++AC_DEFUN([AC_ENABLE_STATIC],
++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE(static,
++changequote(<<, >>)dnl
++<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
++changequote([, ])dnl
++[p=${PACKAGE-default}
++case $enableval in
++yes) enable_static=yes ;;
++no) enable_static=no ;;
++*)
++  enable_static=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_static=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac],
++enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
++])
++
++# AC_DISABLE_STATIC - set the default static flag to --disable-static
++AC_DEFUN([AC_DISABLE_STATIC],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_STATIC(no)])
++
++
++# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
++# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
++#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
++#   `yes'.
++AC_DEFUN([AC_ENABLE_FAST_INSTALL],
++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE(fast-install,
++changequote(<<, >>)dnl
++<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
++changequote([, ])dnl
++[p=${PACKAGE-default}
++case $enableval in
++yes) enable_fast_install=yes ;;
++no) enable_fast_install=no ;;
++*)
++  enable_fast_install=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_fast_install=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac],
++enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
++])
++
++# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
++AC_DEFUN([AC_DISABLE_FAST_INSTALL],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_FAST_INSTALL(no)])
++
++# AC_LIBTOOL_PICMODE - implement the --with-pic flag
++# Usage: AC_LIBTOOL_PICMODE[(MODE)]
++#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
++#   `both'.
++AC_DEFUN([AC_LIBTOOL_PICMODE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++pic_mode=ifelse($#,1,$1,default)])
++
++
++# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
++AC_DEFUN([AC_PATH_TOOL_PREFIX],
++[AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++  /*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++  ?:/*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
++  ;;
++  *)
++  ac_save_MAGIC_CMD="$MAGIC_CMD"
++  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word.  This closes a longstanding sh security hole.
++  ac_dummy="ifelse([$2], , $PATH, [$2])"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$1; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    egrep "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  MAGIC_CMD="$ac_save_MAGIC_CMD"
++  ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  AC_MSG_RESULT($MAGIC_CMD)
++else
++  AC_MSG_RESULT(no)
++fi
++])
++
++
++# AC_PATH_MAGIC - find a file program which can recognise a shared library
++AC_DEFUN([AC_PATH_MAGIC],
++[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
++AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
++  else
++    MAGIC_CMD=:
++  fi
++fi
++])
++
++
++# AC_PROG_LD - find the path to the GNU or non-GNU linker
++AC_DEFUN([AC_PROG_LD],
++[AC_ARG_WITH(gnu-ld,
++[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
++test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  AC_MSG_CHECKING([for ld used by GCC])
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
++      re_direlt='/[[^/]][[^/]]*/\.\./'
++      # Canonicalize the path of ld
++      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  AC_MSG_CHECKING([for GNU ld])
++else
++  AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(lt_cv_path_LD,
++[if test -z "$LD"; then
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
++	test "$with_gnu_ld" != no && break
++      else
++	test "$with_gnu_ld" != yes && break
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  AC_MSG_RESULT($LD)
++else
++  AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++AC_PROG_LD_GNU
++])
++
++# AC_PROG_LD_GNU -
++AC_DEFUN([AC_PROG_LD_GNU],
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++  lt_cv_prog_gnu_ld=yes
++else
++  lt_cv_prog_gnu_ld=no
++fi])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])
++
++# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
++#   -- PORTME Some linkers may need a different reload flag.
++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
++[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
++[lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++test -n "$reload_flag" && reload_flag=" $reload_flag"
++])
++
++# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
++#  -- PORTME fill in with the dynamic library characteristics
++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
++[AC_CACHE_CHECK([how to recognise dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given egrep regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi4*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin* | mingw* | pw32*)
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  case "$host_os" in
++  rhapsody* | darwin1.[[012]])
++    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
++    ;;
++  *) # Darwin 1.3 on
++    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
++    ;;
++  esac
++  ;;
++
++freebsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20*|hpux11*)
++  lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libc.sl
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++  irix5* | nonstopux*)
++    # this will be overridden with pass_all, but let us keep it just in case
++    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
++    ;;
++  *)
++    case $LD in
++    *-32|*"-32 ") libmagic=32-bit;;
++    *-n32|*"-n32 ") libmagic=N32;;
++    *-64|*"-64 ") libmagic=64-bit;;
++    *) libmagic=never-match;;
++    esac
++    # this will be overridden with pass_all, but let us keep it just in case
++    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
++    ;;
++  esac
++  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# This must be Linux ELF.
++linux-gnu*)
++  case $host_cpu in
++  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
++    lt_cv_deplibs_check_method=pass_all ;;
++  *)
++    # glibc up to 2.1.1 does not perform some relocations on ARM
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
++  esac
++  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++  ;;
++
++netbsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
++  fi
++  ;;
++
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++openbsd*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++  else
++    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++  fi
++  ;;
++
++osf3* | osf4* | osf5*)
++  # this will be overridden with pass_all, but let us keep it just in case
++  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sco3.2v5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=/lib/libc.so
++  ;;
++
++sysv5uw[[78]]* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++esac
++])
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++])
++
++
++# AC_PROG_NM - find the path to a BSD-compatible name lister
++AC_DEFUN([AC_PROG_NM],
++[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
++AC_MSG_CHECKING([for BSD-compatible nm])
++AC_CACHE_VAL(lt_cv_path_NM,
++[if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++    test -z "$ac_dir" && ac_dir=.
++    tmp_nm=$ac_dir/${ac_tool_prefix}nm
++    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
++      # Check to see if the nm accepts a BSD-compat flag.
++      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++      #   nm: unknown option "B" ignored
++      # Tru64's nm complains that /dev/null is an invalid object file
++      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
++	lt_cv_path_NM="$tmp_nm -B"
++	break
++      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	lt_cv_path_NM="$tmp_nm -p"
++	break
++      else
++	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	continue # so that we can try to find one that supports BSD flags
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi])
++NM="$lt_cv_path_NM"
++AC_MSG_RESULT([$NM])
++])
++
++# AC_CHECK_LIBM - check for math library
++AC_DEFUN([AC_CHECK_LIBM],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32*)
++  # These system don't have libm
++  ;;
++*-ncr-sysv4.3*)
++  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
++  ;;
++*)
++  AC_CHECK_LIB(m, main, LIBM="-lm")
++  ;;
++esac
++])
++
++# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
++# the libltdl convenience library and LTDLINCL to the include flags for
++# the libltdl header and adds --enable-ltdl-convenience to the
++# configure arguments.  Note that LIBLTDL and LTDLINCL are not
++# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
++# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
++# with '${top_builddir}/' and LTDLINCL will be prefixed with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and
++# top_srcdir appropriately in the Makefiles.
++AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  case $enable_ltdl_convenience in
++  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
++  "") enable_ltdl_convenience=yes
++      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++  esac
++  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
++  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])
++
++# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
++# the libltdl installable library and LTDLINCL to the include flags for
++# the libltdl header and adds --enable-ltdl-install to the configure
++# arguments.  Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
++# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
++# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
++# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
++# with '${top_srcdir}/' (note the single quotes!).  If your package is
++# not flat and you're not using automake, define top_builddir and
++# top_srcdir appropriately in the Makefiles.
++# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
++AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  AC_CHECK_LIB(ltdl, main,
++  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
++  [if test x"$enable_ltdl_install" = xno; then
++     AC_MSG_WARN([libltdl not installed, but installation disabled])
++   else
++     enable_ltdl_install=yes
++   fi
++  ])
++  if test x"$enable_ltdl_install" = x"yes"; then
++    ac_configure_args="$ac_configure_args --enable-ltdl-install"
++    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
++    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  else
++    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
++    LIBLTDL="-lltdl"
++    LTDLINCL=
++  fi
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])
++
++# old names
++AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
++AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
++AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
++AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
++
++# This is just to silence aclocal about the macro not being used
++ifelse([AC_DISABLE_FAST_INSTALL])
++
++# NOTE: This macro has been submitted for inclusion into   #
++#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
++#  a released version of Autoconf we should remove this    #
++#  macro and use it instead.                               #
++# LT_AC_PROG_SED
++# --------------
++# Check for a fully-functional sed program, that truncates
++# as few characters as possible.  Prefer GNU sed if found.
++AC_DEFUN([LT_AC_PROG_SED],
++[AC_MSG_CHECKING([for a sed that does not truncate output])
++AC_CACHE_VAL(lt_cv_path_SED,
++[# Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_executable_p="test -f"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
++      fi
++    done
++  done
++done
++
++  # Create a temporary directory, and hook for its removal unless debugging.
++$debug ||
++{
++  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  trap '{ (exit 1); exit 1; }' 1 2 13 15
++}
++
++# Create a (secure) tmp directory for tmp files.
++: ${TMPDIR=/tmp}
++{
++  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
++  test -n "$tmp" && test -d "$tmp"
++}  ||
++{
++  tmp=$TMPDIR/sed$$-$RANDOM
++  (umask 077 && mkdir $tmp)
++} ||
++{
++   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
++   { (exit 1); exit 1; }
++}
++  _max=0
++  _count=0
++  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
++  # along with /bin/sed that truncates output.
++  for _sed in $_sed_list /usr/xpg4/bin/sed; do
++    test ! -f ${_sed} && break
++    cat /dev/null > "$tmp/sed.in"
++    _count=0
++    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
++    # Check for GNU sed and select it if it is found.
++    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
++      lt_cv_path_SED=${_sed}
++      break
++    fi
++    while true; do
++      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
++      mv "$tmp/sed.tmp" "$tmp/sed.in"
++      cp "$tmp/sed.in" "$tmp/sed.nl"
++      echo >>"$tmp/sed.nl"
++      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
++      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
++      # 40000 chars as input seems more than enough
++      test $_count -gt 10 && break
++      _count=`expr $_count + 1`
++      if test $_count -gt $_max; then
++        _max=$_count
++        lt_cv_path_SED=$_sed
++      fi
++    done
++  done
++  rm -rf "$tmp"
++])
++if test "X$SED" != "X"; then
++  lt_cv_path_SED=$SED
++else
++  SED=$lt_cv_path_SED
++fi
++AC_MSG_RESULT([$SED])
++])
++
+--- metamail-2.7.orig/bootstrap
++++ metamail-2.7/bootstrap
+@@ -0,0 +1,9 @@
++#! /bin/sh
++
++set -x
++
++aclocal -I config
++libtoolize --force --copy
++autoheader
++automake --foreign --add-missing --copy
++autoconf
+--- metamail-2.7.orig/man/richtext.1
++++ metamail-2.7/man/richtext.1
+@@ -6,6 +6,8 @@
+ \fBrichtext\fP [
+ .B \-c
+ ] [
++.B \-e
++] [
+ .B \-f
+ ] [
+ .B \-m
+@@ -53,6 +55,12 @@
+ to just correct the raw richtext and write the corrected version to its
+ standard output, without performing any formatting.
+ .TP 8
++.B \-e
++This option directs
++.I richtext
++to interpret the input as MIME type text/enriched rather than text/richtext.
++The text/enriched format is defined in RFC 1896.
++.TP 8
+ .B \-f
+ This option directs
+ .I richtext
+--- metamail-2.7.orig/man/mailto.1
++++ metamail-2.7/man/mailto.1
+@@ -1,6 +1,6 @@
+ .TH MAILTO 1 "Release 1" "Bellcore Prototype"
+ .SH NAME
+-mailto - Simple mutlimedia mail sending program
++mailto - Simple multimedia mail sending program
+ .SH SYNOPSIS
+ .ta 8n
+ \fBmailto\fP	[-a] [-c] [-s] [recipient name(s)]
+@@ -74,9 +74,9 @@
+ 
+ Basically, mailto can include the following things in mail:
+ 
+-1.  Simple formatted text, using the MIME type "text/richtext".  This allows you to add emphasis to your message using underlining, bold text, italic (diaplsyed as reverse video), centering, and the like.
++1.  Simple formatted text, using the MIME type "text/richtext".  This allows you to add emphasis to your message using underlining, bold text, italic (displayed as reverse video), centering, and the like.
+ 
+-2.  Non-text data.  Metamail can include pictures, sounds, and other non-textual data in the middle of any mail message.  The mailcap configuration mechanism can even make this process reasonably user-friendly, but a knowledgable user can include non-textual data even in the absence of a proper mailcap entry.
++2.  Non-text data.  Metamail can include pictures, sounds, and other non-textual data in the middle of any mail message.  The mailcap configuration mechanism can even make this process reasonably user-friendly, but a knowledgeable user can include non-textual data even in the absence of a proper mailcap entry.
+ 
+ 3.  Text including non-ASCII characters, such as Hebrew or Russian.  Currently, mailto directly supports only the ISO-8859-* family of character sets, which means that it does not meet the needs of Asian users, in particular.  However, languages that can not be expressed in the ISO-8859 family can still be included in the same way non-text data can be included.
+ 
+@@ -230,7 +230,7 @@
+    dot -- controls whether or not a period alone on a line 
+         should be interpreted as terminating your mail
+    ignore -- controls whether or not interrupts are ignored
+-   verbose -- controls the verbosity of output from /usr/lib/sendmail
++   verbose -- controls the verbosity of output from /usr/sbin/sendmail
+    quiet -- controls the verbosity of output from the mailto program.
+    keepblind -- controls whether or not a 'blind' copy of the mail is kept.
+   commasonly -- controls whether or not a space character
+@@ -275,7 +275,7 @@
+ 
+ .I 
+ Altered editing behavior:
+-The ~e and ~v commands, which are used to edit the message being composed, will behave differently in mailto if the mail includes non-text portions.  In such cases, each part will be edited separately, in sequence, which makes it impossble for the user to accidentally mess up the inter-part boundaries.  Moreover, if the mailcap entry for a given data type includes an "edit" field, the user will be given the choice of editing with the program named there or editing with his usual (text) editor.  In most cases, this will be a choice between using a structured editor or editing the raw data stream.
++The ~e and ~v commands, which are used to edit the message being composed, will behave differently in mailto if the mail includes non-text portions.  In such cases, each part will be edited separately, in sequence, which makes it impossible for the user to accidentally mess up the inter-part boundaries.  Moreover, if the mailcap entry for a given data type includes an "edit" field, the user will be given the choice of editing with the program named there or editing with his usual (text) editor.  In most cases, this will be a choice between using a structured editor or editing the raw data stream.
+ 
+ .I 
+ Altered behavior for large messages:
+@@ -283,7 +283,7 @@
+ 
+ .I
+ New -r command-line option 
+-The -r comand-line option is not found in standard Berkeley mail.
++The -r command line option is not found in standard Berkeley mail.
+ 
+ .SH SUMMARY OF OPTIONS
+ -a <charset> -- specifies an alternate character set in use.  This had better be the one your terminal is actually using.  Currently it must be in the iso-8859 character set family.
+--- metamail-2.7.orig/man/metamail.1
++++ metamail-2.7/man/metamail.1
+@@ -38,6 +38,9 @@
+ .B \-e 
+ This option tells metamail to "eat" leading newlines in message bodies.  This is particularly useful for MH-format mail.
+ .TP 8
++.B \-E <contentencoding>
++This option tells metamail to use the specified content transfer encoding rather than the one in the headers, if any.  
++.TP 8
+ .B \-f <address>
+ This option specifies the name of the sender of the message.  Otherwise, this is determined from the header, if possible.  This information will be placed in the environment to make it available to any interpreters called by metamail.
+ .TP 8
+@@ -63,7 +66,7 @@
+ This option specifies that it is OK to run as root.  By default, metamail refuses to run if the real or effective user id is root.  You can get the same effect using the MM_RUNASROOT environment variable.
+ .TP 8
+ .B \-R
+-This option specifies that the /usr/ucb/reset should be executed to reset the terminal state, before any other I/O activity.
++This option specifies that the /usr/bin/reset should be executed to reset the terminal state, before any other I/O activity.
+ .TP 8
+ .B \-s <subject>  
+ This option specifies the subject of the mail message.  By default, this information is obtained from the headers.  This information will be placed in the environment to make it available to any interpreters called by metamail.
+@@ -105,11 +108,13 @@
+ 
+ The default search path is equivalent to
+ 
+-$HOME/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
++.na
++$HOME/.mailcap:\:/usr/local/etc/mailcap:\:/usr/etc/mailcap:\:/etc/mailcap:\:/etc/mail/mailcap:\:/usr/public/lib/mailcap
++.ad
+ 
+ It can be overridden by setting the MAILCAPS environment variable.  Note: Metamail does not actually interpret environment variables such as $HOME or the "~" syntax in this path search.
+ 
+-The format of mailcap files is explained in the manual entry for mailcap(4).
++The format of mailcap files is explained in the manual entry for mailcap(5).
+ 
+ .SH NON-ASCII HEADER FIELDS
+ Metamail has rudimentary built-in support for the emerging Internet standards for non-ASCII data in mail headers.  What this means is that such data will be recognized, decoded, and sent to the terminal.  This behavior may be more or less reasonable, depending on the character set in the header data and the capability of the user's terminal, but it will rarely be any worse than showing such data in its encoded form.
+@@ -199,7 +204,7 @@
+ .SH FILES
+ $HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files.
+ .SH SEE ALSO
+-audiocompose(1), audiosend(1), ezview(1), getfilename(1), mailto-hebrew(1), mailto(1), metasend(1), mmencode(1), richtext(1), showaudio(1), showexternal(1), shownonascii(1), showpartial(1), showpicture(1), mailcap(4)
++audiocompose(1), audiosend(1), ezview(1), getfilename(1), mailto-hebrew(1), mailto(1), metasend(1), mimencode(1), richtext(1), showaudio(1), showexternal(1), shownonascii(1), showpartial(1), showpicture(1), mailcap(5)
+ .SH BUGS
+ In a multipart/alternative body or body parts, some headers in the embedded part that should be displayed may not be displayed.  This will rarely be a problem.  Also, in a multipart/alternative, anything of type "multipart" or "message" is considered to be a recognized part, regardless of the recognizability of its contents.  This might be a problem, only further experience will tell.
+ 
+--- metamail-2.7.orig/man/uuenpipe.1
++++ metamail-2.7/man/uuenpipe.1
+@@ -0,0 +1,44 @@
++.TH UUENPIPE 1 "1998 March 2nd" "METAMAIL" "Debian Linux Manual"
++.SH NAME
++uuenpipe \- uuencode a file
++.SH SYNOPSIS
++.B uuenpipe
++.RI [ filename ]
++.SH "DESCRIPTION"
++This manual page documents briefly the
++.B uuenpipe
++command.
++This manual page was written for the
++.B Debian GNU/Linux
++distribution (but may be used by others), because the original
++program does not have a manual page.
++.PP
++.B uuenpipe
++uuencodes
++.I filename
++(or the standard input if
++.I filename
++were not supplied) and prints the result to the standard output.
++When
++.I filename
++is supplied,
++.B uuenpipe
++acts as if the following command were invoked.
++.IP
++.NF
++uuencode
++.I filename
++.I filename
++.FI
++.LP
++Otherwise, it would act according to the behaviour of the next
++command.
++.IP
++.NF
++uuencode
++.I UUPIPEOUT
++.FI
++.LP
++.SH AUTHOR
++.B uuenpipe
++is part of mm package.  Manual page added by Herbert Xu.
+--- metamail-2.7.orig/man/splitmail.1
++++ metamail-2.7/man/splitmail.1
+@@ -8,23 +8,24 @@
+ .SH DESCRIPTION
+ The
+ .I splitmail
+-program will take an email message and break it up into smaller pieces using the "message/partial" type defined by MIME, the proposed Internet standard for multimedia mail formats.  
++program will take an email message and break it up into smaller pieces using the "message/partial" type defined by MIME(1), the proposed Internet standard for multimedia mail formats.  
+ 
+ By default it will take the message either from standard input or the named file, and will produce a set of partial message files with names like "/tmp/split.1" for the first part, and so on.  The prefix "/tmp/split." can be overridden using the "-p" option.  
+ 
+-If the -d option is specified, the mail will actually be delivered.  If -v is specified, the verbose flag will be passed to sendmail.
++If the -d option is specified, the mail will actually be delivered.  If -v is specified, the verbose flag will be passed to \fBsendmail\fR(8).
+ 
+-The -i option can be used to make splitmail generate the pieces with similar (but not identical) message-id fields, in a format which allows them to be easily correlated with one another and which end with the suffix provided on the command line after -i.
++The -i option can be used to make \fBsplitmail\fR generate the pieces with similar (but not identical) message-id fields, in a format which allows them to be easily correlated with one another and which end with the suffix provided on the command line after -i.
+ 
+-The default chunk size for spliting messages is 250000 at most sites, though this is also a compile-time option.  This can be overriden with the -s switch, or with the environment variable SPLITSIZE.
++The default chunk size for splitting messages is 250000 at most sites, though this is also a compile-time option.  This can be overridden with the -s switch, or with the environment variable SPLITSIZE.
+ 
+ Messages smaller than the chunk size will not be turned into partial messages, but will be written to a single file or delivered as a single message.
+ .SH ENVIRONMENT
+ SPLITSIZE overrides the default chunk size.  Setting SPLITSIZE to, say, 4000000 will effectively ensure that your messages are unlikely ever to be split, but it may cause them to be rejected by some mail transport software.
+ .SH SEE ALSO
+-mailto(1), metamail(1)
++.PP
++\fBmailto\fR(1), \fBmetamail\fR(1), \fBMIME\fR(1), \fBmunpack\fR(1)
+ .SH BUGS
+-If the size of the input is just on the fencepost, and if it is coming from a file rather than standard input, splitmail will sometimes estimate the number of parts wrong and will have to write out an extra part.  This is harmless but annoying.  It is especially annoying if the estimate was 2 but the real number was 1.
++If the size of the input is just on the fencepost, and if it is coming from a file rather than standard input, \fBsplitmail\fR will sometimes estimate the number of parts wrong and will have to write out an extra part.  This is harmless but annoying.  It is especially annoying if the estimate was 2 but the real number was 1.
+ .SH COPYRIGHT
+ Copyright (c) 1992 Bell Communications Research, Inc. (Bellcore)
+ 
+--- metamail-2.7.orig/man/patch-metamail.1
++++ metamail-2.7/man/patch-metamail.1
+@@ -8,7 +8,7 @@
+ .SH DESCRIPTION
+ The
+ .I patch-metamail
+-program will attempt to retreive a patch file for the metamail distribution, using anonymous ftp to a trusted server, and then install that patch in your local copy of the distribution.
++program will attempt to retrieve a patch file for the metamail distribution, using anonymous ftp to a trusted server, and then install that patch in your local copy of the distribution.
+ 
+ The first two arguments, which are required, are the root directory of your local copy of the metamail source directory, and the patch number.  The former is site-dependent, the latter is patch-dependent.
+ 
+--- metamail-2.7.orig/man/uudepipe.1
++++ metamail-2.7/man/uudepipe.1
+@@ -0,0 +1,24 @@
++.TH UUDEPIPE 1 "1998 March 2nd" "METAMAIL" "Debian Linux Manual"
++.SH NAME
++uudepipe \- uudecode a file
++.SH SYNOPSIS
++.B uudepipe
++.RI [ filename ]
++.SH "DESCRIPTION"
++This manual page documents briefly the
++.B uudepipe
++command.
++This manual page was written for the
++.B Debian GNU/Linux
++distribution (but may be used by others), because the original
++program does not have a manual page.
++.PP
++.B uudepipe
++uudecodes
++.I filename
++(or the standard input if
++.I filename
++were not supplied) and prints the result to the standard output.
++.SH AUTHOR
++.B uudepipe
++is part of mm package.  Manual page added by Herbert Xu.
+--- metamail-2.7.orig/man/mmencode.1
++++ metamail-2.7/man/mmencode.1
+@@ -1,8 +1,6 @@
+ .TH MIMENCODE 1 "Release 1" "Bellcore Prototype"
+ .SH NAME
+ mimencode - Translate to and from mail-oriented encoding formats
+-
+-(Same program also installed as "mmencode".)
+ .SH SYNOPSIS
+ .ta 8n
+ \fBmimencode\fP	[-u] [-b] [-q] [-p] [file name] [-o outputfile]
+@@ -37,8 +35,6 @@
+ for mail and news use.  The reason is simple:  uuencode doesn't work very well in a number of circumstances and ways.  In particular, uuencode uses characters that don't translate well across all mail gateways (particularly ASCII <-> EBCDIC gateways).  Also, uuencode is not standard -- there are several variants floating around, encoding and decoding things in different and incompatible ways, with no "standard" on which to base an implementation.  Finally, uuencode does not generally work well in a pipe, although some variants have been modified to do so.  Mimencode implements the encodings which were defined for MIME as uuencode replacements, and should be considerably more robust for email use.
+ .SH SEE ALSO
+ metamail(1), mailto(1)
+-.SH BUGS
+-This program was originally distributed as "mmencode".  That name turns out to conflict with a program of the same name that is part of the Slate software from BBN, but totally changing the name to mimencode would create other problems (notably with portability to systems where the left half of file names is limited to 8 characters).  Currently, it is being distributed with links under BOTH names.  The programs in the distribution that call the program all call it as "mimencode", so the "mmencode" version may be deleted at sites where it causes a problem.  (The source files are still named "mmencode" rather than "mimencode".)
+ .SH COPYRIGHT
+ Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ 
+--- metamail-2.7.orig/man/mailcap.5
++++ metamail-2.7/man/mailcap.5
+@@ -0,0 +1,69 @@
++.TH MAILCAP 5 "Release 2" "Bellcore Prototype"
++.SH NAME
++mailcap - metamail capabilities file
++.SH DESCRIPTION
++The
++.I mailcap
++file is read by the 
++.I metamail
++program to determine how to display non-text at the local site.
++
++The syntax of a mailcap file is quite simple, at least compared to termcap files.  Any line that starts with "#" is a comment.  Blank lines are ignored.  Otherwise, each line defines a single mailcap entry for a single content type.  Long lines may be continued by ending them with a backslash character, \\.
++
++Each individual mailcap entry consists of a content-type specification, a command to execute, and (possibly) a set of optional "flag" values.  For example, a very simple mailcap entry (which is actually a built-in default behavior for metamail) would look like this:
++
++text/plain; cat %s
++
++The optional flags can be used to specify additional information about the mail-handling command.  For example:
++
++text/plain; cat %s; copiousoutput
++
++can be used to indicate that the output of the 'cat' command may be voluminous, requiring either a scrolling window, a pager, or some other appropriate coping mechanism.
++
++The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content-type" header (or the value passed in with -c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO-8859-1") or a wildcard to match all subtypes (e.g. "image/*").
++
++The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t', those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\%", those two characters will be replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
++
++If no "%s" appears in the command field, then instead of placing the message body in a temporary file, metamail will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
++
++Two special codes can appear in the viewing command for objects of type multipart (any subtype).  These are "%n" and "%F".  %n will be replaced by the number of parts within the multipart object.  %F will be replaced by a series of arguments, two for each part, giving first the content-type and then the name of the temporary file where the decoded part has been stored.  In addition, for each file created by %F, a second file is created, with the same name followed by "H", which contains the header information for that body part.  This will not be needed by most multipart handlers, but it is there if you ever need it.  
++
++The "notes=xxx" field is an uninterpreted string that is used to specify the name of the person who installed this entry in the mailcap file.  (The "xxx" may be replaced by any text string.)
++
++The "test=xxx" field is a command that is executed to determine whether or not the mailcap line actually applies.  That is, if the content-type field matches the content-type on the message, but a "test=" field is present, then the test must succeed before the mailcap line is considered to "match" the message being viewed.  The command may be any UNIX command, using the same syntax and the same %-escapes as for the viewing command, as described above.  A command is considered to succeed if it exits with a zero exit status, and to fail otherwise.
++
++The "print=xxx" field is a command that is executed to print the data instead of display it interactively.  This behavior is usually a consequence of invoking metamail with the "-h" switch.
++
++The "textualnewlines" field can be used in the rather obscure case where metamail's default rules for treating newlines in base64-encoded data are unsatisfactory.  By default, metamail will translate CRLF to the local newline character in decoded base64 output if the content-type is "text" (any subtype), but will not do so otherwise.  A mailcap entry with a field of "textualnewlines=1" will force such translation for the specified content-type, while "textualnewlines=0" will guarantee that the translation does not take place even for textual content-types.
++
++The "compose" field may be used to specify a program that can be used to compose a new body or body part in the given format.  Its intended use is to support mail composing agents that support the composition of multiple types of mail using external composing agents. As with the view-command, the compose command will be executed after replacing certain escape sequences starting with "%".  In particular, %s should be replaced by the name of a file to which the composed data is to be written by the specified composing program, thus allowing th3e calling program (e.g. metamail) to tell the called program where to store the composed data.  If %s does not appear, then the composed data will be assumed to be written by the composing programs to standard output.   The result of the composing program may be data that is NOT yet suitable for mail transport -- that is, a Content-Transfer-Encoding may still need to be applied to the data.
++
++The "composetyped" field is similar to the "compose" field, but is to be used when the composing program needs to specify the Content-type header field to be applied to the composed data.  The "compose" field is simpler, and is preferred for use with existing (non-mail-oriented) programs for composing data in a given format.  The "composetyped" field is necessary when the Content-type information must include auxilliary parameters, and the composition program must then know enough about mail formats to produce output that includes the mail type information, and to apply any necessary Content-Transfer-Encoding.   Conceptually, "compose" specifies a program that simply outputs the specified type of data in its raw form, while "composetyped" specifies a program that outputs the data as a MIME object, with all necessary Content-* headers already in place.
++
++.TP 8
++.B needsterminal
++If this flag is given, the named interpreter needs to interact with the user on a terminal.  In some environments (e.g. a window-oriented mail reader under X11) this will require the creation of a new terminal emulation window, while in most environments it will not.  If the mailcap entry specifies "needsterminal" and metamail is not running on a terminal (as determined by isatty(3), the -x option, and the MM_NOTTTY environment variable) then metamail will try to run the command in a new terminal emulation window.  Currently, metamail knows how to create new windows under the X11, SunTools, and WM window systems.
++.TP 8
++.B copiousoutput
++This flag should be given whenever the interpreter is capable of producing more than a few lines of output on stdout, and does no interaction with the user.  If the mailcap entry specifies copiousoutput, and pagination has been requested via the "-p" command, then the output of the command being executed will be piped through a pagination program ("more" by default, but this can be overridden with the METAMAIL_PAGER environment variable).
++.SH BUILT-IN CONTENT-TYPE SUPPORT
++The metamail program has built-in support for a few key content-types.  In particular, it supports the text type, the multipart and multipart/alternative type, and the message/rfc822 types.  This support is incomplete for many subtypes -- for example, it only supports US-ASCII text in general.  This kind of built-in support can be OVERRIDDEN by an entry in any mailcap file on the user's search path.  Metamail also has rudimentary built-in support for types that are totally unrecognized -- i.e. for which no mailcap entry or built-in handler exists.  For such unrecognized types, metamail will write a file with a "clean" copy of the data -- i.e. a copy in which all mail headers have been removed, and in which any 7-bit transport encoding has been decoded.
++.SH FILES
++$HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files.
++.SH SEE ALSO
++metamail(1)
++.SH COPYRIGHT
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++.SH AUTHOR
++Nathaniel S. Borenstein
+--- metamail-2.7.orig/man/mailcap.4
++++ metamail-2.7/man/mailcap.4
+@@ -20,13 +20,9 @@
+ 
+ can be used to indicate that the output of the 'cat' command may be voluminous, requiring either a scrolling window, a pager, or some other appropriate coping mechanism.
+ 
+-The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by RFC 822.  In practice, this is almost any string.  It is the string that will be matched against the "Content-type" header (or the value passed in with -c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO-8859-1") or a wildcard to match all subtypes (e.g. "image/*").
++The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content-type" header (or the value passed in with -c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO-8859-1") or a wildcard to match all subtypes (e.g. "image/*").
+ 
+-The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t', those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\%", those two characters will be replaced by a single % ch
+-
+-
+-
+-aracter.  (In fact, the backslash can be used to quote any character, including itself.)
++The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t', those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\%", those two characters will be replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
+ 
+ If no "%s" appears in the command field, then instead of placing the message body in a temporary file, metamail will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
+ 
+--- metamail-2.7.orig/man/metasend.1
++++ metamail-2.7/man/metasend.1
+@@ -12,7 +12,7 @@
+ 
+ With no arguments, the program will ask the user for the To, Subject, and CC fields.  It will then ask for the name of a MIME content-type.  Next, it will ask the user for the name of an existing file containing that type of data.  After this, it will ask what encoding type, if any, should be applied to this data.  Finally, it  will ask if the user wants to  include information  from an additional file, in which case the last three questions will be repeated for  the next file.
+ 
+-Alternately, all of this information can be provided on the comand line, using the following options:
++Alternately, all of this information can be provided on the command line, using the following options:
+ 
+     -b -- specifies Batch (non-interactive) Mode.  Will exit with an error message if all additional needed information is not provided on the command line.
+     -c cc -- specifies the CC address
+--- metamail-2.7.orig/metamail/xstrerror.c
++++ metamail-2.7/metamail/xstrerror.c
+@@ -0,0 +1,32 @@
++/* xstrerror.c -- strerror wrapper with bound checking
++   Fri Jun 16 18:30:00 1995  Pat Rankin  <rankin@eql.caltech.edu>
++   This code is in the public domain.
++*/
++
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
++#include "common.h"
++
++extern char *strerror ();
++
++/* If strerror returns NULL, we'll format the number into a static buffer.  */
++#define ERRSTR_FMT "undocumented error #%d"
++static char xstrerror_buf[sizeof ERRSTR_FMT + 20];
++
++/* Like strerror, but result is never a null pointer.  */
++char *
++xstrerror (int errnum)
++{
++  char *errstr = strerror (errnum);
++
++  /* If `errnum' is out of range, result might be NULL.  We'll fix that.  */
++  if (!errstr)
++    {
++      sprintf (xstrerror_buf, ERRSTR_FMT, errnum);
++      errstr = xstrerror_buf;
++    }
++
++  return errstr;
++}
+--- metamail-2.7.orig/metamail/xstrdup.c
++++ metamail-2.7/metamail/xstrdup.c
+@@ -0,0 +1,35 @@
++/* xstrdup.c -- strdup implementation with out of memory reporting
++   Copyright (C) 2000 Gary V. Vaughan
++  
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++  
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++  
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++
++#ifndef WITH_DMALLOC
++
++#if HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include "common.h"
++
++char *
++xstrdup (string)
++     const char *string;
++{
++  return string ? strcpy (xmalloc (strlen (string) + 1), string) : NULL;
++}
++
++#endif /* !WITH_DMALLOC */
++
+--- metamail-2.7.orig/metamail/config.h.in
++++ metamail-2.7/metamail/config.h.in
+@@ -0,0 +1,119 @@
++/* metamail/config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
++
++/* Define to empty if the keyword does not work.  */
++#undef const
++
++/* Define to `unsigned' if <sys/types.h> doesn't define.  */
++#undef size_t
++
++/* Define if you have the ANSI C header files.  */
++#undef STDC_HEADERS
++
++/* Define if you can safely include both <sys/time.h> and <time.h>.  */
++#undef TIME_WITH_SYS_TIME
++
++/* Define if you have the basename function.  */
++#undef HAVE_BASENAME
++
++/* Define if you have the bcmp function.  */
++#undef HAVE_BCMP
++
++/* Define if you have the bcopy function.  */
++#undef HAVE_BCOPY
++
++/* Define if you have the bzero function.  */
++#undef HAVE_BZERO
++
++/* Define if you have the calloc function.  */
++#undef HAVE_CALLOC
++
++/* Define if you have the index function.  */
++#undef HAVE_INDEX
++
++/* Define if you have the initstate function.  */
++#undef HAVE_INITSTATE
++
++/* Define if you have the kill function.  */
++#undef HAVE_KILL
++
++/* Define if you have the killpg function.  */
++#undef HAVE_KILLPG
++
++/* Define if you have the memcmp function.  */
++#undef HAVE_MEMCMP
++
++/* Define if you have the memcpy function.  */
++#undef HAVE_MEMCPY
++
++/* Define if you have the memset function.  */
++#undef HAVE_MEMSET
++
++/* Define if you have the putenv function.  */
++#undef HAVE_PUTENV
++
++/* Define if you have the rand function.  */
++#undef HAVE_RAND
++
++/* Define if you have the random function.  */
++#undef HAVE_RANDOM
++
++/* Define if you have the rindex function.  */
++#undef HAVE_RINDEX
++
++/* Define if you have the srand function.  */
++#undef HAVE_SRAND
++
++/* Define if you have the strchr function.  */
++#undef HAVE_STRCHR
++
++/* Define if you have the strerror function.  */
++#undef HAVE_STRERROR
++
++/* Define if you have the strrchr function.  */
++#undef HAVE_STRRCHR
++
++/* Define if you have the vfprintf function.  */
++#undef HAVE_VFPRINTF
++
++/* Define if you have the <assert.h> header file.  */
++#undef HAVE_ASSERT_H
++
++/* Define if you have the <dlfcn.h> header file.  */
++#undef HAVE_DLFCN_H
++
++/* Define if you have the <errno.h> header file.  */
++#undef HAVE_ERRNO_H
++
++/* Define if you have the <signal.h> header file.  */
++#undef HAVE_SIGNAL_H
++
++/* Define if you have the <stdarg.h> header file.  */
++#undef HAVE_STDARG_H
++
++/* Define if you have the <stdlib.h> header file.  */
++#undef HAVE_STDLIB_H
++
++/* Define if you have the <string.h> header file.  */
++#undef HAVE_STRING_H
++
++/* Define if you have the <strings.h> header file.  */
++#undef HAVE_STRINGS_H
++
++/* Define if you have the <sys/time.h> header file.  */
++#undef HAVE_SYS_TIME_H
++
++/* Define if you have the <time.h> header file.  */
++#undef HAVE_TIME_H
++
++/* Define if you have the <unistd.h> header file.  */
++#undef HAVE_UNISTD_H
++
++/* Define if you have the <varargs.h> header file.  */
++#undef HAVE_VARARGS_H
++
++/* Name of package */
++#undef PACKAGE
++
++/* Version number of package */
++#undef VERSION
++
+--- metamail-2.7.orig/metamail/Makefile.am
++++ metamail-2.7/metamail/Makefile.am
+@@ -0,0 +1,27 @@
++MAINTAINERCLEANFILES	= Makefile.in
++
++INCLUDES 		= -I$(top_builddir) -I$(top_srcdir)
++
++pkginclude_HEADERS	= common.h error.h
++
++lib_LTLIBRARIES		= libmetamail.la
++
++libmetamail_la_SOURCES	= error.c dlist.c xmalloc.c xstrerror.c \
++			xstrdup.c 
++
++common.h: stamp-common
++	@:
++stamp-common: $(srcdir)/common-h.in $(top_builddir)/config.status
++	cd $(top_builddir) \
++	  && CONFIG_FILES= CONFIGHEADERS= CONFIG_OTHER=metamail/common.h \
++	  $(SHELL) ./config.status
++	echo timestamp > $@
++
++dist-hook:
++	rm -f $(distdir)/common.h
++
++
++
++
++
++
+--- metamail-2.7.orig/metamail/common.h
++++ metamail-2.7/metamail/common.h
+@@ -0,0 +1,203 @@
++/*  -*- Mode: C -*-
++ * --------------------------------------------------------------------
++ * DO NOT EDIT THIS FILE!  It has been automatically generated
++ * from:    configure.in and common.h.in
++ * on host: diziet
++ * --------------------------------------------------------------------
++ */
++
++#ifndef METAMAIL_COMMON_H
++#define METAMAIL_COMMON_H 1
++
++#include <stdio.h>
++#include <ctype.h>        // ??? ok here
++#include <sys/types.h>
++#include <sys/stat.h>     // ??? ok here
++
++// ??? following ok here without check?
++#include <pwd.h>
++#include <sys/time.h>
++#include <sys/types.h>
++#include <sys/file.h>
++#include <signal.h>
++
++#include <termio.h>
++#include <fcntl.h>
++#include <sys/utsname.h>
++
++#include <linux/limits.h>
++
++#include <stdlib.h>
++#include <unistd.h>
++#include <errno.h>
++
++#ifndef errno
++/* Some sytems #define this! */
++extern int errno;
++#endif
++
++#include <string.h>
++
++#include <stdarg.h>
++#ifndef VA_START
++#  define VA_START(a, f) va_start(a, f)
++#endif /* VA_START */
++
++
++#include <assert.h>
++#define METAMAIL_ASSERT assert
++
++
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++#  include <sys/time.h>
++# else
++#  include <time.h>
++# endif
++#endif
++
++#ifndef PARAMS
++#  if __STDC__
++#    ifndef NOPROTOS
++#      define PARAMS(args)        args
++#    endif
++#  endif
++#  ifndef PARAMS
++#    define PARAMS(args)          ()
++#  endif
++#endif
++
++#ifndef EXIT_SUCCESS
++#  define EXIT_SUCCESS  0
++#  define EXIT_FAILURE  1
++#endif
++      
++#ifdef __cplusplus
++#  define BEGIN_C_DECLS         extern "C" {
++#  define END_C_DECLS           }
++#else
++#  define BEGIN_C_DECLS
++#  define END_C_DECLS
++#endif
++
++#ifdef __GNUC__
++#  ifndef const
++#    define const       __const
++#  endif
++#  ifndef signed
++#    define signed      __signed
++#  endif
++#  ifndef volatile
++#    define volatile    __volatile
++#  endif
++#else
++#  ifdef __STDC__
++#    undef  signed
++#    define signed
++#    undef  volatile
++#    define volatile
++#  endif
++#endif
++
++#ifdef __STDC__
++#  define STR(x)          #x
++#  define CONC(x, y)      x##y
++   typedef void* sic_ptr;
++#else
++#  define STR(x)          "x"
++#  define CONC(x, y)      x/**/y
++   typedef char* sic_ptr;
++#endif
++
++
++#define XCALLOC(type, num)      ((type *) xcalloc ((num), sizeof(type)))
++#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
++#define XREALLOC(type, p, num)  ((type *) xrealloc ((p), (num) * sizeof(type)))
++#define XFREE(stale)                            do {        \
++              if (stale) { free ((sic_ptr) stale);  stale = 0; }    \
++                                                      } while (0)
++
++
++BEGIN_C_DECLS
++
++extern void *xcalloc    (size_t num, size_t size);
++extern void *xmalloc    (size_t num);
++extern void *xrealloc   (void *p, size_t num);
++extern char *xstrdup    (const char *string);
++extern char *xstrerror  (int errnum);
++
++END_C_DECLS
++
++#if WITH_DMALLOC
++#  include <dmalloc.h>
++#endif
++
++//metamail specific stuff below (this are the additions from Michael Moerz)
++
++#define RESET_PROGRAM "/usr/bin/reset"
++
++//#define NO_RLIMITS 1
++#define sigtype void
++
++/* This constant should define the ASCII code for newlines on systems where 
++   the newline convention is other than CRLF.  On UNIX, it is ^J, ASCII 10. 
++    Here we define it as '\n' which should be right on MOST systems... */
++#define NEWLINE_CHAR '\n'
++
++/* The following defines the default size at which long
++    messages will be split into multiple messages of type
++    "message/partial" by the mailto and splitmail commands,
++    at least. */
++#ifndef DEFAULT_SPLIT_SIZE
++#define DEFAULT_SPLIT_SIZE 250000
++#endif
++
++#define PATH_SEPARATOR ':'
++#ifndef STDPATH
++#define STDPATH "/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
++#endif
++
++/* The following can be set to a directory or colon-separated list of 
++  directories that will be prepended to the user's search path before 
++  executing any mailcap-derived commands. 
++
++  It should be set to NULL if there are no directories to prepend.  
++*/
++
++#define AUXPATH NULL
++
++
++#define TMPFILE_NAME_SIZE   1000
++#define MAX_FILE_NAME_SIZE 1000
++
++BEGIN_C_DECLS
++
++extern char **environ, *gets();
++
++extern char *getenv();
++extern char *index();
++extern char *rindex();
++
++extern FILE *popen();
++
++END_C_DECLS
++
++//#ifndef NO_RLIMITS
++//#include <sys/resource.h>
++//#endif
++
++
++
++#define LPRCOMMAND "lp"
++#define LPRTEMPLATE "lp %s"
++#define CATCOMMAND "cat"
++#define CATTEMPLATE "cat %s"
++#define TMPNAME_MAX NAME_MAX
++static struct termio MyTtyStateIn, MyTtyStateOut;
++
++
++
++#endif /* !METAMAIL_COMMON_H */
+--- metamail-2.7.orig/metamail/Makefile.in
++++ metamail-2.7/metamail/Makefile.in
+@@ -0,0 +1,426 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++MAINTAINERCLEANFILES = Makefile.in
++
++INCLUDES = -I$(top_builddir) -I$(top_srcdir)
++
++pkginclude_HEADERS = common.h error.h
++
++lib_LTLIBRARIES = libmetamail.la
++
++libmetamail_la_SOURCES = error.c dlist.c xmalloc.c xstrerror.c 			xstrdup.c 
++
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = config.h
++CONFIG_CLEAN_FILES = 
++LTLIBRARIES =  $(lib_LTLIBRARIES)
++
++
++DEFS = @DEFS@ -I. -I$(srcdir) -I.
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++libmetamail_la_LDFLAGS = 
++libmetamail_la_LIBADD = 
++libmetamail_la_OBJECTS =  error.lo dlist.lo xmalloc.lo xstrerror.lo \
++xstrdup.lo
++CFLAGS = @CFLAGS@
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++HEADERS =  $(pkginclude_HEADERS)
++
++DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in config.h.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++DEP_FILES =  .deps/dlist.P .deps/error.P .deps/xmalloc.P .deps/xstrdup.P \
++.deps/xstrerror.P
++SOURCES = $(libmetamail_la_SOURCES)
++OBJECTS = $(libmetamail_la_OBJECTS)
++
++all: all-redirect
++.SUFFIXES:
++.SUFFIXES: .S .c .lo .o .obj .s
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign metamail/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++config.h: stamp-h
++	@if test ! -f $@; then \
++		rm -f stamp-h; \
++		$(MAKE) stamp-h; \
++	else :; fi
++stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
++	cd $(top_builddir) \
++	  && CONFIG_FILES= CONFIG_HEADERS=metamail/config.h \
++	     $(SHELL) ./config.status
++	@echo timestamp > stamp-h 2> /dev/null
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
++	@if test ! -f $@; then \
++		rm -f $(srcdir)/stamp-h.in; \
++		$(MAKE) $(srcdir)/stamp-h.in; \
++	else :; fi
++$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOHEADER)
++	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
++
++mostlyclean-hdr:
++
++clean-hdr:
++
++distclean-hdr:
++	-rm -f config.h
++
++maintainer-clean-hdr:
++
++mostlyclean-libLTLIBRARIES:
++
++clean-libLTLIBRARIES:
++	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++
++distclean-libLTLIBRARIES:
++
++maintainer-clean-libLTLIBRARIES:
++
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
++	  else :; fi; \
++	done
++
++uninstall-libLTLIBRARIES:
++	@$(NORMAL_UNINSTALL)
++	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
++	done
++
++# FIXME: We should only use cygpath when building on Windows,
++# and only if it is available.
++.c.obj:
++	$(COMPILE) -c `cygpath -w $<`
++
++.s.o:
++	$(COMPILE) -c $<
++
++.S.o:
++	$(COMPILE) -c $<
++
++mostlyclean-compile:
++	-rm -f *.o core *.core
++	-rm -f *.$(OBJEXT)
++
++clean-compile:
++
++distclean-compile:
++	-rm -f *.tab.c
++
++maintainer-clean-compile:
++
++.s.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.S.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++
++maintainer-clean-libtool:
++
++libmetamail.la: $(libmetamail_la_OBJECTS) $(libmetamail_la_DEPENDENCIES)
++	$(LINK) -rpath $(libdir) $(libmetamail_la_LDFLAGS) $(libmetamail_la_OBJECTS) $(libmetamail_la_LIBADD) $(LIBS)
++
++install-pkgincludeHEADERS: $(pkginclude_HEADERS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
++	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
++	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
++	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \
++	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \
++	done
++
++uninstall-pkgincludeHEADERS:
++	@$(NORMAL_UNINSTALL)
++	list='$(pkginclude_HEADERS)'; for p in $$list; do \
++	  rm -f $(DESTDIR)$(pkgincludedir)/$$p; \
++	done
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = metamail
++
++distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign metamail/Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
++
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++all-recursive-am: config.h
++	$(MAKE) $(AM_MAKEFLAGS) all-recursive
++
++install-exec-am: install-libLTLIBRARIES
++install-exec: install-exec-am
++
++install-data-am: install-pkgincludeHEADERS
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
++uninstall: uninstall-am
++all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(pkgincludedir)
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
++		mostlyclean-compile mostlyclean-libtool \
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
++		clean-tags clean-depend clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
++		distclean-libtool distclean-tags distclean-depend \
++		distclean-generic clean-am
++	-rm -f libtool
++
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-hdr \
++		maintainer-clean-libLTLIBRARIES \
++		maintainer-clean-compile maintainer-clean-libtool \
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-am
++
++.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
++mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
++clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
++uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
++distclean-compile clean-compile maintainer-clean-compile \
++mostlyclean-libtool distclean-libtool clean-libtool \
++maintainer-clean-libtool uninstall-pkgincludeHEADERS \
++install-pkgincludeHEADERS tags mostlyclean-tags distclean-tags \
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
++install-exec-am install-exec install-data-am install-data install-am \
++install uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++
++
++common.h: stamp-common
++	@:
++stamp-common: $(srcdir)/common-h.in $(top_builddir)/config.status
++	cd $(top_builddir) \
++	  && CONFIG_FILES= CONFIGHEADERS= CONFIG_OTHER=metamail/common.h \
++	  $(SHELL) ./config.status
++	echo timestamp > $@
++
++dist-hook:
++	rm -f $(distdir)/common.h
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/metamail/xmalloc.c
++++ metamail-2.7/metamail/xmalloc.c
+@@ -0,0 +1,38 @@
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
++#include "common.h"
++#include "error.h"
++
++void *
++xmalloc (size_t num)
++{
++  void *new = malloc (num);
++  if (!new)
++    metamail_fatal ("Memory exhausted");
++  return new;
++}
++
++void *
++xrealloc (void *p, size_t num)
++{
++  void *new;
++  
++  if (!p)
++    return xmalloc (num);
++  
++  new = realloc (p, num);
++  if (!new)
++    metamail_fatal ("Memory exhausted");
++  
++  return new;
++}
++
++void *
++xcalloc (size_t num, size_t size)
++{
++  void *new = xmalloc (num * size); // is implemented by malloc, cause calloc
++  bzero (new, num * size);          // is not available in some older C libs
++  return new;
++}
+--- metamail-2.7.orig/metamail/error.h
++++ metamail-2.7/metamail/error.h
+@@ -0,0 +1,17 @@
++#ifndef COMMON_ERROR_H
++#define COMMON_ERROR_H 1
++      
++#include <metamail/common.h>
++
++BEGIN_C_DECLS
++      
++extern const char *program_name;
++extern void set_program_name PARAMS((const char *argv0));
++      
++extern void metamail_warning      PARAMS((const char *message, ...));
++extern void metamail_error        PARAMS((const char *message, ...));
++extern void metamail_fatal        PARAMS((const char *message, ...));
++      
++END_C_DECLS
++      
++#endif /* !COMMON_ERROR_H */
+--- metamail-2.7.orig/metamail/patchlevel.h
++++ metamail-2.7/metamail/patchlevel.h
+@@ -0,0 +1,19 @@
++/* This is the metamail distribution, version number as given below.
++
++Version history:
++
++  Version 1.X was Bellcore-internal and pre-MIME.
++  Version 2.0 was the first MIME-compliant release, also Bellcore-internal.
++  Version 2.1 was the first public release, January 1992.
++  Version 2.2 was the second public release, April 1992.  Major changes included:
++      -- Ports to UNIX variants & MS-DOS.
++      -- The new "mailto" program
++      -- Innumerable smaller fixes & enhancements
++  Version 2.3 was the June, 1992 release, with many more patches and 
++      enhancements, including a Commodore Amiga port.
++  Version 2.4 was the December, 1992 release, including many bug fixes and a vastly expanded (and now separately packaged) contrib directory.
++  Version 2.5 was the June, 1993 release, with mostly just bug fixes from 2.4.
++  Version 2.6 was the July, 1993 release, with important bug fixes from 2.5.
++  Version 2.7 was the February, 1994 release, mostly bug fixes.
++*/
++#define MM_VERSTRING "2.7"
+--- metamail-2.7.orig/metamail/common-h.in
++++ metamail-2.7/metamail/common-h.in
+@@ -0,0 +1,162 @@
++## common-h.in -- Process this file with configure to produce common.h
++## Copyright (C) 2000 Gary V. Vaughan
++##
++## addition and changes that were made are Copyright (C) 2000 Michael Moerz
++##
++## This program is free software; you can redistribute it and/or modify
++## it under the terms of the GNU General Public License as published by
++## the Free Software Foundation; either version 2, or (at your option)
++## any later version.
++##  
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++## GNU General Public License for more details.
++##  
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, write to the Free Software
++## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++#  include <sys/time.h>
++# else
++#  include <time.h>
++# endif
++#endif
++
++#ifndef PARAMS
++#  if __STDC__
++#    ifndef NOPROTOS
++#      define PARAMS(args)        args
++#    endif
++#  endif
++#  ifndef PARAMS
++#    define PARAMS(args)          ()
++#  endif
++#endif
++
++#ifndef EXIT_SUCCESS
++#  define EXIT_SUCCESS  0
++#  define EXIT_FAILURE  1
++#endif
++      
++#ifdef __cplusplus
++#  define BEGIN_C_DECLS         extern "C" {
++#  define END_C_DECLS           }
++#else
++#  define BEGIN_C_DECLS
++#  define END_C_DECLS
++#endif
++
++#ifdef __GNUC__
++#  ifndef const
++#    define const       __const
++#  endif
++#  ifndef signed
++#    define signed      __signed
++#  endif
++#  ifndef volatile
++#    define volatile    __volatile
++#  endif
++#else
++#  ifdef __STDC__
++#    undef  signed
++#    define signed
++#    undef  volatile
++#    define volatile
++#  endif
++#endif
++
++#ifdef __STDC__
++#  define STR(x)          #x
++#  define CONC(x, y)      x##y
++   typedef void* sic_ptr;
++#else
++#  define STR(x)          "x"
++#  define CONC(x, y)      x/**/y
++   typedef char* sic_ptr;
++#endif
++
++
++#define XCALLOC(type, num)      ((type *) xcalloc ((num), sizeof(type)))
++#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
++#define XREALLOC(type, p, num)  ((type *) xrealloc ((p), (num) * sizeof(type)))
++#define XFREE(stale)                            do {        \
++              if (stale) { free ((sic_ptr) stale);  stale = 0; }    \
++                                                      } while (0)
++
++
++BEGIN_C_DECLS
++
++extern void *xcalloc    (size_t num, size_t size);
++extern void *xmalloc    (size_t num);
++extern void *xrealloc   (void *p, size_t num);
++extern char *xstrdup    (const char *string);
++extern char *xstrerror  (int errnum);
++
++END_C_DECLS
++
++#if WITH_DMALLOC
++#  include <dmalloc.h>
++#endif
++
++//metamail specific stuff below (this are the additions from Michael Moerz)
++
++#define RESET_PROGRAM "/usr/bin/reset"
++
++//#define NO_RLIMITS 1
++#define sigtype void
++
++/* This constant should define the ASCII code for newlines on systems where 
++   the newline convention is other than CRLF.  On UNIX, it is ^J, ASCII 10. 
++    Here we define it as '\n' which should be right on MOST systems... */
++#define NEWLINE_CHAR '\n'
++
++/* The following defines the default size at which long
++    messages will be split into multiple messages of type
++    "message/partial" by the mailto and splitmail commands,
++    at least. */
++#ifndef DEFAULT_SPLIT_SIZE
++#define DEFAULT_SPLIT_SIZE 250000
++#endif
++
++#define PATH_SEPARATOR ':'
++#ifndef STDPATH
++#define STDPATH "/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
++#endif
++
++/* The following can be set to a directory or colon-separated list of 
++  directories that will be prepended to the user's search path before 
++  executing any mailcap-derived commands. 
++
++  It should be set to NULL if there are no directories to prepend.  
++*/
++
++#define AUXPATH NULL
++
++
++#define TMPFILE_NAME_SIZE   1000
++#define MAX_FILE_NAME_SIZE 1000
++
++BEGIN_C_DECLS
++
++extern char **environ, *gets();
++
++extern char *getenv();
++extern char *index();
++extern char *rindex();
++
++extern FILE *popen();
++
++END_C_DECLS
++
++//#ifndef NO_RLIMITS
++//#include <sys/resource.h>
++//#endif
++
++
++
+--- metamail-2.7.orig/metamail/stamp-common
++++ metamail-2.7/metamail/stamp-common
+@@ -0,0 +1 @@
++timestamp
+--- metamail-2.7.orig/metamail/dlist.c
++++ metamail-2.7/metamail/dlist.c
+@@ -0,0 +1,176 @@
++#include "common.h"
++#include "dlist.h"
++
++/* null structure to easy initializing to NULL */
++const DList DListNULL = { NULL, NULL };
++
++/* create a new dlist node containing data */
++DListEntry* 
++dlist_new(void* data) {
++  DListEntry* new = XMALLOC( DListEntry, 1 );
++  
++  new->next = NULL;
++  new->prev = NULL;
++  new->data = data;
++
++  return new;
++}
++
++/* concatenate two lists */
++void
++dlist_cat(DList* list1, DList* list2){
++  list1->tail->next = list2->head;
++  list2->head->prev = list1->tail;
++  list1->tail = list2->tail;
++}
++
++/* to shorten things a bit in some cases */
++DListEntry*
++dlist_insertnew(DList* list, void* data, DListEntry* pos) {
++  DListEntry* new = dlist_new( data );
++  return dlist_insert( list, new, pos );
++}
++
++/* can be used to insert an entry at a specific position in a dlist.
++   use with caution on empty list, cause it might fail then. */
++DListEntry*
++dlist_insert(DList* list, DListEntry* new, DListEntry* pos) {
++
++  if ( pos ) { // if pos not null, insert
++    new->next = pos->next;
++    pos->next = new;
++    new->prev = pos;
++  } else if( ! list->head && ! list->tail ) { // otherwise treat as empty
++    new->next = NULL;                         // list
++    new->prev = NULL;
++    list->head = new;
++  } else
++    return NULL;    // not an empty list -> error
++  
++  if ( new->next )  // set tail when tail
++    new->next->prev = new;
++  else
++    list->tail = new;
++  
++  return new;
++}
++
++/* can only be used to append to the end of a list */
++DListEntry*
++dlist_append(DList* list, DListEntry* new) {
++  if ( list->tail ) { // if list tail exists, then link with it
++    new->next = list->tail->next;
++    list->tail->next = new;
++  } else {
++    new->next = NULL;
++    list->head = new;
++  }
++
++  new->prev = list->tail;
++
++  if ( new->next )  // if next is defined, then set its prev value correctly
++    new->next->prev = new;
++  else
++    list->tail = new;
++  
++  return new;
++}
++
++
++
++DListEntry* 
++dlist_insert_sort (DList* list, DListEntry* new, dlist_comp cmp) {
++  
++}
++
++/* retrieves the head of a list */
++DListEntry* 
++dlist_head(DList* list) {
++  DListEntry *help = list->tail;
++  DListEntry *old  = NULL;
++  
++  while( help ) {
++    old = help;
++    help = help->prev;
++  }
++  
++  return old;
++}
++
++/* retrieves the tail of a list */
++DListEntry* 
++dlist_tail(DList* list) {
++  DListEntry *help = list->head;
++  DListEntry *old  = NULL;
++
++  while( help ) {
++    old = help;
++    help = help->next;
++  }
++  
++  return old;
++}
++
++/* returns the length of the list */
++size_t 
++dlist_length(DList* list){
++  DListEntry *help = list->head;
++  size_t n;
++
++  for (n = 0; help; ++n)
++    help = help->next;
++
++  return n;
++}
++
++/* removes an entry from the list, and returns it so that it might
++   be destroyed properly */
++DListEntry*
++dlist_remove(DList* list, DListEntry* entry) {
++  if (entry) {
++    if (entry != list->head) {  // when not head
++      if (entry->prev)       // and a previous entry exists
++	entry->prev->next = entry->next; // tell the previous our next entry
++    } else
++      list->head = entry->next; // otherwise next entry is head
++    
++    if (entry != list->tail) {  // when not tail
++      if (entry->next)       // and next entry exists
++	entry->next->prev = entry->prev; // tell the next entry our previous 
++    } else
++    list->tail = entry->prev; // otherwise previous is tail
++  }
++
++  return entry;
++}
++
++/* checks a list to be ok (debugging) verifies head, tail and prints list */
++dlist_check( DList* list ) {
++  // should be implemented
++}
++
++
++DListEntry*
++dlist_search(DList* list, void* data, dlist_comp cmp) 
++{
++  DListEntry *help = list->head;
++
++  if (list) {
++    while ( help ) {
++      if ( cmp( data, help->data ) == 0 ) 
++	return help;
++      else
++	help = help->next;
++    }
++  }
++  
++  return NULL;
++}
++
++
++int
++dlist_strcmp(void* data1, void* data2)
++{
++  return strcmp( (char*) data1, (char*) data2 );
++}
++
+--- metamail-2.7.orig/metamail/splitmail.c
++++ metamail-2.7/metamail/splitmail.c
+@@ -41,8 +41,8 @@
+ #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
+ #else
+ extern char *getenv();
+-#define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi"
+-#define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi"
++#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
++#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
+ #endif
+ 
+ usageexit() {
+@@ -194,7 +194,7 @@
+ 	s = endofheader(from);  /* would be index(from, '\n'),
+ 				 but need to check for continuation lines */
+         *s = '\0';
+-	if (ShareThisHeader(from, SubjectBuf, &OrigID)) {
++	if (ShareThisHeader(from, SubjectBuf, sizeof (SubjectBuf), &OrigID)) {
+ 	    strcat(SharedHeaders, from);
+ 	    strcat(SharedHeaders, "\n");
+ 	}
+@@ -339,9 +339,10 @@
+     NULL
+ };
+ 
+-ShareThisHeader(s, SubjectBuf, OrigID)
++ShareThisHeader(s, SubjectBuf, size, OrigID)
+ char *s;
+ char *SubjectBuf;
++size_t size;
+ char **OrigID;
+ {
+     int i;
+@@ -361,7 +362,8 @@
+     }
+     if (!ULstrcmp(s, "subject")) {
+         *colon = ':';
+-        strcpy(SubjectBuf, ++colon);
++	strncpy(SubjectBuf, ++colon, size);
++	SubjectBuf[size - 1] = '\0';
+         return(0);
+     }
+     if (!ULstrcmp(s, "content-type")) {
+--- metamail-2.7.orig/metamail/stamp-h.in
++++ metamail-2.7/metamail/stamp-h.in
+@@ -0,0 +1 @@
++timestamp
+--- metamail-2.7.orig/metamail/dlist.h
++++ metamail-2.7/metamail/dlist.h
+@@ -0,0 +1,43 @@
++#ifndef COMMON_LIST_H
++#define COMMON_LIST_H 1
++
++#include <metamail/common.h>
++
++BEGIN_C_DECLS
++
++typedef int (*dlist_comp) (void*, void*);
++
++typedef struct dlistentry {
++  struct dlistentry *next;
++  struct dlistentry *prev;
++  void *data;
++} DListEntry;
++
++typedef struct dlist {
++  DListEntry *head;
++  DListEntry *tail;
++} DList;
++
++extern const DList DListNULL;
++
++extern DListEntry *dlist_new         (void* data);
++extern void        dlist_cat         (DList* list1, DList* list2);
++extern DListEntry *dlist_insert_new  (DList* list, void* data,
++				      DListEntry* pos);
++extern DListEntry *dlist_insert      (DList* list, DListEntry* new,
++				      DListEntry* pos);
++extern DListEntry *dlist_insert_sort (DList* list, DListEntry* new, 
++				      dlist_comp cmp);
++extern DListEntry *dlist_append      (DList* list, DListEntry* new);
++extern DListEntry *dlist_head        (DList* list);
++extern DListEntry *dlist_tail        (DList* list);
++extern size_t      dlist_length      (DList* list);
++extern DListEntry *dlist_remove      (DList* list, DListEntry* entry);
++
++extern DListEntry *dlist_search      (DList* list, void* data, dlist_comp cmp);
++
++extern int dlist_strcmp              (void* data1, void* data2);
++
++END_C_DECLS
++
++#endif /* !COMMON_LIST_H */
+--- metamail-2.7.orig/metamail/error.c
++++ metamail-2.7/metamail/error.c
+@@ -0,0 +1,82 @@
++#if HAVE_CONFIG_H
++#  include "config.h"
++#endif
++
++#include "common.h"
++#include "error.h"
++
++#include <libgen.h>  /* basename(3) */
++const char *program_name = NULL;
++      
++static void error PARAMS((int exit_status, const char *mode,
++			  const char *message, va_list ap));
++      
++void
++set_program_name (path)
++     const char *path;
++{
++  METAMAIL_ASSERT (!program_name);
++  program_name = (char*) xstrdup ( (char*) basename (path));
++}
++
++static void
++error (exit_status, mode, message, ap)
++     int exit_status;
++     const char *mode;
++     const char *message;
++     va_list ap;
++{
++  fprintf (stderr, "%s: %s: ", program_name, mode);
++  vfprintf (stderr, message, ap);
++  fprintf (stderr, ".\n");
++
++  if (exit_status >= 0)
++    exit (exit_status);
++}
++
++void
++#if HAVE_STDARG_H
++metamail_warning (const char *message, ...)
++#else
++metamail_warning (message, va_alist)
++     const char *message;
++     va_dcl
++#endif
++{
++  va_list ap;
++  VA_START (ap, message);
++  error (-1, "warning", message, ap);
++  va_end (ap);
++}
++
++void
++#if HAVE_STDARG_H
++metamail_error (const char *message, ...)
++#else
++metamail_error (message, va_alist)
++     const char *message;
++     va_dcl
++#endif
++{
++  va_list ap;
++  VA_START (ap, message);
++  error (-1, "ERROR", message, ap);
++  va_end (ap);
++}
++      
++void
++#if HAVE_STDARG_H
++metamail_fatal (const char *message, ...)
++#else
++metamail_fatal (message, va_alist)
++     const char *message;
++     va_dcl
++#endif
++{
++  va_list ap;
++  VA_START (ap, message);
++  error (EXIT_FAILURE, "FATAL", message, ap);
++  va_end (ap);
++}
++
++
+--- metamail-2.7.orig/metamail/libcommon.la
++++ metamail-2.7/metamail/libcommon.la
+@@ -0,0 +1,28 @@
++# libcommon.la - a libtool library file
++# Generated by ltmain.sh - GNU libtool 1.3.5 (1.385.2.206 2000/05/27 11:12:27)
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
++
++# The name that we can dlopen(3).
++dlname=''
++
++# Names of this library.
++library_names='libcommon.so.0.0.0 libcommon.so.0 libcommon.so'
++
++# The name of the static archive.
++old_library='libcommon.a'
++
++# Libraries that this one depends upon.
++dependency_libs=''
++
++# Version information for libcommon.
++current=0
++age=0
++revision=0
++
++# Is this an already installed library?
++installed=no
++
++# Directory that this library needs to be installed in:
++libdir='/usr/lib'
+--- metamail-2.7.orig/configure.in
++++ metamail-2.7/configure.in
+@@ -0,0 +1,361 @@
++dnl Process this file with autoconf to produce a configure script.
++dnl AC_REVISION($Revision: 1.4 $)dnl
++AC_INIT(src/metamail/metamail.c)
++AC_CONFIG_AUX_DIR(config)
++AM_CONFIG_HEADER(metamail/config.h)
++AM_INIT_AUTOMAKE(metamail, 0.0.1)
++AM_MAINTAINER_MODE
++
++AC_CANONICAL_HOST
++
++dnl Checks for programs.
++AC_PROG_CC
++AM_PROG_LIBTOOL
++AC_SUBST(LIBTOOL_DEPS)
++
++AC_CHECK_PROG(LPRCOMMAND, lp, lp)
++AC_CHECK_PROG(LPRCOMMAND, lpr, lpr)
++
++AC_CHECK_PROG(CATCOMMAND, cat, cat)
++AC_CHECK_PROG(CATCOMMAND, type, type)
++
++
++dnl Checks for libraries.
++
++dnl Checks for header files.
++dnl varargscheck ?
++dnl AC_HEADER_STDC
++AC_CHECK_HEADERS(stdlib.h unistd.h errno.h assert.h)
++AC_CHECK_HEADERS(sys/time.h time.h signal.h)
++AC_CHECK_HEADERS(string.h strings.h, break)
++
++# @start variadic
++case $am_cv_prog_cc_stdc,$ac_cv_header_varargs_h in
++no,)
++	# Non-ANSI compiler, so we must use varargs.h.
++	AC_CHECK_HEADERS(varargs.h)
++	;;
++*,yes)
++	# Parent package is using varargs.h which is incompatible with 
++	# stdarg.h, so we do the same (recheck to generate checking...
++	# message).
++	AC_CHECK_HEADERS(varargs.h)
++	;;
++*)
++	# If stdarg.h is present define HAVE_STDARG_H.
++	AC_CHECK_HEADERS(stdarg.h)
++	;;
++esac
++
++case x$ac_cv_header_stdarg_h$ac_cv_header_varargs_h in
++x*yes*) ;;
++*) AC_MSG_ERROR(Could not find stdarg.h or varargs.h, one of which is \
++required for the build process.) ;;
++esac
++# @end variadic
++
++dnl Checks for typedefs, structures, and compiler characteristics.
++AC_C_CONST
++AC_TYPE_SIZE_T
++AC_HEADER_TIME
++
++dnl Checks for library functions.
++dnl bzero is ok, 
++AC_CHECK_FUNCS(killpg kill)
++AC_CHECK_FUNCS(bcopy memcpy)
++AC_CHECK_FUNCS(bzero memset, break)
++AC_CHECK_FUNCS(bcmp memcmp)
++AC_CHECK_FUNCS(index strchr)
++AC_CHECK_FUNCS(rindex strrchr)
++AC_CHECK_FUNCS(initstate srand)
++AC_CHECK_FUNCS(random rand)
++
++AC_CHECK_FUNCS(calloc)
++AC_REPLACE_FUNCS(basename strerror vfprintf)
++AC_REPLACE_FUNCS(putenv)
++
++dnl *****************************************
++dnl create a metamail common header file, holding all needed definitions
++dnl for copatiblity
++AC_OUTPUT_COMMANDS([
++  if test -n "$CONFIG_FILES" && test -n "$CONFIG_HEADERS"; then
++    # If both these vars are non-empty, then config.status wasn't run by
++    # automake rules (which always set one or the other to empty).
++    CONFIG_OTHER=${CONFIG_OTHER-METAMAIL/common.h}
++  fi
++  case "$CONFIG_OTHER" in
++  *metamail/common.h*)
++    outfile=metamail/common.h
++    stampfile=metamail/stamp-common
++    tmpfile=${outfile}T
++    dirname="sed s,^.*/,,g"
++
++    echo creating $outfile
++    cat > $tmpfile << _EOF_
++/*  -*- Mode: C -*-
++ * --------------------------------------------------------------------
++ * DO NOT EDIT THIS FILE!  It has been automatically generated
++ * from:    configure.in and `echo $outfile|$dirname`.in
++ * on host: `(hostname || uname -n) 2>/dev/null | sed 1q`
++ * --------------------------------------------------------------------
++ */
++
++#ifndef METAMAIL_COMMON_H
++#define METAMAIL_COMMON_H 1
++
++#include <stdio.h>
++#include <ctype.h>        // ??? ok here
++#include <sys/types.h>
++#include <sys/stat.h>     // ??? ok here
++
++// ??? following ok here without check?
++#include <pwd.h>
++#include <sys/time.h>
++#include <sys/types.h>
++#include <sys/file.h>
++#include <signal.h>
++
++#include <termio.h>
++#include <fcntl.h>
++#include <sys/utsname.h>
++_EOF_
++
++    case "${host}" in
++      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
++
++#include <linux/limits.h>
++
++_EOF_
++;;
++    esac
++
++# @end 5
++# @start 4
++    # Add the code to include these headers only if autoconf has
++    # shown them to be present.
++    if test x$ac_cv_header_stdlib_h = xyes; then
++      echo '#include <stdlib.h>' >> $tmpfile
++    fi
++    if test x$ac_cv_header_unistd_h = xyes; then
++      echo '#include <unistd.h>' >> $tmpfile
++    fi
++    if test x$ac_cv_header_sys_wait_h = xyes; then
++      echo '#include <sys/wait.h>' >> $tmpfile
++    fi
++    if test x$ac_cv_header_errno_h = xyes; then
++      echo '#include <errno.h>' >> $tmpfile
++    fi
++    cat >> $tmpfile << '_EOF_'
++
++#ifndef errno
++/* Some sytems #define this! */
++extern int errno;
++#endif
++
++_EOF_
++    if test x$ac_cv_header_string_h = xyes; then
++      echo '#include <string.h>' >> $tmpfile
++    elif test x$ac_cv_header_strings_h = xyes; then
++      echo '#include <strings.h>' >> $tmpfile
++    fi
++
++# *******************
++# start variadic parameters 
++#
++    if test x$ac_cv_header_stdarg_h = xyes \
++	&& test x$ac_cv_header_varargs_h != xyes
++    then
++      cat >> $tmpfile << '_EOF_'
++
++#include <stdarg.h>
++#ifndef VA_START
++#  define VA_START(a, f) va_start(a, f)
++#endif /* VA_START */
++
++_EOF_
++    else
++      cat >> $tmpfile << '_EOF_'
++	
++#include <varargs.h>
++#ifndef VA_START
++#  define VA_START(a, f) va_start(a)
++#endif /* VA_START */
++       
++_EOF_
++    fi
++#
++# end variadic parameters
++# ***********************
++
++    if test x$ac_cv_header_assert_h = xyes; then
++      cat >> $tmpfile << '_EOF_'
++
++#include <assert.h>
++#define METAMAIL_ASSERT assert
++
++_EOF_
++else
++        echo '#define METAMAIL_ASSERT(expr)  ((void) 0)' >> $tmpfile
++    fi
++# @end 4
++# @start 5
++    if test x$ac_cv_func_killpg = xno && \
++       test x$ac_cv_func_kill = xyes; then
++      cat >> $tmpfile << '_EOF_'
++#define killbg(pid, sig) ((int) kill (-(pid), sig))
++_EOF_
++    fi 
++    if test x$ac_cv_func_bcopy = xno && \
++       test x$ac_cv_func_memcpy = xyes; then
++      cat >> $tmpfile << '_EOF_'
++#define bcopy(src, dest, n) ((void) memcpy (dest, src, n))
++_EOF_
++    fi
++    if test x$ac_cv_func_bzero = xno && \
++       test x$ac_cv_func_memset = xyes; then
++      cat >> $tmpfile << '_EOF_'
++#define bzero(buf, bytes) ((void) memset (buf, 0, bytes))
++_EOF_
++    fi
++    if test x$ac_cv_func_bcmp = xno && \
++       test x$ac_cv_func_memcmp = xyes; then
++      echo '#define bcmp memcmp' >> $tmpfile
++    fi
++    if test x$ac_cv_func_index = xno && \
++       test x$ac_cv_func_strchr = xyes; then
++      echo '#define index strchr' >> $tmpfile
++    fi
++    if test x$ac_cv_func_rindex = xno && \
++       test x$ac_cv_func_strrchr = xyes; then
++      echo '#define rindex strrchr' >> $tmpfile
++    fi
++    if test x$ac_cv_func_initstate = xno && \
++       test x$ac_cv_func_srand = xyes; then
++      echo '#define initstate srand' >> $tmpfile
++    fi
++    if test x$ac_cv_func_random = xno && \
++       test x$ac_cv_func_rand = xyes; then
++      echo '#define random rand' >> $tmpfile
++    fi
++
++    # The ugly but portable cpp stuff comes from here
++    infile=$srcdir/metamail/`echo $outfile | sed 's,.*/,,g;s,\..*$,,g'`-h.in
++    sed '/^##.*$/d' $infile >> $tmpfile 
++
++# @end 5
++    ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
++    if test x$ac_cv_func_basename = xno; then
++      echo 'extern char *basename PARAMS((const char *path));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_strerror = xno; then
++      echo 'extern char *strerror PARAMS((int err));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_strsignal = xno; then
++      echo 'extern char *strsignal PARAMS((int signo));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_vfprintf = xno; then
++      echo 'extern int vfprintf PARAMS((FILE *file, const char* format, va_list ap));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_waitpid = xno; then 
++	echo 'extern pid_t waitpid PARAMS((pid_t pid, int *pstatus, int options));' >> ${tmpfile}2
++    fi
++
++    if test -f ${tmpfile}2; then
++      cat >> $tmpfile << '_EOF_'
++
++BEGIN_C_DECLS
++_EOF_
++      cat ${tmpfile}2 >> $tmpfile
++      echo 'END_C_DECLS' >> $tmpfile
++      ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
++    fi
++
++    if test -n ${LPRCOMMAND}; then
++      echo '#define LPRCOMMAND "'${LPRCOMMAND}'"' >> $tmpfile
++      echo '#define LPRTEMPLATE "'${LPRCOMMAND}' %s"' >> $tmpfile
++    fi
++    if test -n ${CATCOMMAND}; then
++      echo '#define CATCOMMAND "'${CATCOMMAND}'"' >> $tmpfile
++      echo '#define CATTEMPLATE "'${CATCOMMAND}' %s"' >> $tmpfile
++    fi
++
++    case "${host}" in
++      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
++#define TMPNAME_MAX NAME_MAX
++static struct termio MyTtyStateIn, MyTtyStateOut;
++
++_EOF_
++;;
++      *) cat >> $tmpfile << '_EOF_'
++
++#define TMPNAME_MAX	1000
++#define NAME_MAX	1000
++static struct sgttyb MyTtyStateIn, MyTtyStateOut;
++
++_EOF_
++;;
++    esac
++
++    cat >> $tmpfile << '_EOF_'
++
++
++#endif /* !METAMAIL_COMMON_H */
++_EOF_
++
++    if cmp -s $tmpfile $outfile; then
++      echo $outfile is unchanged
++      rm -f $tmpfile
++    else
++      mv $tmpfile $outfile
++      touch $stampfile
++    fi
++    ;;
++  esac
++# @start 5
++],[
++  srcdir=$srcdir
++  ac_cv_func_bzero=$ac_cv_func_bzero
++  ac_cv_func_memset=$ac_cv_func_memset
++  ac_cv_func_strchr=$ac_cv_func_strchr
++  ac_cv_func_strrchr=$ac_cv_func_strrchr
++# @end 5
++  ac_cv_func_basename=$ac_cv_func_basename
++  ac_cv_func_strcspn=$ac_cv_func_strcspn
++  ac_cv_func_strerror=$ac_cv_func_strerror
++  ac_cv_func_strsignal=$ac_cv_func_strsignal
++  ac_cv_func_strspn=$ac_cv_func_strspn
++  ac_cv_func_vfprintf=$ac_cv_func_vfprintf
++  ac_cv_func_waitpid=$ac_cv_func_waitpid
++  ac_cv_header_assert_h=$ac_cv_header_assert_h
++  ac_cv_header_errno_h=$ac_cv_header_errno_h
++  ac_cv_header_stdlib_h=$ac_cv_header_stdlib_h
++  ac_cv_header_stdarg_h=$ac_cv_header_stdarg_h
++  ac_cv_header_string_h=$ac_cv_header_string_h
++  ac_cv_header_strings_h=$ac_cv_header_strings_h
++  ac_cv_header_sys_wait_h=$ac_cv_header_sys_wait_h
++  ac_cv_header_unistd_h=$ac_cv_header_unistd_h
++  ac_cv_header_varargs_h=$ac_cv_header_varargs_h
++  LPRCOMMAND=$LPRCOMMAND
++  CATCOMMAND=$CATCOMMAND
++  host=$host
++# @start 5
++])
++# @end 5
++# @start 1
++
++dnl *****************************************
++dnl export of variable settings for Makefiles
++
++dnl for libtool to work LTLIBOJS is needed (currently bug of autoconf)
++Xsed="sed -e s/^X//"
++LTLIBOBJS=`echo X"$LIBOBJS"|[$Xsed -e "s,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,"]`
++AC_SUBST(LTLIBOBJS)
++
++dnl the aux dir (for holding config & autodenerated stuff)
++AC_SUBST(ac_aux_dir)
++AC_SUBST(LPRCOMMAND)
++AC_SUBST(CATCOMMAND)
++
++AC_OUTPUT([Makefile replace/Makefile metamail/Makefile src/Makefile \
++	   src/metamail/Makefile src/richmail/Makefile bin/Makefile],
++[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h.in])
+--- metamail-2.7.orig/fonts/Xshownonascii
++++ metamail-2.7/fonts/Xshownonascii
+@@ -1,7 +1,7 @@
+ #!/bin/csh -fb
+ # (The "-fb" might need to be changed to "-f" on some systems)
+ #
+-set MYFONTDIR=/u/nsb/lib/fonts
++set MYFONTDIR=/usr/lib/X11/fonts/misc
+ 
+ set CHARSET="$1"
+ shift
+--- metamail-2.7.orig/fonts/Xmailto-hebrew
++++ metamail-2.7/fonts/Xmailto-hebrew
+@@ -1,7 +1,7 @@
+ #!/bin/csh -fb
+ # (The "-fb" might need to be changed to "-f" on some systems)
+ #
+-set MYFONTDIR=/u/nsb/lib/fonts
++set MYFONTDIR=/usr/lib/X11/fonts/misc
+ 
+ if ($?MM_CHARSET) then
+     if ($MM_CHARSET == iso-8859-8) then
+--- metamail-2.7.orig/fonts/Makefile
++++ metamail-2.7/fonts/Makefile
+@@ -10,7 +10,9 @@
+ #FONTSUFFIX=fb
+ #DIRBUILDER=bldfamily
+ 
+-all: shownonascii heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX} mailto-hebrew
++RM=rm
++
++all: heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}
+ 
+ heb6x13.${FONTSUFFIX}: heb6x13.bdf
+ #	convertfont -o heb6x13 heb6x13.bdf
+@@ -36,4 +38,4 @@
+ 	chmod +x mailto-hebrew
+ 
+ clean:
+-	rm -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}  shownonascii mailto-hebrew fonts.dir
++	$(RM) -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}  shownonascii mailto-hebrew fonts.dir
+--- metamail-2.7.orig/config/missing
++++ metamail-2.7/config/missing
+@@ -0,0 +1,190 @@
++#! /bin/sh
++# Common stub for a few missing GNU programs while installing.
++# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
++# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++if test $# -eq 0; then
++  echo 1>&2 "Try \`$0 --help' for more information"
++  exit 1
++fi
++
++case "$1" in
++
++  -h|--h|--he|--hel|--help)
++    echo "\
++$0 [OPTION]... PROGRAM [ARGUMENT]...
++
++Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
++error status if there is no known handling for PROGRAM.
++
++Options:
++  -h, --help      display this help and exit
++  -v, --version   output version information and exit
++
++Supported PROGRAM values:
++  aclocal      touch file \`aclocal.m4'
++  autoconf     touch file \`configure'
++  autoheader   touch file \`config.h.in'
++  automake     touch all \`Makefile.in' files
++  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
++  flex         create \`lex.yy.c', if possible, from existing .c
++  lex          create \`lex.yy.c', if possible, from existing .c
++  makeinfo     touch the output file
++  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
++    ;;
++
++  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
++    echo "missing - GNU libit 0.0"
++    ;;
++
++  -*)
++    echo 1>&2 "$0: Unknown \`$1' option"
++    echo 1>&2 "Try \`$0 --help' for more information"
++    exit 1
++    ;;
++
++  aclocal)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified \`acinclude.m4' or \`configure.in'.  You might want
++         to install the \`Automake' and \`Perl' packages.  Grab them from
++         any GNU archive site."
++    touch aclocal.m4
++    ;;
++
++  autoconf)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified \`configure.in'.  You might want to install the
++         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
++         archive site."
++    touch configure
++    ;;
++
++  autoheader)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified \`acconfig.h' or \`configure.in'.  You might want
++         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
++         from any GNU archive site."
++    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
++    test -z "$files" && files="config.h"
++    touch_files=
++    for f in $files; do
++      case "$f" in
++      *:*) touch_files="$touch_files "`echo "$f" |
++				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
++      *) touch_files="$touch_files $f.in";;
++      esac
++    done
++    touch $touch_files
++    ;;
++
++  automake)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
++         You might want to install the \`Automake' and \`Perl' packages.
++         Grab them from any GNU archive site."
++    find . -type f -name Makefile.am -print |
++	   sed 's/\.am$/.in/' |
++	   while read f; do touch "$f"; done
++    ;;
++
++  bison|yacc)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified a \`.y' file.  You may need the \`Bison' package
++         in order for those modifications to take effect.  You can get
++         \`Bison' from any GNU archive site."
++    rm -f y.tab.c y.tab.h
++    if [ $# -ne 1 ]; then
++        eval LASTARG="\${$#}"
++	case "$LASTARG" in
++	*.y)
++	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
++	    if [ -f "$SRCFILE" ]; then
++	         cp "$SRCFILE" y.tab.c
++	    fi
++	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
++	    if [ -f "$SRCFILE" ]; then
++	         cp "$SRCFILE" y.tab.h
++	    fi
++	  ;;
++	esac
++    fi
++    if [ ! -f y.tab.h ]; then
++	echo >y.tab.h
++    fi
++    if [ ! -f y.tab.c ]; then
++	echo 'main() { return 0; }' >y.tab.c
++    fi
++    ;;
++
++  lex|flex)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified a \`.l' file.  You may need the \`Flex' package
++         in order for those modifications to take effect.  You can get
++         \`Flex' from any GNU archive site."
++    rm -f lex.yy.c
++    if [ $# -ne 1 ]; then
++        eval LASTARG="\${$#}"
++	case "$LASTARG" in
++	*.l)
++	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
++	    if [ -f "$SRCFILE" ]; then
++	         cp "$SRCFILE" lex.yy.c
++	    fi
++	  ;;
++	esac
++    fi
++    if [ ! -f lex.yy.c ]; then
++	echo 'main() { return 0; }' >lex.yy.c
++    fi
++    ;;
++
++  makeinfo)
++    echo 1>&2 "\
++WARNING: \`$1' is missing on your system.  You should only need it if
++         you modified a \`.texi' or \`.texinfo' file, or any other file
++         indirectly affecting the aspect of the manual.  The spurious
++         call might also be the consequence of using a buggy \`make' (AIX,
++         DU, IRIX).  You might want to install the \`Texinfo' package or
++         the \`GNU make' package.  Grab either from any GNU archive site."
++    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++    if test -z "$file"; then
++      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
++    fi
++    touch $file
++    ;;
++
++  *)
++    echo 1>&2 "\
++WARNING: \`$1' is needed, and you do not seem to have it handy on your
++         system.  You might have modified some files without having the
++         proper tools for further handling them.  Check the \`README' file,
++         it often tells you about the needed prerequirements for installing
++         this package.  You may also peek at any GNU archive site, in case
++         some other package would contain this missing \`$1' program."
++    exit 1
++    ;;
++esac
++
++exit 0
+--- metamail-2.7.orig/config/mkinstalldirs
++++ metamail-2.7/config/mkinstalldirs
+@@ -0,0 +1,40 @@
++#! /bin/sh
++# mkinstalldirs --- make directory hierarchy
++# Author: Noah Friedman <friedman@prep.ai.mit.edu>
++# Created: 1993-05-16
++# Public domain
++
++# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
++
++errstatus=0
++
++for file
++do
++   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
++   shift
++
++   pathcomp=
++   for d
++   do
++     pathcomp="$pathcomp$d"
++     case "$pathcomp" in
++       -* ) pathcomp=./$pathcomp ;;
++     esac
++
++     if test ! -d "$pathcomp"; then
++        echo "mkdir $pathcomp"
++
++        mkdir "$pathcomp" || lasterr=$?
++
++        if test ! -d "$pathcomp"; then
++  	  errstatus=$lasterr
++        fi
++     fi
++
++     pathcomp="$pathcomp/"
++   done
++done
++
++exit $errstatus
++
++# mkinstalldirs ends here
+--- metamail-2.7.orig/config/depcomp
++++ metamail-2.7/config/depcomp
+@@ -0,0 +1,411 @@
++#! /bin/sh
++
++# depcomp - compile a program generating dependencies as side-effects
++# Copyright 1999, 2000 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
++
++if test -z "$depmode" || test -z "$source" || test -z "$object"; then
++  echo "depcomp: Variables source, object and depmode must be set" 1>&2
++  exit 1
++fi
++# `libtool' can also be set to `yes' or `no'.
++
++depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
++tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
++
++rm -f "$tmpdepfile"
++
++# Some modes work just like other modes, but use different flags.  We
++# parameterize here, but still list the modes in the big case below,
++# to make depend.m4 easier to write.  Note that we *cannot* use a case
++# here, because this file can only contain one case statement.
++if test "$depmode" = hp; then
++  # HP compiler uses -M and no extra arg.
++  gccflag=-M
++  depmode=gcc
++fi
++
++if test "$depmode" = dashXmstdout; then
++   # This is just like dashmstdout with a different argument.
++   dashmflag=-xM
++   depmode=dashmstdout
++fi
++
++case "$depmode" in
++gcc3)
++## gcc 3 implements dependency tracking that does exactly what
++## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
++## it if -MD -MP comes after the -MF stuff.  Hmm.
++  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  mv "$tmpdepfile" "$depfile"
++  ;;
++
++gcc)
++## There are various ways to get dependency output from gcc.  Here's
++## why we pick this rather obscure method:
++## - Don't want to use -MD because we'd like the dependencies to end
++##   up in a subdir.  Having to rename by hand is ugly.
++##   (We might end up doing this anyway to support other compilers.)
++## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
++##   -MM, not -M (despite what the docs say).
++## - Using -M directly means running the compiler twice (even worse
++##   than renaming).
++  if test -z "$gccflag"; then
++    gccflag=-MD,
++  fi
++  "$@" -Wp,"$gccflag$tmpdepfile"
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  rm -f "$depfile"
++  echo "$object : \\" > "$depfile"
++  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
++## The second -e expression handles DOS-style file names with drive letters.
++  sed -e 's/^[^:]*: / /' \
++      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
++## This next piece of magic avoids the `deleted header file' problem.
++## The problem is that when a header file which appears in a .P file
++## is deleted, the dependency causes make to die (because there is
++## typically no way to rebuild the header).  We avoid this by adding
++## dummy dependencies for each header file.  Too bad gcc doesn't do
++## this for us directly.
++  tr ' ' '
++' < "$tmpdepfile" |
++## Some versions of gcc put a space before the `:'.  On the theory
++## that the space means something, we add a space to the output as
++## well.
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++hp)
++  # This case exists only to let depend.m4 do its work.  It works by
++  # looking at the text of this script.  This case will never be run,
++  # since it is checked for above.
++  exit 1
++  ;;
++
++sgi)
++  if test "$libtool" = yes; then
++    "$@" "-Wp,-MDupdate,$tmpdepfile"
++  else
++    "$@" -MDupdate "$tmpdepfile"
++  fi
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  rm -f "$depfile"
++
++  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
++    echo "$object : \\" > "$depfile"
++
++    # Clip off the initial element (the dependent).  Don't try to be
++    # clever and replace this with sed code, as IRIX sed won't handle
++    # lines with more than a fixed number of characters (4096 in
++    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
++    # the IRIX cc adds comments like `#:fec' to the end of the
++    # dependency line.
++    tr ' ' '
++' < "$tmpdepfile" \
++    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
++    tr '
++' ' ' >> $depfile
++    echo >> $depfile
++
++    # The second pass generates a dummy entry for each header file.
++    tr ' ' '
++' < "$tmpdepfile" \
++   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
++   >> $depfile
++  else
++    # The sourcefile does not contain any dependencies, so just
++    # store a dummy comment line, to avoid errors with the Makefile
++    # "include basename.Plo" scheme.
++    echo "#dummy" > "$depfile"
++  fi
++  rm -f "$tmpdepfile"
++  ;;
++
++aix)
++  # The C for AIX Compiler uses -M and outputs the dependencies
++  # in a .u file.  This file always lives in the current directory.
++  # Also, the AIX compiler puts `$object:' at the start of each line;
++  # $object doesn't have directory information.
++  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
++  tmpdepfile="$stripped.u"
++  outname="$stripped.o"
++  if test "$libtool" = yes; then
++    "$@" -Wc,-M
++  else
++    "$@" -M
++  fi
++
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++
++  if test -f "$tmpdepfile"; then
++    # Each line is of the form `foo.o: dependent.h'.
++    # Do two passes, one to just change these to
++    # `$object: dependent.h' and one to simply `dependent.h:'.
++    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
++    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++  else
++    # The sourcefile does not contain any dependencies, so just
++    # store a dummy comment line, to avoid errors with the Makefile
++    # "include basename.Plo" scheme.
++    echo "#dummy" > "$depfile"
++  fi
++  rm -f "$tmpdepfile"
++  ;;
++
++tru64)
++   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
++   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
++   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
++   # dependencies in `foo.d' instead, so we check for that too.
++   # Subdirectories are respected.
++
++   tmpdepfile1="$object.d"
++   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
++   if test "$libtool" = yes; then
++      "$@" -Wc,-MD
++   else
++      "$@" -MD
++   fi
++
++   stat=$?
++   if test $stat -eq 0; then :
++   else
++      rm -f "$tmpdepfile1" "$tmpdepfile2"
++      exit $stat
++   fi
++
++   if test -f "$tmpdepfile1"; then
++      tmpdepfile="$tmpdepfile1"
++   else
++      tmpdepfile="$tmpdepfile2"
++   fi
++   if test -f "$tmpdepfile"; then
++      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++      # That's a space and a tab in the [].
++      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++   else
++      echo "#dummy" > "$depfile"
++   fi
++   rm -f "$tmpdepfile"
++   ;;
++
++#nosideeffect)
++  # This comment above is used by automake to tell side-effect
++  # dependency tracking mechanisms from slower ones.
++
++dashmstdout)
++  # Important note: in order to support this mode, a compiler *must*
++  # always write the proprocessed file to stdout, regardless of -o,
++  # because we must use -o when running libtool.
++  test -z "$dashmflag" && dashmflag=-M
++  ( IFS=" "
++    case " $* " in
++    *" --mode=compile "*) # this is libtool, let us make it quiet
++      for arg
++      do # cycle over the arguments
++        case "$arg" in
++	"--mode=compile")
++	  # insert --quiet before "--mode=compile"
++	  set fnord "$@" --quiet
++	  shift # fnord
++	  ;;
++	esac
++	set fnord "$@" "$arg"
++	shift # fnord
++	shift # "$arg"
++      done
++      ;;
++    esac
++    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
++  ) &
++  proc=$!
++  "$@"
++  stat=$?
++  wait "$proc"
++  if test "$stat" != 0; then exit $stat; fi
++  rm -f "$depfile"
++  cat < "$tmpdepfile" > "$depfile"
++  tr ' ' '
++' < "$tmpdepfile" | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++dashXmstdout)
++  # This case only exists to satisfy depend.m4.  It is never actually
++  # run, as this mode is specially recognized in the preamble.
++  exit 1
++  ;;
++
++makedepend)
++  # X makedepend
++  (
++    shift
++    cleared=no
++    for arg in "$@"; do
++      case $cleared in no)
++        set ""; shift
++	cleared=yes
++      esac
++      case "$arg" in
++        -D*|-I*)
++	  set fnord "$@" "$arg"; shift;;
++	-*)
++	  ;;
++	*)
++	  set fnord "$@" "$arg"; shift;;
++      esac
++    done
++    obj_suffix="`echo $object | sed 's/^.*\././'`"
++    touch "$tmpdepfile"
++    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
++  ) &
++  proc=$!
++  "$@"
++  stat=$?
++  wait "$proc"
++  if test "$stat" != 0; then exit $stat; fi
++  rm -f "$depfile"
++  cat < "$tmpdepfile" > "$depfile"
++  tail +3 "$tmpdepfile" | tr ' ' '
++' | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile" "$tmpdepfile".bak
++  ;;
++
++cpp)
++  # Important note: in order to support this mode, a compiler *must*
++  # always write the proprocessed file to stdout, regardless of -o,
++  # because we must use -o when running libtool.
++  ( IFS=" "
++    case " $* " in
++    *" --mode=compile "*)
++      for arg
++      do # cycle over the arguments
++        case $arg in
++	"--mode=compile")
++	  # insert --quiet before "--mode=compile"
++	  set fnord "$@" --quiet
++	  shift # fnord
++	  ;;
++	esac
++	set fnord "$@" "$arg"
++	shift # fnord
++	shift # "$arg"
++      done
++      ;;
++    esac
++    "$@" -E |
++    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++    sed '$ s: \\$::' > "$tmpdepfile"
++  ) &
++  proc=$!
++  "$@"
++  stat=$?
++  wait "$proc"
++  if test "$stat" != 0; then exit $stat; fi
++  rm -f "$depfile"
++  echo "$object : \\" > "$depfile"
++  cat < "$tmpdepfile" >> "$depfile"
++  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++msvisualcpp)
++  # Important note: in order to support this mode, a compiler *must*
++  # always write the proprocessed file to stdout, regardless of -o,
++  # because we must use -o when running libtool.
++  ( IFS=" "
++    case " $* " in
++    *" --mode=compile "*)
++      for arg
++      do # cycle over the arguments
++        case $arg in
++	"--mode=compile")
++	  # insert --quiet before "--mode=compile"
++	  set fnord "$@" --quiet
++	  shift # fnord
++	  ;;
++	esac
++	set fnord "$@" "$arg"
++	shift # fnord
++	shift # "$arg"
++      done
++      ;;
++    esac
++    "$@" -E |
++    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
++  ) &
++  proc=$!
++  "$@"
++  stat=$?
++  wait "$proc"
++  if test "$stat" != 0; then exit $stat; fi
++  rm -f "$depfile"
++  echo "$object : \\" > "$depfile"
++  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
++  echo "	" >> "$depfile"
++  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++none)
++  exec "$@"
++  ;;
++
++*)
++  echo "Unknown depmode $depmode" 1>&2
++  exit 1
++  ;;
++esac
++
++exit 0
+--- metamail-2.7.orig/config/ltconfig
++++ metamail-2.7/config/ltconfig
+@@ -0,0 +1,3115 @@
++#! /bin/sh
++
++# ltconfig - Create a system-specific libtool.
++# Copyright (C) 1996-1999 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This file is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# A lot of this script is taken from autoconf-2.10.
++
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++echo=echo
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec "$SHELL" "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
++# Find the correct PATH separator.  Usually this is `:', but
++# DJGPP uses `;' like DOS.
++if test "X${PATH_SEPARATOR+set}" != Xset; then
++  UNAME=${UNAME-`uname 2>/dev/null`}
++  case X$UNAME in
++    *-DOS) PATH_SEPARATOR=';' ;;
++    *)     PATH_SEPARATOR=':' ;;
++  esac
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++if test "X${echo_test_string+set}" != Xset; then
++  # find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" != 'X\t' ||
++   test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++  for dir in $PATH /usr/ucb; do
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running ltconfig again with it.
++      ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
++    else
++      # Try using printf.
++      echo='printf "%s\n"'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
++	   test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++	CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL"
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
++	   test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "$0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# The name of this program.
++progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
++
++# Constants:
++PROGRAM=ltconfig
++PACKAGE=libtool
++VERSION=1.3.5
++TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++rm="rm -f"
++
++help="Try \`$progname --help' for more information."
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++enable_shared=yes
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++enable_static=yes
++enable_fast_install=yes
++enable_dlopen=unknown
++enable_win32_dll=no
++ltmain=
++silent=
++srcdir=
++ac_config_guess=
++ac_config_sub=
++host=
++nonopt=
++ofile="$default_ofile"
++verify_host=yes
++with_gcc=no
++with_gnu_ld=no
++need_locks=yes
++ac_ext=c
++objext=o
++libext=a
++exeext=
++cache_file=
++
++old_AR="$AR"
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++old_CPPFLAGS="$CPPFLAGS"
++old_LDFLAGS="$LDFLAGS"
++old_LD="$LD"
++old_LN_S="$LN_S"
++old_LIBS="$LIBS"
++old_NM="$NM"
++old_RANLIB="$RANLIB"
++old_DLLTOOL="$DLLTOOL"
++old_OBJDUMP="$OBJDUMP"
++old_AS="$AS"
++
++# Parse the command line options.
++args=
++prev=
++for option
++do
++  case "$option" in
++  -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) optarg= ;;
++  esac
++
++  # If the previous option needs an argument, assign it.
++  if test -n "$prev"; then
++    eval "$prev=\$option"
++    prev=
++    continue
++  fi
++
++  case "$option" in
++  --help) cat <<EOM
++Usage: $progname [OPTION]... [HOST [LTMAIN]]
++
++Generate a system-specific libtool script.
++
++    --debug                enable verbose shell tracing
++    --disable-shared       do not build shared libraries
++    --disable-static       do not build static libraries
++    --disable-fast-install do not optimize for fast installation
++    --enable-dlopen        enable dlopen support
++    --enable-win32-dll     enable building dlls on win32 hosts
++    --help                 display this help and exit
++    --no-verify            do not verify that HOST is a valid host type
++-o, --output=FILE          specify the output file [default=$default_ofile]
++    --quiet                same as \`--silent'
++    --silent               do not print informational messages
++    --srcdir=DIR           find \`config.guess' in DIR
++    --version              output version information and exit
++    --with-gcc             assume that the GNU C compiler will be used
++    --with-gnu-ld          assume that the C compiler uses the GNU linker
++    --disable-lock         disable file locking
++    --cache-file=FILE      configure cache file
++
++LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
++that provides basic libtool functionality.
++
++HOST is the canonical host system name [default=guessed].
++EOM
++  exit 0
++  ;;
++
++  --debug)
++    echo "$progname: enabling shell trace mode"
++    set -x
++    ;;
++
++  --disable-shared) enable_shared=no ;;
++
++  --disable-static) enable_static=no ;;
++
++  --disable-fast-install) enable_fast_install=no ;;
++
++  --enable-dlopen) enable_dlopen=yes ;;
++
++  --enable-win32-dll) enable_win32_dll=yes ;;
++
++  --quiet | --silent) silent=yes ;;
++
++  --srcdir) prev=srcdir ;;
++  --srcdir=*) srcdir="$optarg" ;;
++
++  --no-verify) verify_host=no ;;
++
++  --output | -o) prev=ofile ;;
++  --output=*) ofile="$optarg" ;;
++
++  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"; exit 0 ;;
++
++  --with-gcc) with_gcc=yes ;;
++  --with-gnu-ld) with_gnu_ld=yes ;;
++
++  --disable-lock) need_locks=no ;;
++
++  --cache-file=*) cache_file="$optarg" ;;
++
++  -*)
++    echo "$progname: unrecognized option \`$option'" 1>&2
++    echo "$help" 1>&2
++    exit 1
++    ;;
++
++  *)
++    if test -z "$ltmain"; then
++      ltmain="$option"
++    elif test -z "$host"; then
++# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
++#      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
++#        echo "$progname: warning \`$option' is not a valid host type" 1>&2
++#      fi
++      host="$option"
++    else
++      echo "$progname: too many arguments" 1>&2
++      echo "$help" 1>&2
++      exit 1
++    fi ;;
++  esac
++done
++
++if test -z "$ltmain"; then
++  echo "$progname: you must specify a LTMAIN file" 1>&2
++  echo "$help" 1>&2
++  exit 1
++fi
++
++if test ! -f "$ltmain"; then
++  echo "$progname: \`$ltmain' does not exist" 1>&2
++  echo "$help" 1>&2
++  exit 1
++fi
++
++# Quote any args containing shell metacharacters.
++ltconfig_args=
++for arg
++do
++  case "$arg" in
++  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
++  ltconfig_args="$ltconfig_args '$arg'" ;;
++  *) ltconfig_args="$ltconfig_args $arg" ;;
++  esac
++done
++
++# A relevant subset of AC_INIT.
++
++# File descriptor usage:
++# 0 standard input
++# 1 file creation
++# 2 errors and warnings
++# 3 some systems may open it to /dev/tty
++# 4 used on the Kubota Titan
++# 5 compiler messages saved in config.log
++# 6 checking for... messages and results
++if test "$silent" = yes; then
++  exec 6>/dev/null
++else
++  exec 6>&1
++fi
++exec 5>>./config.log
++
++# NLS nuisances.
++# Only set LANG and LC_ALL to C if already set.
++# These must not be set unconditionally because not all systems understand
++# e.g. LANG=C (notably SCO).
++if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi
++if test "X${LANG+set}"   = Xset; then LANG=C;   export LANG;   fi
++
++if test -n "$cache_file" && test -r "$cache_file"; then
++  echo "loading cache $cache_file within ltconfig"
++  . $cache_file
++fi
++
++if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
++  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
++  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
++    ac_n= ac_c='
++' ac_t='	'
++  else
++    ac_n=-n ac_c= ac_t=
++  fi
++else
++  ac_n= ac_c='\c' ac_t=
++fi
++
++if test -z "$srcdir"; then
++  # Assume the source directory is the same one as the path to LTMAIN.
++  srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'`
++  test "$srcdir" = "$ltmain" && srcdir=.
++fi
++
++trap "$rm conftest*; exit 1" 1 2 15
++if test "$verify_host" = yes; then
++  # Check for config.guess and config.sub.
++  ac_aux_dir=
++  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
++    if test -f $ac_dir/config.guess; then
++      ac_aux_dir=$ac_dir
++      break
++    fi
++  done
++  if test -z "$ac_aux_dir"; then
++    echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
++    echo "$help" 1>&2
++    exit 1
++  fi
++  ac_config_guess=$ac_aux_dir/config.guess
++  ac_config_sub=$ac_aux_dir/config.sub
++
++  # Make sure we can run config.sub.
++  if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
++  else
++    echo "$progname: cannot run $ac_config_sub" 1>&2
++    echo "$help" 1>&2
++    exit 1
++  fi
++
++  echo $ac_n "checking host system type""... $ac_c" 1>&6
++
++  host_alias=$host
++  case "$host_alias" in
++  "")
++    if host_alias=`$SHELL $ac_config_guess`; then :
++    else
++      echo "$progname: cannot guess host type; you must specify one" 1>&2
++      echo "$help" 1>&2
++      exit 1
++    fi ;;
++  esac
++  host=`$SHELL $ac_config_sub $host_alias`
++  echo "$ac_t$host" 1>&6
++
++  # Make sure the host verified.
++  test -z "$host" && exit 1
++
++elif test -z "$host"; then
++  echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
++  echo "$help" 1>&2
++  exit 1
++else
++  host_alias=$host
++fi
++
++# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
++case "$host_os" in
++linux-gnu*) ;;
++linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
++esac
++
++host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++case "$host_os" in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR cru $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++# Set a sane default for `AR'.
++test -z "$AR" && AR=ar
++
++# Set a sane default for `OBJDUMP'.
++test -z "$OBJDUMP" && OBJDUMP=objdump
++
++# If RANLIB is not set, then run the test.
++if test "${RANLIB+set}" != "set"; then
++  result=no
++
++  echo $ac_n "checking for ranlib... $ac_c" 1>&6
++  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++  for dir in $PATH; do
++    test -z "$dir" && dir=.
++    if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then
++      RANLIB="ranlib"
++      result="ranlib"
++      break
++    fi
++  done
++  IFS="$save_ifs"
++
++  echo "$ac_t$result" 1>&6
++fi
++
++if test -n "$RANLIB"; then
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++fi
++
++# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$AS" && AS=as
++
++# Check to see if we are using GCC.
++if test "$with_gcc" != yes || test -z "$CC"; then
++  # If CC is not set, then try to find GCC or a usable CC.
++  if test -z "$CC"; then
++    echo $ac_n "checking for gcc... $ac_c" 1>&6
++    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++    for dir in $PATH; do
++      test -z "$dir" && dir=.
++      if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then
++	CC="gcc"
++	break
++      fi
++    done
++    IFS="$save_ifs"
++
++    if test -n "$CC"; then
++      echo "$ac_t$CC" 1>&6
++    else
++      echo "$ac_t"no 1>&6
++    fi
++  fi
++
++  # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
++  if test -z "$CC"; then
++    echo $ac_n "checking for cc... $ac_c" 1>&6
++    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++    cc_rejected=no
++    for dir in $PATH; do
++      test -z "$dir" && dir=.
++      if test -f $dir/cc || test -f $dir/cc$ac_exeext; then
++	if test "$dir/cc" = "/usr/ucb/cc"; then
++	  cc_rejected=yes
++	  continue
++	fi
++	CC="cc"
++	break
++      fi
++    done
++    IFS="$save_ifs"
++    if test $cc_rejected = yes; then
++      # We found a bogon in the path, so make sure we never use it.
++      set dummy $CC
++      shift
++      if test $# -gt 0; then
++	# We chose a different compiler from the bogus one.
++	# However, it has the same name, so the bogon will be chosen
++	# first if we set CC to just the name; use the full file name.
++	shift
++	set dummy "$dir/cc" "$@"
++	shift
++	CC="$@"
++      fi
++    fi
++
++    if test -n "$CC"; then
++      echo "$ac_t$CC" 1>&6
++    else
++      echo "$ac_t"no 1>&6
++    fi
++
++    if test -z "$CC"; then
++      echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
++      exit 1
++    fi
++  fi
++
++  # Now see if the compiler is really GCC.
++  with_gcc=no
++  echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
++  echo "$progname:581: checking whether we are using GNU C" >&5
++
++  $rm conftest.c
++  cat > conftest.c <<EOF
++#ifdef __GNUC__
++  yes;
++#endif
++EOF
++  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++    with_gcc=yes
++  fi
++  $rm conftest.c
++  echo "$ac_t$with_gcc" 1>&6
++fi
++
++# Allow CC to be a program name with arguments.
++set dummy $CC
++compiler="$2"
++
++echo $ac_n "checking for object suffix... $ac_c" 1>&6
++$rm conftest*
++echo 'int i = 1;' > conftest.c
++echo "$progname:603: checking for object suffix" >& 5
++if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
++  # Append any warnings to the config.log.
++  cat conftest.err 1>&5
++
++  for ac_file in conftest.*; do
++    case $ac_file in
++    *.c) ;;
++    *) objext=`echo $ac_file | sed -e s/conftest.//` ;;
++    esac
++  done
++else
++  cat conftest.err 1>&5
++  echo "$progname: failed program was:" >&5
++  cat conftest.c >&5
++fi
++$rm conftest*
++echo "$ac_t$objext" 1>&6
++
++echo $ac_n "checking for executable suffix... $ac_c" 1>&6
++if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_cv_exeext="no"
++  $rm conftest*
++  echo 'main () { return 0; }' > conftest.c
++  echo "$progname:629: checking for executable suffix" >& 5
++  if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
++    # Append any warnings to the config.log.
++    cat conftest.err 1>&5
++
++    for ac_file in conftest.*; do
++      case $ac_file in
++      *.c | *.err | *.$objext ) ;;
++      *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
++      esac
++    done
++  else
++    cat conftest.err 1>&5
++    echo "$progname: failed program was:" >&5
++    cat conftest.c >&5
++  fi
++  $rm conftest*
++fi
++if test "X$ac_cv_exeext" = Xno; then
++  exeext=""
++else
++  exeext="$ac_cv_exeext"
++fi
++echo "$ac_t$ac_cv_exeext" 1>&6
++
++echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
++pic_flag=
++special_shlib_compile_flags=
++wl=
++link_static_flag=
++no_builtin_flag=
++
++if test "$with_gcc" = yes; then
++  wl='-Wl,'
++  link_static_flag='-static'
++
++  case "$host_os" in
++  beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
++    # PIC is the default for these OSes.
++    ;;
++  aix*)
++    # Below there is a dirty hack to force normal static linking with -ldl
++    # The problem is because libdl dynamically linked with both libc and
++    # libC (AIX C++ library), which obviously doesn't included in libraries
++    # list by gcc. This cause undefined symbols with -static flags.
++    # This hack allows C programs to be linked with "-static -ldl", but
++    # we not sure about C++ programs.
++    link_static_flag="$link_static_flag ${wl}-lC"
++    ;;
++  cygwin* | mingw* | os2*)
++    # We can build DLLs from non-PIC.
++    ;;
++  amigaos*)
++    # FIXME: we need at least 68020 code to build shared libraries, but
++    # adding the `-m68020' flag to GCC prevents building anything better,
++    # like `-m68040'.
++    pic_flag='-m68020 -resident32 -malways-restore-a4'
++    ;;
++  sysv4*MP*)
++    if test -d /usr/nec; then
++       pic_flag=-Kconform_pic
++    fi
++    ;;
++  *)
++    pic_flag='-fPIC'
++    ;;
++  esac
++else
++  # PORTME Check for PIC flags for the system compiler.
++  case "$host_os" in
++  aix3* | aix4*)
++    # All AIX code is PIC.
++    link_static_flag='-bnso -bI:/lib/syscalls.exp'
++    ;;
++
++  hpux9* | hpux10* | hpux11*)
++    # Is there a better link_static_flag that works with the bundled CC?
++    wl='-Wl,'
++    link_static_flag="${wl}-a ${wl}archive"
++    pic_flag='+Z'
++    ;;
++
++  irix5* | irix6*)
++    wl='-Wl,'
++    link_static_flag='-non_shared'
++    # PIC (with -KPIC) is the default.
++    ;;
++
++  cygwin* | mingw* | os2*)
++    # We can build DLLs from non-PIC.
++    ;;
++
++  osf3* | osf4* | osf5*)
++    # All OSF/1 code is PIC.
++    wl='-Wl,'
++    link_static_flag='-non_shared'
++    ;;
++
++  sco3.2v5*)
++    pic_flag='-Kpic'
++    link_static_flag='-dn'
++    special_shlib_compile_flags='-belf'
++    ;;
++
++  solaris*)
++    pic_flag='-KPIC'
++    link_static_flag='-Bstatic'
++    wl='-Wl,'
++    ;;
++
++  sunos4*)
++    pic_flag='-PIC'
++    link_static_flag='-Bstatic'
++    wl='-Qoption ld '
++    ;;
++
++  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++    pic_flag='-KPIC'
++    link_static_flag='-Bstatic'
++    wl='-Wl,'
++    ;;
++
++  uts4*)
++    pic_flag='-pic'
++    link_static_flag='-Bstatic'
++    ;;
++  sysv4*MP*)
++    if test -d /usr/nec ;then
++      pic_flag='-Kconform_pic'
++      link_static_flag='-Bstatic'
++    fi
++    ;;
++  *)
++    can_build_shared=no
++    ;;
++  esac
++fi
++
++if test -n "$pic_flag"; then
++  echo "$ac_t$pic_flag" 1>&6
++
++  # Check to make sure the pic_flag actually works.
++  echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
++  $rm conftest*
++  echo "int some_variable = 0;" > conftest.c
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS $pic_flag -DPIC"
++  echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5
++  if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
++    # Append any warnings to the config.log.
++    cat conftest.err 1>&5
++    
++    case "$host_os" in
++    hpux9* | hpux10* | hpux11*)
++      # On HP-UX, both CC and GCC only warn that PIC is supported... then they
++      # create non-PIC objects.  So, if there were any warnings, we assume that
++      # PIC is not supported.
++      if test -s conftest.err; then
++	echo "$ac_t"no 1>&6
++	can_build_shared=no
++	pic_flag=
++      else
++	echo "$ac_t"yes 1>&6
++	pic_flag=" $pic_flag"
++      fi
++      ;;
++    *)
++      echo "$ac_t"yes 1>&6
++      pic_flag=" $pic_flag"
++      ;;
++    esac
++  else
++    # Append any errors to the config.log.
++    cat conftest.err 1>&5
++    can_build_shared=no
++    pic_flag=
++    echo "$ac_t"no 1>&6
++  fi
++  CFLAGS="$save_CFLAGS"
++  $rm conftest*
++else
++  echo "$ac_t"none 1>&6
++fi
++
++# Check to see if options -o and -c are simultaneously supported by compiler
++echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6
++$rm -r conftest 2>/dev/null
++mkdir conftest
++cd conftest
++$rm conftest*
++echo "int some_variable = 0;" > conftest.c
++mkdir out
++# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
++# that will create temporary files in the current directory regardless of
++# the output directory.  Thus, making CWD read-only will cause this test
++# to fail, enabling locking or at least warning the user not to do parallel
++# builds.
++chmod -w .
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -o out/conftest2.o"
++echo "$progname:829: checking if $compiler supports -c -o file.o" >&5
++if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
++
++  # The compiler can only warn and ignore the option if not recognized
++  # So say no if there are warnings
++    if test -s out/conftest.err; then
++      echo "$ac_t"no 1>&6
++      compiler_c_o=no
++    else
++      echo "$ac_t"yes 1>&6
++      compiler_c_o=yes
++    fi
++else
++  # Append any errors to the config.log.
++  cat out/conftest.err 1>&5
++  compiler_c_o=no
++  echo "$ac_t"no 1>&6
++fi
++CFLAGS="$save_CFLAGS"
++chmod u+w .
++$rm conftest* out/*
++rmdir out
++cd ..
++rmdir conftest
++$rm -r conftest 2>/dev/null
++
++if test x"$compiler_c_o" = x"yes"; then
++  # Check to see if we can write to a .lo
++  echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6
++  $rm conftest*
++  echo "int some_variable = 0;" > conftest.c
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -c -o conftest.lo"
++  echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5
++if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
++
++    # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++      if test -s conftest.err; then
++	echo "$ac_t"no 1>&6
++	compiler_o_lo=no
++      else
++	echo "$ac_t"yes 1>&6
++	compiler_o_lo=yes
++      fi
++  else
++    # Append any errors to the config.log.
++    cat conftest.err 1>&5
++    compiler_o_lo=no
++    echo "$ac_t"no 1>&6
++  fi
++  CFLAGS="$save_CFLAGS"
++  $rm conftest*
++else
++  compiler_o_lo=no
++fi
++
++# Check to see if we can do hard links to lock some files if needed
++hard_links="nottested"
++if test "$compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$ac_t$hard_links" 1>&6
++  $rm conftest*
++  if test "$hard_links" = no; then
++    echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++if test "$with_gcc" = yes; then
++  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
++  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
++  $rm conftest*
++  echo "int some_variable = 0;" > conftest.c
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
++  echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++  if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
++
++    # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++      if test -s conftest.err; then
++	echo "$ac_t"no 1>&6
++	compiler_rtti_exceptions=no
++      else
++	echo "$ac_t"yes 1>&6
++	compiler_rtti_exceptions=yes
++      fi
++  else
++    # Append any errors to the config.log.
++    cat conftest.err 1>&5
++    compiler_rtti_exceptions=no
++    echo "$ac_t"no 1>&6
++  fi
++  CFLAGS="$save_CFLAGS"
++  $rm conftest*
++
++  if test "$compiler_rtti_exceptions" = "yes"; then
++    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
++  else
++    no_builtin_flag=' -fno-builtin'
++  fi
++  
++fi
++
++# Check for any special shared library compilation flags.
++if test -n "$special_shlib_compile_flags"; then
++  echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
++  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$special_shlib_compile_flags[ 	]" >/dev/null; then :
++  else
++    echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
++    can_build_shared=no
++  fi
++fi
++
++echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
++$rm conftest*
++echo 'main(){return(0);}' > conftest.c
++save_LDFLAGS="$LDFLAGS"
++LDFLAGS="$LDFLAGS $link_static_flag"
++echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5
++if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++  echo "$ac_t$link_static_flag" 1>&6
++else
++  echo "$ac_t"none 1>&6
++  link_static_flag=
++fi
++LDFLAGS="$save_LDFLAGS"
++$rm conftest*
++
++if test -z "$LN_S"; then
++  # Check to see if we can use ln -s, or we need hard links.
++  echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
++  $rm conftest.dat
++  if ln -s X conftest.dat 2>/dev/null; then
++    $rm conftest.dat
++    LN_S="ln -s"
++  else
++    LN_S=ln
++  fi
++  if test "$LN_S" = "ln -s"; then
++    echo "$ac_t"yes 1>&6
++  else
++    echo "$ac_t"no 1>&6
++  fi
++fi
++
++# Make sure LD is an absolute path.
++if test -z "$LD"; then
++  ac_prog=ld
++  if test "$with_gcc" = yes; then
++    # Check if gcc -print-prog-name=ld gives a path.
++    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
++    echo "$progname:991: checking for ld used by GCC" >&5
++    ac_prog=`($CC -print-prog-name=ld) 2>&5`
++    case "$ac_prog" in
++    # Accept absolute paths.
++    [\\/]* | [A-Za-z]:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the path of ld
++      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++    "")
++      # If it fails, then pretend we are not using GCC.
++      ac_prog=ld
++      ;;
++    *)
++      # If it is relative, then search for the first ld in PATH.
++      with_gnu_ld=unknown
++      ;;
++    esac
++  elif test "$with_gnu_ld" = yes; then
++    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
++    echo "$progname:1015: checking for GNU ld" >&5
++  else
++    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
++    echo "$progname:1018: checking for non-GNU ld" >&5
++  fi
++
++  if test -z "$LD"; then
++    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++    for ac_dir in $PATH; do
++      test -z "$ac_dir" && ac_dir=.
++      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++	LD="$ac_dir/$ac_prog"
++	# Check to see if the program is GNU ld.  I'd rather use --version,
++	# but apparently some GNU ld's only accept -v.
++	# Break only if it was the GNU/non-GNU ld that we prefer.
++	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
++	  test "$with_gnu_ld" != no && break
++	else
++	  test "$with_gnu_ld" != yes && break
++	fi
++      fi
++    done
++    IFS="$ac_save_ifs"
++  fi
++
++  if test -n "$LD"; then
++    echo "$ac_t$LD" 1>&6
++  else
++    echo "$ac_t"no 1>&6
++  fi
++
++  if test -z "$LD"; then
++    echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
++    exit 1
++  fi
++fi
++
++# Check to see if it really is or is not GNU ld.
++echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
++# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++  with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi
++echo "$ac_t$with_gnu_ld" 1>&6
++
++# See if the linker supports building shared libraries.
++echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
++
++allow_undefined_flag=
++no_undefined_flag=
++need_lib_prefix=unknown
++need_version=unknown
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++archive_cmds=
++archive_expsym_cmds=
++old_archive_from_new_cmds=
++export_dynamic_flag_spec=
++whole_archive_flag_spec=
++thread_safe_flag_spec=
++hardcode_libdir_flag_spec=
++hardcode_libdir_separator=
++hardcode_direct=no
++hardcode_minus_L=no
++hardcode_shlibpath_var=unsupported
++runpath_var=
++always_export_symbols=no
++export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
++# include_expsyms should be a list of space-separated symbols to be *always*
++# included in the symbol list
++include_expsyms=
++# exclude_expsyms can be an egrep regular expression of symbols to exclude
++# it will be wrapped by ` (' and `)$', so one must not match beginning or
++# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++# as well as any symbol that contains `d'.
++exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++# platforms (ab)use it in PIC code, but their linkers get confused if
++# the symbol is explicitly referenced.  Since portable code cannot
++# rely on this symbol name, it's probably fine to never include it in
++# preloaded symbol tables.
++
++case "$host_os" in
++cygwin* | mingw*)
++  # FIXME: the MSVC++ port hasn't been tested in a loooong time
++  # When not using gcc, we currently assume that we are using
++  # Microsoft Visual C++.
++  if test "$with_gcc" != yes; then
++    with_gnu_ld=no
++  fi
++  ;;
++
++esac
++
++ld_shlibs=yes
++if test "$with_gnu_ld" = yes; then
++  # If archive_cmds runs LD, not CC, wlarc should be empty
++  wlarc='${wl}'
++
++  # See if GNU ld supports shared libraries.
++  case "$host_os" in
++  aix3* | aix4*)
++    # On AIX, the GNU linker is very broken
++    ld_shlibs=no
++    cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++
++    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++    # that the semantics of dynamic libraries on AmigaOS, at least up
++    # to version 4, is to share data among multiple programs linked
++    # with the same dynamic library.  Since this doesn't match the
++    # behavior of shared libraries on other platforms, we can use
++    # them.
++    ld_shlibs=no
++    ;;
++
++  beos*)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      allow_undefined_flag=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  cygwin* | mingw*)
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec='-L$libdir'
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++
++    # Extract the symbol export list from an `--export-all' def file,
++    # then regenerate the def file from the symbol export list, so that
++    # the compiled dll only exports the symbol export list.
++    # Be careful not to strip the DATA tag left by newer dlltools.
++    export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
++      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
++      $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs $convenience~
++      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $objdir/$soname-def > $export_symbols'
++
++    # If DATA tags from a recent dlltool are present, honour them!
++    archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
++      _lt_hint=1;
++      cat $export_symbols | while read symbol; do
++        set dummy \$symbol;
++        case \$# in
++          2) echo "	\$2 @ \$_lt_hint ; " >> $objdir/$soname-def;;
++          *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;;
++        esac;
++	_lt_hint=`expr 1 + \$_lt_hint`;
++      done~
++      test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
++      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
++      $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
++      $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
++      $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
++
++      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
++      # can we support soname and/or expsyms with a.out? -oliva
++    fi
++    ;;
++
++  solaris* | sysv5*)
++    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
++      ld_shlibs=no
++      cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;      
++
++  sunos4*)
++    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
++    wlarc=
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++  esac
++
++  if test "$ld_shlibs" = yes; then
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    case $host_os in
++    cygwin* | mingw*)
++      # dlltool doesn't understand --whole-archive et. al.
++      whole_archive_flag_spec=
++      ;;
++    *)
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
++        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++        whole_archive_flag_spec=
++      fi
++      ;;
++    esac
++  fi
++else
++  # PORTME fill in a description of your system's linker (not GNU ld)
++  case "$host_os" in
++  aix3*)
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++    archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
++    # Note: this linker hardcodes the directories in LIBPATH if there
++    # are no directories specified by -L.
++    hardcode_minus_L=yes
++    if test "$with_gcc" = yes && test -z "$link_static_flag"; then
++      # Neither direct hardcoding nor static linking is supported with a
++      # broken collect2.
++      hardcode_direct=unsupported
++    fi
++    ;;
++
++  aix4*)
++    hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
++    hardcode_libdir_separator=':'
++    if test "$with_gcc" = yes; then
++      collect2name=`${CC} -print-prog-name=collect2`
++      if test -f "$collect2name" && \
++	 strings "$collect2name" | grep resolve_lib_name >/dev/null
++      then
++	# We have reworked collect2
++	hardcode_direct=yes
++      else
++	# We have old collect2
++	hardcode_direct=unsupported
++	# It fails to find uninstalled libraries when the uninstalled
++	# path is not listed in the libpath.  Setting hardcode_minus_L
++	# to unsupported forces relinking
++	hardcode_minus_L=yes
++	hardcode_libdir_flag_spec='-L$libdir'
++	hardcode_libdir_separator=
++      fi
++      shared_flag='-shared'
++    else
++      shared_flag='${wl}-bM:SRE'
++      hardcode_direct=yes
++    fi
++    allow_undefined_flag=' ${wl}-berok'
++    archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
++    archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
++    case "$host_os" in aix4.[01]|aix4.[01].*)
++      # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
++      always_export_symbols=yes ;;
++    esac
++   ;;
++
++  amigaos*)
++    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    # see comment about different semantics on the GNU ld section
++    ld_shlibs=no
++    ;;
++
++  cygwin* | mingw*)
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec=' '
++    allow_undefined_flag=unsupported
++    # Tell ltmain to make .lib files, not .a files.
++    libext=lib
++    # FIXME: Setting linknames here is a bad hack.
++    archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++    # The linker will automatically build a .lib file if we build a DLL.
++    old_archive_from_new_cmds='true'
++    # FIXME: Should let the user specify the lib program.
++    old_archive_cmds='lib /OUT:$oldlib$oldobjs'
++    fix_srcfile_path='`cygpath -w $srcfile`'
++    ;;
++
++  freebsd1*)
++    ld_shlibs=no
++    ;;
++
++  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++  # support.  Future versions do this automatically, but an explicit c++rt0.o
++  # does not break anything, and helps significantly (at the cost of a little
++  # extra space).
++  freebsd2.2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++  freebsd2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++  freebsd*)
++    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  hpux9* | hpux10* | hpux11*)
++    case "$host_os" in
++    hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
++    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;;
++    esac
++    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_direct=yes
++    hardcode_minus_L=yes # Not in the search PATH, but as the default
++			 # location of the library.
++    export_dynamic_flag_spec='${wl}-E'
++    ;;
++
++  irix5* | irix6*)
++    if test "$with_gcc" = yes; then
++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++    else
++      archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'  # a.out
++    else
++      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts'      # ELF
++    fi
++    hardcode_libdir_flag_spec='${wl}-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  openbsd*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  os2*)
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    allow_undefined_flag=unsupported
++    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def'
++    old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
++    ;;
++
++  osf3*)
++    if test "$with_gcc" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++
++  osf4* | osf5*)  # As osf3* with the addition of the -msym flag
++    if test "$with_gcc" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++  rhapsody*)
++    archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flags_spec='-L$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++                                       
++  sco3.2v5*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_shlibpath_var=no
++    runpath_var=LD_RUN_PATH
++    hardcode_runpath_var=yes
++    ;;
++
++  solaris*)
++    no_undefined_flag=' -z text'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_shlibpath_var=no
++    case "$host_os" in
++    solaris2.[0-5] | solaris2.[0-5].*) ;;
++    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++    esac
++    ;;
++
++  sunos4*)
++    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4)
++    if test "x$host_vendor" = xsequent; then
++      # Use $CC to link under sequent, because it throws in some extra .o 
++      # files that make .init and .fini sections work.
++      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts'
++    else
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    fi
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    hardcode_direct=no #Motorola manual says yes, but my tests say they lie 
++    ;;  
++
++  sysv4.3*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_shlibpath_var=no
++    export_dynamic_flag_spec='-Bexport'
++    ;;
++
++  sysv5*)
++    no_undefined_flag=' -z text'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
++    hardcode_libdir_flag_spec=
++    hardcode_shlibpath_var=no
++    runpath_var='LD_RUN_PATH'
++    ;;
++
++  uts4*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  dgux*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4*MP*)
++    if test -d /usr/nec; then
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++      hardcode_shlibpath_var=no
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ld_shlibs=yes
++    fi
++    ;;
++
++  sysv4.2uw2*)
++    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts'
++    hardcode_direct=yes
++    hardcode_minus_L=no
++    hardcode_shlibpath_var=no
++    hardcode_runpath_var=yes
++    runpath_var=LD_RUN_PATH
++    ;;
++
++  unixware7*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    ld_shlibs=no
++    ;;
++  esac
++fi
++echo "$ac_t$ld_shlibs" 1>&6
++test "$ld_shlibs" = no && can_build_shared=no
++
++if test -z "$NM"; then
++  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
++  case "$NM" in
++  [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path.
++  *)
++    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++    for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do
++      test -z "$ac_dir" && ac_dir=.
++      if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	  NM="$ac_dir/nm -B"
++	  break
++	elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	  NM="$ac_dir/nm -p"
++	  break
++	else
++	  NM=${NM="$ac_dir/nm"} # keep the first match, but
++	  continue # so that we can try to find one that supports BSD flags
++	fi
++      fi
++    done
++    IFS="$ac_save_ifs"
++    test -z "$NM" && NM=nm
++    ;;
++  esac
++  echo "$ac_t$NM" 1>&6
++fi
++
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
++
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
++
++# Define system-specific variables.
++case "$host_os" in
++aix*)
++  symcode='[BCDT]'
++  ;;
++cygwin* | mingw*)
++  symcode='[ABCDGISTW]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
++  ;;
++irix*)
++  symcode='[BCDEGRST]'
++  ;;
++solaris*)
++  symcode='[BDT]'
++  ;;
++sysv4)
++  symcode='[DFNSTU]'
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
++  symcode='[ABCDGISTW]'
++fi
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++  global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode\)[ 	][ 	]*\($ac_symprfx\)$sympat$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++  $rm conftest*
++  cat > conftest.c <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  echo "$progname:1653: checking if global_symbol_pipe works" >&5
++  if { (eval echo $progname:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if { echo "$progname:1657: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
++
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
++	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.c
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$global_symbol_to_cdecl"' < "$nlist" >> conftest.c'
++
++	  cat <<EOF >> conftest.c
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[] =
++{
++EOF
++	  sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.c
++	  cat <<\EOF >> conftest.c
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$objext conftstm.$objext
++	  save_LIBS="$LIBS"
++	  save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$objext"
++	  CFLAGS="$CFLAGS$no_builtin_flag"
++	  if { (eval echo $progname:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++	    pipe_works=yes
++	  else
++	    echo "$progname: failed program was:" >&5
++	    cat conftest.c >&5
++	  fi
++	  LIBS="$save_LIBS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&5
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&5
++      fi
++    else
++      echo "cannot run $global_symbol_pipe" >&5
++    fi
++  else
++    echo "$progname: failed program was:" >&5
++    cat conftest.c >&5
++  fi
++  $rm conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    global_symbol_pipe=
++  fi
++done
++if test "$pipe_works" = yes; then
++  echo "${ac_t}ok" 1>&6
++else
++  echo "${ac_t}failed" 1>&6
++fi
++
++if test -z "$global_symbol_pipe"; then
++  global_symbol_to_cdecl=
++fi
++
++# Check hardcoding attributes.
++echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
++   test -n "$runpath_var"; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$hardcode_shlibpath_var" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++echo "$ac_t$hardcode_action" 1>&6
++
++
++reload_flag=
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
++# PORTME Some linkers may need a different reload flag.
++reload_flag='-r'
++echo "$ac_t$reload_flag" 1>&6
++test -n "$reload_flag" && reload_flag=" $reload_flag"
++
++# PORTME Fill in your ld.so characteristics
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++file_magic_cmd=
++file_magic_test_file=
++deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [regex]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given egrep regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
++case "$host_os" in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}.so$major'
++  ;;
++
++aix4*)
++  version_type=linux
++  # AIX has no versioning support, so currently we can not hardcode correct
++  # soname into executable. Probably we can add versioning support to
++  # collect2, so additional links can be useful in future.
++  # We preserve .a as extension for shared libraries though AIX4.2
++  # and later linker supports .so
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
++  shlibpath_var=LIBPATH
++  deplibs_check_method=pass_all
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}.so'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  deplibs_check_method=pass_all
++  lt_cv_dlopen="load_add_on"
++  lt_cv_dlopen_libs=
++  lt_cv_dlopen_self=yes
++  ;;
++
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=/shlib/libc.so
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  export_dynamic_flag_spec=-rdynamic
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw*)
++  version_type=windows
++  need_version=no
++  need_lib_prefix=no
++  if test "$with_gcc" = yes; then
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a'
++  else
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
++  fi
++  dynamic_linker='Win32 ld.exe'
++  deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  file_magic_cmd='${OBJDUMP} -f'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  lt_cv_dlopen="LoadLibrary"
++  lt_cv_dlopen_libs=
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++  
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case "$version_type" in
++    freebsd-elf*)
++      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++      file_magic_cmd=/usr/bin/file
++      file_magic_test_file=`echo /usr/lib/libc.so*`
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      deplibs_check_method=unknown
++      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case "$host_os" in
++  freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  deplibs_check_method=pass_all
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  dynamic_linker="$host_os dld.sl"
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  shlibpath_var=SHLIB_PATH
++  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
++  soname_spec='${libname}${release}.sl$major'
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  case "$host_os" in
++  hpux10.20*)
++    # TODO:  Does this work for hpux-11 too?
++    deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++    file_magic_cmd=/usr/bin/file
++    file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
++  ;;
++
++irix5* | irix6*)
++  version_type=irix
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}.so.$major'
++  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
++  case "$host_os" in
++  irix5*)
++    libsuff= shlibsuff=
++    # this will be overridden with pass_all, but let us keep it just in case
++    deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
++    ;;
++  *)
++    case "$LD" in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=`echo /lib${libsuff}/libc.so*`
++  deplibs_check_method='pass_all'
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux-gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  deplibs_check_method=pass_all
++
++  if test -f /lib/ld.so.1; then
++    dynamic_linker='GNU ld.so'
++  else
++    # Only the GNU ld.so supports shared libraries on MkLinux.
++    case "$host_cpu" in
++    powerpc*) dynamic_linker=no ;;
++    *) dynamic_linker='Linux ld.so' ;;
++    esac
++  fi
++  ;;
++
++netbsd*)
++  version_type=sunos
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++    soname_spec='${libname}${release}.so$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++openbsd*)
++  version_type=sunos
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++    need_version=no
++  fi
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++os2*)
++  libname_spec='$name'
++  need_lib_prefix=no
++  library_names_spec='$libname.dll $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_version=no
++  soname_spec='${libname}${release}.so'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  # this will be overridden with pass_all, but let us keep it just in case
++  deplibs_check_method='file_magic COFF format alpha shared library'
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=/shlib/libc.so
++  deplibs_check_method='pass_all'
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++rhapsody*)
++  version_type=sunos
++  library_names_spec='${libname}.so'
++  soname_spec='${libname}.so'
++  shlibpath_var=DYLD_LIBRARY_PATH
++  deplibs_check_method=pass_all
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib"
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=/lib/libc.so
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case "$host_vendor" in
++    sequent)
++      file_magic_cmd='/bin/file'
++      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++      ;;
++    ncr)
++      deplibs_check_method='pass_all'
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
++      file_magic_cmd=/usr/bin/file
++      file_magic_test_file=`echo /usr/lib/libc.so*`
++      ;;
++  esac
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
++    soname_spec='$libname.so.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$ac_t$dynamic_linker" 1>&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++# Report the final consequences.
++echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
++
++# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
++# configure.in, otherwise build static only libraries.
++case "$host_os" in
++cygwin* | mingw* | os2*)
++  if test x$can_build_shared = xyes; then
++    test x$enable_win32_dll = xno && can_build_shared=no
++    echo "checking if package supports dlls... $can_build_shared" 1>&6
++  fi
++;;
++esac
++
++if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then
++  case "$deplibs_check_method" in
++  "file_magic "*)
++    file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++    if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++       egrep "$file_magic_regex" > /dev/null; then
++      :
++    else
++      cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++    fi ;;
++  esac
++fi
++
++echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix4*)
++  test "$enable_shared" = yes && enable_static=no
++  ;;
++esac
++
++echo "$ac_t$enable_shared" 1>&6
++
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++
++echo "checking whether to build static libraries... $enable_static" 1>&6
++
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++echo $ac_n "checking for objdir... $ac_c" 1>&6
++rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  objdir=_libs
++fi
++rmdir .libs 2>/dev/null
++echo "$ac_t$objdir" 1>&6
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
++  lt_cv_dlopen=no lt_cv_dlopen_libs=
++echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
++echo "$progname:2248: checking for dlopen in -ldl" >&5
++ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldl  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2256 "ltconfig"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen();
++
++int main() {
++dlopen()
++; return 0; }
++EOF
++if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dlopen""... $ac_c" 1>&6
++echo "$progname:2288: checking for dlopen" >&5
++if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2293 "ltconfig"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++dlopen();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo $progname:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_dlopen=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_dlopen=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dlopen"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
++echo "$progname:2335: checking for dld_link in -ldld" >&5
++ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldld  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2343 "ltconfig"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dld_link();
++
++int main() {
++dld_link()
++; return 0; }
++EOF
++if { (eval echo $progname:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for shl_load""... $ac_c" 1>&6
++echo "$progname:2375: checking for shl_load" >&5
++if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2380 "ltconfig"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char shl_load();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++shl_load();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo $progname:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_shl_load=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_shl_load=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="shl_load"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
++echo "$progname:2423: checking for shl_load in -ldld" >&5
++ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldld  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2431 "ltconfig"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char shl_load();
++
++int main() {
++shl_load()
++; return 0; }
++EOF
++if { (eval echo $progname:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++fi
++
++    
++fi
++
++  
++fi
++
++
++fi
++
++fi
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  fi
++
++  case "$lt_cv_dlopen" in
++  dlopen)
++for ac_hdr in dlfcn.h; do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "$progname:2488: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2493 "ltconfig"
++#include <$ac_hdr>
++int fnord = 0;
++EOF
++ac_try="$ac_compile >/dev/null 2>conftest.out"
++{ (eval echo $progname:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++    if test "x$ac_cv_header_dlfcn_h" = xyes; then
++      CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++    fi
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++  echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
++echo "$progname:2526: checking whether a program can dlopen itself" >&5
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$cross_compiling" = yes; then
++    lt_cv_dlopen_self=cross
++  else
++    cat > conftest.c <<EOF
++#line 2534 "ltconfig"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++# define LTDL_GLOBAL	RTLD_GLOBAL
++#else
++# ifdef DL_GLOBAL
++#  define LTDL_GLOBAL	DL_GLOBAL
++# else
++#  define LTDL_GLOBAL	0
++# endif
++#endif
++
++/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LTDL_LAZY_OR_NOW
++# ifdef RTLD_LAZY
++#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
++# else
++#  ifdef DL_LAZY
++#   define LTDL_LAZY_OR_NOW	DL_LAZY
++#  else
++#   ifdef RTLD_NOW
++#    define LTDL_LAZY_OR_NOW	RTLD_NOW
++#   else
++#    ifdef DL_NOW
++#     define LTDL_LAZY_OR_NOW	DL_NOW
++#    else
++#     define LTDL_LAZY_OR_NOW	0
++#    endif
++#   endif
++#  endif
++# endif
++#endif
++
++fnord() { int i=42;}
++main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
++    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
++	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
++
++EOF
++if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++then
++  lt_cv_dlopen_self=yes
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  lt_cv_dlopen_self=no
++fi
++rm -fr conftest*
++fi
++
++fi
++
++echo "$ac_t""$lt_cv_dlopen_self" 1>&6
++
++  if test "$lt_cv_dlopen_self" = yes; then
++    LDFLAGS="$LDFLAGS $link_static_flag"
++  echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
++echo "$progname:2599: checking whether a statically linked program can dlopen itself" >&5
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$cross_compiling" = yes; then
++    lt_cv_dlopen_self_static=cross
++  else
++    cat > conftest.c <<EOF
++#line 2607 "ltconfig"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++# define LTDL_GLOBAL	RTLD_GLOBAL
++#else
++# ifdef DL_GLOBAL
++#  define LTDL_GLOBAL	DL_GLOBAL
++# else
++#  define LTDL_GLOBAL	0
++# endif
++#endif
++
++/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LTDL_LAZY_OR_NOW
++# ifdef RTLD_LAZY
++#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
++# else
++#  ifdef DL_LAZY
++#   define LTDL_LAZY_OR_NOW	DL_LAZY
++#  else
++#   ifdef RTLD_NOW
++#    define LTDL_LAZY_OR_NOW	RTLD_NOW
++#   else
++#    ifdef DL_NOW
++#     define LTDL_LAZY_OR_NOW	DL_NOW
++#    else
++#     define LTDL_LAZY_OR_NOW	0
++#    endif
++#   endif
++#  endif
++# endif
++#endif
++
++fnord() { int i=42;}
++main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
++    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
++    if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
++
++EOF
++if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++then
++  lt_cv_dlopen_self_static=yes
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  lt_cv_dlopen_self_static=no
++fi
++rm -fr conftest*
++fi
++
++fi
++
++echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
++fi
++    ;;
++  esac
++
++  case "$lt_cv_dlopen_self" in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case "$lt_cv_dlopen_self_static" in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++# Copy echo and quote the copy, instead of the original, because it is
++# used later.
++ltecho="$echo"
++if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++   ltecho="$CONFIG_SHELL \$0 --fallback-echo"
++fi
++LTSHELL="$SHELL"
++
++LTCONFIG_VERSION="$VERSION"
++
++# Only quote variables if we're using ltmain.sh.
++case "$ltmain" in
++*.sh)
++  # Now quote all the things that may contain metacharacters.
++  for var in ltecho old_CC old_CFLAGS old_CPPFLAGS \
++    old_LD old_LDFLAGS old_LIBS \
++    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS \
++    AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \
++    reload_flag reload_cmds wl \
++    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
++    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
++    library_names_spec soname_spec \
++    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
++    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \
++    file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \
++    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
++    hardcode_libdir_flag_spec hardcode_libdir_separator  \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++
++    case "$var" in
++    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case "$ltecho" in
++  *'\$0 --fallback-echo"')
++    ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++  trap "$rm \"$ofile\"; exit 1" 1 2 15
++  echo "creating $ofile"
++  $rm "$ofile"
++  cat <<EOF > "$ofile"
++#! $SHELL
++
++# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
++#
++# Copyright (C) 1996-1999 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# 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.
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="sed -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++### BEGIN LIBTOOL CONFIG
++EOF
++  cfgfile="$ofile"
++  ;;
++
++*)
++  # Double-quote the variables that need it (for aesthetics).
++  for var in old_CC old_CFLAGS old_CPPFLAGS \
++    old_LD old_LDFLAGS old_LIBS \
++    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS; do
++    eval "$var=\\\"\$var\\\""
++  done
++
++  # Just create a config file.
++  cfgfile="$ofile.cfg"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  echo "creating $cfgfile"
++  $rm "$cfgfile"
++  cat <<EOF > "$cfgfile"
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++EOF
++  ;;
++esac
++
++cat <<EOF >> "$cfgfile"
++# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++#
++# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
++# LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\
++# NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\
++# DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP AS=$old_AS \\
++#   $0$ltconfig_args
++#
++# Compiler and other test output produced by $progname, useful for
++# debugging $progname, is in ./config.log if it exists.
++
++# The version of $progname that generated this script.
++LTCONFIG_VERSION=$LTCONFIG_VERSION
++
++# Shell to use when invoking shell scripts.
++SHELL=$LTSHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$ltecho
++
++# The archiver.
++AR=$AR
++
++# The default C compiler.
++CC=$CC
++
++# The linker used to build libraries.
++LD=$LD
++
++# Whether we need hard or soft links.
++LN_S=$LN_S
++
++# A BSD-compatible nm program.
++NM=$NM
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$reload_flag
++reload_cmds=$reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$wl
++
++# Object file suffix (normally "o").
++objext="$objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$pic_flag
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$compiler_c_o
++
++# Can we write directly to a .lo ?
++compiler_o_lo=$compiler_o_lo
++
++# Must we lock files when doing compilation ?
++need_locks=$need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$link_static_flag
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$no_builtin_flag
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$whole_archive_flag_spec
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$thread_safe_flag_spec
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$RANLIB
++old_archive_cmds=$old_archive_cmds
++old_postinstall_cmds=$old_postinstall_cmds
++old_postuninstall_cmds=$old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$old_archive_from_new_cmds
++
++# Commands used to build and install a shared archive.
++archive_cmds=$archive_cmds
++archive_expsym_cmds=$archive_expsym_cmds
++postinstall_cmds=$postinstall_cmds
++postuninstall_cmds=$postuninstall_cmds
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$allow_undefined_flag
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$no_undefined_flag
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$global_symbol_to_cdecl
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$hardcode_libdir_separator
++
++# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$export_symbols_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$include_expsyms
++
++EOF
++
++case "$ltmain" in
++*.sh)
++  echo '### END LIBTOOL CONFIG' >> "$ofile"
++  echo >> "$ofile"
++  case "$host_os" in
++  aix3*)
++    cat <<\EOF >> "$ofile"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  # Append the ltmain.sh script.
++  sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++
++  chmod +x "$ofile"
++  ;;
++
++*)
++  # Compile the libtool program.
++  echo "FIXME: would compile $ltmain"
++  ;;
++esac
++
++test -n "$cache_file" || exit 0
++
++# AC_CACHE_SAVE
++trap '' 1 2 15
++cat > confcache <<\EOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs.  It is not useful on other systems.
++# If it contains results you don't want to keep, you may remove or edit it.
++#
++# By default, configure uses ./config.cache as the cache file,
++# creating it if it does not exist already.  You can give configure
++# the --cache-file=FILE option to use a different cache file; that is
++# what configure does when it calls configure scripts in
++# subdirectories, so they share the cache.
++# Giving --cache-file=/dev/null disables caching, for debugging configure.
++# config.status only pays attention to the cache file if you give it the
++# --recheck option to rerun configure.
++#
++EOF
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, don't put newlines in cache variables' values.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++(set) 2>&1 |
++  case `(ac_space=' '; set | grep ac_space) 2>&1` in
++  *ac_space=\ *)
++    # `set' does not quote correctly, so add quotes (double-quote substitution
++    # turns \\\\ into \\, and sed turns \\ into \).
++    sed -n \
++      -e "s/'/'\\\\''/g" \
++      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
++    ;;
++  *)
++    # `set' quotes correctly as required by POSIX, so do not add quotes.
++    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
++    ;;
++  esac >> confcache
++if cmp -s $cache_file confcache; then
++  :
++else
++  if test -w $cache_file; then
++    echo "updating cache $cache_file"
++    cat confcache > $cache_file
++  else
++    echo "not updating unwritable cache $cache_file"
++  fi
++fi
++rm -f confcache
++
++exit 0
++
++# Local Variables:
++# mode:shell-script
++# sh-indentation:2
++# End:
+--- metamail-2.7.orig/config/install-sh
++++ metamail-2.7/config/install-sh
+@@ -0,0 +1,251 @@
++#!/bin/sh
++#
++# install - install a program, script, or datafile
++# This comes from X11R5 (mit/util/scripts/install.sh).
++#
++# Copyright 1991 by the Massachusetts Institute of Technology
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of M.I.T. not be used in advertising or
++# publicity pertaining to distribution of the software without specific,
++# written prior permission.  M.I.T. makes no representations about the
++# suitability of this software for any purpose.  It is provided "as is"
++# without express or implied warranty.
++#
++# Calling this script install-sh is preferred over install.sh, to prevent
++# `make' implicit rules from creating a file called install from it
++# when there is no Makefile.
++#
++# This script is compatible with the BSD install script, but was written
++# from scratch.  It can only install one file at a time, a restriction
++# shared with many OS's install programs.
++
++
++# set DOITPROG to echo to test this script
++
++# Don't use :- since 4.3BSD and earlier shells don't like it.
++doit="${DOITPROG-}"
++
++
++# put in absolute paths if you don't have them in your path; or use env. vars.
++
++mvprog="${MVPROG-mv}"
++cpprog="${CPPROG-cp}"
++chmodprog="${CHMODPROG-chmod}"
++chownprog="${CHOWNPROG-chown}"
++chgrpprog="${CHGRPPROG-chgrp}"
++stripprog="${STRIPPROG-strip}"
++rmprog="${RMPROG-rm}"
++mkdirprog="${MKDIRPROG-mkdir}"
++
++transformbasename=""
++transform_arg=""
++instcmd="$mvprog"
++chmodcmd="$chmodprog 0755"
++chowncmd=""
++chgrpcmd=""
++stripcmd=""
++rmcmd="$rmprog -f"
++mvcmd="$mvprog"
++src=""
++dst=""
++dir_arg=""
++
++while [ x"$1" != x ]; do
++    case $1 in
++	-c) instcmd="$cpprog"
++	    shift
++	    continue;;
++
++	-d) dir_arg=true
++	    shift
++	    continue;;
++
++	-m) chmodcmd="$chmodprog $2"
++	    shift
++	    shift
++	    continue;;
++
++	-o) chowncmd="$chownprog $2"
++	    shift
++	    shift
++	    continue;;
++
++	-g) chgrpcmd="$chgrpprog $2"
++	    shift
++	    shift
++	    continue;;
++
++	-s) stripcmd="$stripprog"
++	    shift
++	    continue;;
++
++	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
++	    shift
++	    continue;;
++
++	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
++	    shift
++	    continue;;
++
++	*)  if [ x"$src" = x ]
++	    then
++		src=$1
++	    else
++		# this colon is to work around a 386BSD /bin/sh bug
++		:
++		dst=$1
++	    fi
++	    shift
++	    continue;;
++    esac
++done
++
++if [ x"$src" = x ]
++then
++	echo "install:	no input file specified"
++	exit 1
++else
++	true
++fi
++
++if [ x"$dir_arg" != x ]; then
++	dst=$src
++	src=""
++	
++	if [ -d $dst ]; then
++		instcmd=:
++		chmodcmd=""
++	else
++		instcmd=mkdir
++	fi
++else
++
++# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
++# might cause directories to be created, which would be especially bad 
++# if $src (and thus $dsttmp) contains '*'.
++
++	if [ -f $src -o -d $src ]
++	then
++		true
++	else
++		echo "install:  $src does not exist"
++		exit 1
++	fi
++	
++	if [ x"$dst" = x ]
++	then
++		echo "install:	no destination specified"
++		exit 1
++	else
++		true
++	fi
++
++# If destination is a directory, append the input filename; if your system
++# does not like double slashes in filenames, you may need to add some logic
++
++	if [ -d $dst ]
++	then
++		dst="$dst"/`basename $src`
++	else
++		true
++	fi
++fi
++
++## this sed command emulates the dirname command
++dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++
++# Make sure that the destination directory exists.
++#  this part is taken from Noah Friedman's mkinstalldirs script
++
++# Skip lots of stat calls in the usual case.
++if [ ! -d "$dstdir" ]; then
++defaultIFS='	
++'
++IFS="${IFS-${defaultIFS}}"
++
++oIFS="${IFS}"
++# Some sh's can't handle IFS=/ for some reason.
++IFS='%'
++set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
++IFS="${oIFS}"
++
++pathcomp=''
++
++while [ $# -ne 0 ] ; do
++	pathcomp="${pathcomp}${1}"
++	shift
++
++	if [ ! -d "${pathcomp}" ] ;
++        then
++		$mkdirprog "${pathcomp}"
++	else
++		true
++	fi
++
++	pathcomp="${pathcomp}/"
++done
++fi
++
++if [ x"$dir_arg" != x ]
++then
++	$doit $instcmd $dst &&
++
++	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
++	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
++	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
++	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
++else
++
++# If we're going to rename the final executable, determine the name now.
++
++	if [ x"$transformarg" = x ] 
++	then
++		dstfile=`basename $dst`
++	else
++		dstfile=`basename $dst $transformbasename | 
++			sed $transformarg`$transformbasename
++	fi
++
++# don't allow the sed command to completely eliminate the filename
++
++	if [ x"$dstfile" = x ] 
++	then
++		dstfile=`basename $dst`
++	else
++		true
++	fi
++
++# Make a temp file name in the proper directory.
++
++	dsttmp=$dstdir/#inst.$$#
++
++# Move or copy the file name to the temp name
++
++	$doit $instcmd $src $dsttmp &&
++
++	trap "rm -f ${dsttmp}" 0 &&
++
++# and set any options; do chmod last to preserve setuid bits
++
++# If any of these fail, we abort the whole thing.  If we want to
++# ignore errors from any of these, just make sure not to ignore
++# errors from the above "$doit $instcmd $src $dsttmp" command.
++
++	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
++	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
++	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
++	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
++
++# Now rename the file to the real destination.
++
++	$doit $rmcmd -f $dstdir/$dstfile &&
++	$doit $mvcmd $dsttmp $dstdir/$dstfile 
++
++fi &&
++
++
++exit 0
+--- metamail-2.7.orig/config/ltmain.sh
++++ metamail-2.7/config/ltmain.sh
+@@ -0,0 +1,5107 @@
++# ltmain.sh - Provide generalized library-building support services.
++# NOTE: Changing this file will not affect anything until you rerun configure.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# 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.
++
++# Check that we have a working $echo.
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell, and then maybe $echo will work.
++  exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
++# The name of this program.
++progname=`$echo "$0" | ${SED} 's%^.*/%%'`
++modename="$progname"
++
++# Constants.
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION=1.4.3
++TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)"
++
++default_mode=
++help="Try \`$progname --help' for more information."
++magic="%%%MAGIC variable%%%"
++mkdir="mkdir"
++mv="mv -f"
++rm="rm -f"
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed="${SED}"' -e 1s/^X//'
++sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
++# test EBCDIC or ASCII                                                         
++case `echo A|od -x` in                                                         
++ *[Cc]1*) # EBCDIC based system                                                
++  SP2NL="tr '\100' '\n'"                                                       
++  NL2SP="tr '\r\n' '\100\100'"                                                 
++  ;;                                                                           
++ *) # Assume ASCII based system                                                
++  SP2NL="tr '\040' '\012'"                                                     
++  NL2SP="tr '\015\012' '\040\040'"                                             
++  ;;                                                                           
++esac                                                                           
++
++# NLS nuisances.
++# Only set LANG and LC_ALL to C if already set.
++# These must not be set unconditionally because not all systems understand
++# e.g. LANG=C (notably SCO).
++# We save the old values to restore during execute mode.
++if test "${LC_ALL+set}" = set; then
++  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
++fi
++if test "${LANG+set}" = set; then
++  save_LANG="$LANG"; LANG=C; export LANG
++fi
++
++# Make sure IFS has a sensible default
++: ${IFS=" 	"}
++
++if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
++  echo "$modename: not configured to build any kind of library" 1>&2
++  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++  exit 1
++fi
++
++# Global variables.
++mode=$default_mode
++nonopt=
++prev=
++prevopt=
++run=
++show="$echo"
++show_help=
++execute_dlfiles=
++lo2o="s/\\.lo\$/.${objext}/"
++o2lo="s/\\.${objext}\$/.lo/"
++
++# Parse our command line options once, thoroughly.
++while test $# -gt 0
++do
++  arg="$1"
++  shift
++
++  case $arg in
++  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) optarg= ;;
++  esac
++
++  # If the previous option needs an argument, assign it.
++  if test -n "$prev"; then
++    case $prev in
++    execute_dlfiles)
++      execute_dlfiles="$execute_dlfiles $arg"
++      ;;
++    *)
++      eval "$prev=\$arg"
++      ;;
++    esac
++
++    prev=
++    prevopt=
++    continue
++  fi
++
++  # Have we seen a non-optional argument yet?
++  case $arg in
++  --help)
++    show_help=yes
++    ;;
++
++  --version)
++    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
++    exit 0
++    ;;
++
++  --config)
++    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++    exit 0
++    ;;
++
++  --debug)
++    echo "$progname: enabling shell trace mode"
++    set -x
++    ;;
++
++  --dry-run | -n)
++    run=:
++    ;;
++
++  --features)
++    echo "host: $host"
++    if test "$build_libtool_libs" = yes; then
++      echo "enable shared libraries"
++    else
++      echo "disable shared libraries"
++    fi
++    if test "$build_old_libs" = yes; then
++      echo "enable static libraries"
++    else
++      echo "disable static libraries"
++    fi
++    exit 0
++    ;;
++
++  --finish) mode="finish" ;;
++
++  --mode) prevopt="--mode" prev=mode ;;
++  --mode=*) mode="$optarg" ;;
++
++  --preserve-dup-deps) duplicate_deps="yes" ;;
++
++  --quiet | --silent)
++    show=:
++    ;;
++
++  -dlopen)
++    prevopt="-dlopen"
++    prev=execute_dlfiles
++    ;;
++
++  -*)
++    $echo "$modename: unrecognized option \`$arg'" 1>&2
++    $echo "$help" 1>&2
++    exit 1
++    ;;
++
++  *)
++    nonopt="$arg"
++    break
++    ;;
++  esac
++done
++
++if test -n "$prevopt"; then
++  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
++  $echo "$help" 1>&2
++  exit 1
++fi
++
++# If this variable is set in any of the actions, the command in it
++# will be execed at the end.  This prevents here-documents from being
++# left over by shells.
++exec_cmd=
++
++if test -z "$show_help"; then
++
++  # Infer the operation mode.
++  if test -z "$mode"; then
++    case $nonopt in
++    *cc | *++ | gcc* | *-gcc* | g++* | xlc*)
++      mode=link
++      for arg
++      do
++	case $arg in
++	-c)
++	   mode=compile
++	   break
++	   ;;
++	esac
++      done
++      ;;
++    *db | *dbx | *strace | *truss)
++      mode=execute
++      ;;
++    *install*|cp|mv)
++      mode=install
++      ;;
++    *rm)
++      mode=uninstall
++      ;;
++    *)
++      # If we have no mode, but dlfiles were specified, then do execute mode.
++      test -n "$execute_dlfiles" && mode=execute
++
++      # Just use the default operation mode.
++      if test -z "$mode"; then
++	if test -n "$nonopt"; then
++	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
++	else
++	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
++	fi
++      fi
++      ;;
++    esac
++  fi
++
++  # Only execute mode is allowed to have -dlopen flags.
++  if test -n "$execute_dlfiles" && test "$mode" != execute; then
++    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
++    $echo "$help" 1>&2
++    exit 1
++  fi
++
++  # Change the help message to a mode-specific one.
++  generic_help="$help"
++  help="Try \`$modename --help --mode=$mode' for more information."
++
++  # These modes are in order of execution frequency so that they run quickly.
++  case $mode in
++  # libtool compile mode
++  compile)
++    modename="$modename: compile"
++    # Get the compilation command and the source file.
++    base_compile=
++    prev=
++    lastarg=
++    srcfile="$nonopt"
++    suppress_output=
++
++    user_target=no
++    for arg
++    do
++      case $prev in
++      "") ;;
++      xcompiler)
++	# Aesthetically quote the previous argument.
++	prev=
++	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++
++	case $arg in
++	# Double-quote args containing other shell metacharacters.
++	# Many Bourne shells cannot handle close brackets correctly
++	# in scan sets, so we specify it separately.
++	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++
++	# Add the previous argument to base_compile.
++	if test -z "$base_compile"; then
++	  base_compile="$lastarg"
++	else
++	  base_compile="$base_compile $lastarg"
++	fi
++	continue
++	;;
++      esac
++
++      # Accept any command-line options.
++      case $arg in
++      -o)
++	if test "$user_target" != "no"; then
++	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
++	  exit 1
++	fi
++	user_target=next
++	;;
++
++      -static)
++	build_old_libs=yes
++	continue
++	;;
++
++      -prefer-pic)
++	pic_mode=yes
++	continue
++	;;
++
++      -prefer-non-pic)
++	pic_mode=no
++	continue
++	;;
++
++      -Xcompiler)
++	prev=xcompiler
++	continue
++	;;
++
++      -Wc,*)
++	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
++	lastarg=
++	save_ifs="$IFS"; IFS=','
++	for arg in $args; do
++	  IFS="$save_ifs"
++
++	  # Double-quote args containing other shell metacharacters.
++	  # Many Bourne shells cannot handle close brackets correctly
++	  # in scan sets, so we specify it separately.
++	  case $arg in
++	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	    arg="\"$arg\""
++	    ;;
++	  esac
++	  lastarg="$lastarg $arg"
++	done
++	IFS="$save_ifs"
++	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
++
++	# Add the arguments to base_compile.
++	if test -z "$base_compile"; then
++	  base_compile="$lastarg"
++	else
++	  base_compile="$base_compile $lastarg"
++	fi
++	continue
++	;;
++      esac
++
++      case $user_target in
++      next)
++	# The next one is the -o target name
++	user_target=yes
++	continue
++	;;
++      yes)
++	# We got the output file
++	user_target=set
++	libobj="$arg"
++	continue
++	;;
++      esac
++
++      # Accept the current argument as the source file.
++      lastarg="$srcfile"
++      srcfile="$arg"
++
++      # Aesthetically quote the previous argument.
++
++      # Backslashify any backslashes, double quotes, and dollar signs.
++      # These are the only characters that are still specially
++      # interpreted inside of double-quoted scrings.
++      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
++
++      # Double-quote args containing other shell metacharacters.
++      # Many Bourne shells cannot handle close brackets correctly
++      # in scan sets, so we specify it separately.
++      case $lastarg in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	lastarg="\"$lastarg\""
++	;;
++      esac
++
++      # Add the previous argument to base_compile.
++      if test -z "$base_compile"; then
++	base_compile="$lastarg"
++      else
++	base_compile="$base_compile $lastarg"
++      fi
++    done
++
++    case $user_target in
++    set)
++      ;;
++    no)
++      # Get the name of the library object.
++      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
++      ;;
++    *)
++      $echo "$modename: you must specify a target with \`-o'" 1>&2
++      exit 1
++      ;;
++    esac
++
++    # Recognize several different file suffixes.
++    # If the user specifies -o file.o, it is replaced with file.lo
++    xform='[cCFSfmso]'
++    case $libobj in
++    *.ada) xform=ada ;;
++    *.adb) xform=adb ;;
++    *.ads) xform=ads ;;
++    *.asm) xform=asm ;;
++    *.c++) xform=c++ ;;
++    *.cc) xform=cc ;;
++    *.cpp) xform=cpp ;;
++    *.cxx) xform=cxx ;;
++    *.f90) xform=f90 ;;
++    *.for) xform=for ;;
++    esac
++
++    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
++
++    case $libobj in
++    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
++    *)
++      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
++      exit 1
++      ;;
++    esac
++
++    if test -z "$base_compile"; then
++      $echo "$modename: you must specify a compilation command" 1>&2
++      $echo "$help" 1>&2
++      exit 1
++    fi
++
++    # Delete any leftover library objects.
++    if test "$build_old_libs" = yes; then
++      removelist="$obj $libobj"
++    else
++      removelist="$libobj"
++    fi
++
++    $run $rm $removelist
++    trap "$run $rm $removelist; exit 1" 1 2 15
++
++    # On Cygwin there's no "real" PIC flag so we must build both object types
++    case $host_os in
++    cygwin* | mingw* | pw32* | os2*)
++      pic_mode=default
++      ;;
++    esac
++    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
++      # non-PIC code in shared libraries is not supported
++      pic_mode=default
++    fi
++
++    # Calculate the filename of the output object if compiler does
++    # not support -o with -c
++    if test "$compiler_c_o" = no; then
++      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
++      lockfile="$output_obj.lock"
++      removelist="$removelist $output_obj $lockfile"
++      trap "$run $rm $removelist; exit 1" 1 2 15
++    else
++      need_locks=no
++      lockfile=
++    fi
++
++    # Lock this critical section if it is needed
++    # We use this script file to make the link, it avoids creating a new file
++    if test "$need_locks" = yes; then
++      until $run ln "$0" "$lockfile" 2>/dev/null; do
++	$show "Waiting for $lockfile to be removed"
++	sleep 2
++      done
++    elif test "$need_locks" = warn; then
++      if test -f "$lockfile"; then
++	echo "\
++*** ERROR, $lockfile exists and contains:
++`cat $lockfile 2>/dev/null`
++
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
++
++	$run $rm $removelist
++	exit 1
++      fi
++      echo $srcfile > "$lockfile"
++    fi
++
++    if test -n "$fix_srcfile_path"; then
++      eval srcfile=\"$fix_srcfile_path\"
++    fi
++
++    # Only build a PIC object if we are building libtool libraries.
++    if test "$build_libtool_libs" = yes; then
++      # Without this assignment, base_compile gets emptied.
++      fbsd_hideous_sh_bug=$base_compile
++
++      if test "$pic_mode" != no; then
++	# All platforms use -DPIC, to notify preprocessed assembler code.
++	command="$base_compile $srcfile $pic_flag -DPIC"
++      else
++	# Don't build PIC code
++	command="$base_compile $srcfile"
++      fi
++      if test "$build_old_libs" = yes; then
++	lo_libobj="$libobj"
++	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
++	if test "X$dir" = "X$libobj"; then
++	  dir="$objdir"
++	else
++	  dir="$dir/$objdir"
++	fi
++	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
++
++	if test -d "$dir"; then
++	  $show "$rm $libobj"
++	  $run $rm $libobj
++	else
++	  $show "$mkdir $dir"
++	  $run $mkdir $dir
++	  status=$?
++	  if test $status -ne 0 && test ! -d $dir; then
++	    exit $status
++	  fi
++	fi
++      fi
++      if test "$compiler_o_lo" = yes; then
++	output_obj="$libobj"
++	command="$command -o $output_obj"
++      elif test "$compiler_c_o" = yes; then
++	output_obj="$obj"
++	command="$command -o $output_obj"
++      fi
++
++      $run $rm "$output_obj"
++      $show "$command"
++      if $run eval "$command"; then :
++      else
++	test -n "$output_obj" && $run $rm $removelist
++	exit 1
++      fi
++
++      if test "$need_locks" = warn &&
++	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
++	echo "\
++*** ERROR, $lockfile contains:
++`cat $lockfile 2>/dev/null`
++
++but it should contain:
++$srcfile
++
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
++
++	$run $rm $removelist
++	exit 1
++      fi
++
++      # Just move the object if needed, then go on to compile the next one
++      if test x"$output_obj" != x"$libobj"; then
++	$show "$mv $output_obj $libobj"
++	if $run $mv $output_obj $libobj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
++
++      # If we have no pic_flag, then copy the object into place and finish.
++      if (test -z "$pic_flag" || test "$pic_mode" != default) &&
++	 test "$build_old_libs" = yes; then
++	# Rename the .lo from within objdir to obj
++	if test -f $obj; then
++	  $show $rm $obj
++	  $run $rm $obj
++	fi
++
++	$show "$mv $libobj $obj"
++	if $run $mv $libobj $obj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++
++	xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
++	if test "X$xdir" = "X$obj"; then
++	  xdir="."
++	else
++	  xdir="$xdir"
++	fi
++	baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
++	libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
++	# Now arrange that obj and lo_libobj become the same file
++	$show "(cd $xdir && $LN_S $baseobj $libobj)"
++	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
++	  # Unlock the critical section if it was locked
++	  if test "$need_locks" != no; then
++	    $run $rm "$lockfile"
++	  fi
++	  exit 0
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
++
++      # Allow error messages only from the first compilation.
++      suppress_output=' >/dev/null 2>&1'
++    fi
++
++    # Only build a position-dependent object if we build old libraries.
++    if test "$build_old_libs" = yes; then
++      if test "$pic_mode" != yes; then
++	# Don't build PIC code
++	command="$base_compile $srcfile"
++      else
++	# All platforms use -DPIC, to notify preprocessed assembler code.
++	command="$base_compile $srcfile $pic_flag -DPIC"
++      fi
++      if test "$compiler_c_o" = yes; then
++	command="$command -o $obj"
++	output_obj="$obj"
++      fi
++
++      # Suppress compiler output if we already did a PIC compilation.
++      command="$command$suppress_output"
++      $run $rm "$output_obj"
++      $show "$command"
++      if $run eval "$command"; then :
++      else
++	$run $rm $removelist
++	exit 1
++      fi
++
++      if test "$need_locks" = warn &&
++	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
++	echo "\
++*** ERROR, $lockfile contains:
++`cat $lockfile 2>/dev/null`
++
++but it should contain:
++$srcfile
++
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
++
++	$run $rm $removelist
++	exit 1
++      fi
++
++      # Just move the object if needed
++      if test x"$output_obj" != x"$obj"; then
++	$show "$mv $output_obj $obj"
++	if $run $mv $output_obj $obj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
++
++      # Create an invalid libtool object if no PIC, so that we do not
++      # accidentally link it into a program.
++      if test "$build_libtool_libs" != yes; then
++	$show "echo timestamp > $libobj"
++	$run eval "echo timestamp > \$libobj" || exit $?
++      else
++	# Move the .lo from within objdir
++	$show "$mv $libobj $lo_libobj"
++	if $run $mv $libobj $lo_libobj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
++    fi
++
++    # Unlock the critical section if it was locked
++    if test "$need_locks" != no; then
++      $run $rm "$lockfile"
++    fi
++
++    exit 0
++    ;;
++
++  # libtool link mode
++  link | relink)
++    modename="$modename: link"
++    case $host in
++    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++      # It is impossible to link a dll without this setting, and
++      # we shouldn't force the makefile maintainer to figure out
++      # which system we are compiling for in order to pass an extra
++      # flag for every libtool invokation.
++      # allow_undefined=no
++
++      # FIXME: Unfortunately, there are problems with the above when trying
++      # to make a dll which has undefined symbols, in which case not
++      # even a static library is built.  For now, we need to specify
++      # -no-undefined on the libtool link line when we can be certain
++      # that all symbols are satisfied, otherwise we get a static library.
++      allow_undefined=yes
++      ;;
++    *)
++      allow_undefined=yes
++      ;;
++    esac
++    libtool_args="$nonopt"
++    compile_command="$nonopt"
++    finalize_command="$nonopt"
++
++    compile_rpath=
++    finalize_rpath=
++    compile_shlibpath=
++    finalize_shlibpath=
++    convenience=
++    old_convenience=
++    deplibs=
++    old_deplibs=
++    compiler_flags=
++    linker_flags=
++    dllsearchpath=
++    lib_search_path=`pwd`
++    inst_prefix_dir=
++
++    avoid_version=no
++    dlfiles=
++    dlprefiles=
++    dlself=no
++    export_dynamic=no
++    export_symbols=
++    export_symbols_regex=
++    generated=
++    libobjs=
++    ltlibs=
++    module=no
++    no_install=no
++    objs=
++    prefer_static_libs=no
++    preload=no
++    prev=
++    prevarg=
++    release=
++    rpath=
++    xrpath=
++    perm_rpath=
++    temp_rpath=
++    thread_safe=no
++    vinfo=
++
++    # We need to know -static, to get the right output filenames.
++    for arg
++    do
++      case $arg in
++      -all-static | -static)
++	if test "X$arg" = "X-all-static"; then
++	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
++	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
++	  fi
++	  if test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	else
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	fi
++	build_libtool_libs=no
++	build_old_libs=yes
++	prefer_static_libs=yes
++	break
++	;;
++      esac
++    done
++
++    # See if our shared archives depend on static archives.
++    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
++
++    # Go through the arguments, transforming them on the way.
++    while test $# -gt 0; do
++      arg="$1"
++      shift
++      case $arg in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
++	;;
++      *) qarg=$arg ;;
++      esac
++      libtool_args="$libtool_args $qarg"
++
++      # If the previous option needs an argument, assign it.
++      if test -n "$prev"; then
++	case $prev in
++	output)
++	  compile_command="$compile_command @OUTPUT@"
++	  finalize_command="$finalize_command @OUTPUT@"
++	  ;;
++	esac
++
++	case $prev in
++	dlfiles|dlprefiles)
++	  if test "$preload" = no; then
++	    # Add the symbol object into the linking commands.
++	    compile_command="$compile_command @SYMFILE@"
++	    finalize_command="$finalize_command @SYMFILE@"
++	    preload=yes
++	  fi
++	  case $arg in
++	  *.la | *.lo) ;;  # We handle these cases below.
++	  force)
++	    if test "$dlself" = no; then
++	      dlself=needless
++	      export_dynamic=yes
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  self)
++	    if test "$prev" = dlprefiles; then
++	      dlself=yes
++	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
++	      dlself=yes
++	    else
++	      dlself=needless
++	      export_dynamic=yes
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  *)
++	    if test "$prev" = dlfiles; then
++	      dlfiles="$dlfiles $arg"
++	    else
++	      dlprefiles="$dlprefiles $arg"
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  esac
++	  ;;
++	expsyms)
++	  export_symbols="$arg"
++	  if test ! -f "$arg"; then
++	    $echo "$modename: symbol file \`$arg' does not exist"
++	    exit 1
++	  fi
++	  prev=
++	  continue
++	  ;;
++	expsyms_regex)
++	  export_symbols_regex="$arg"
++	  prev=
++	  continue
++	  ;;
++	inst_prefix)
++	  inst_prefix_dir="$arg"
++	  prev=
++	  continue
++	  ;;
++	release)
++	  release="-$arg"
++	  prev=
++	  continue
++	  ;;
++	rpath | xrpath)
++	  # We need an absolute path.
++	  case $arg in
++	  [\\/]* | [A-Za-z]:[\\/]*) ;;
++	  *)
++	    $echo "$modename: only absolute run-paths are allowed" 1>&2
++	    exit 1
++	    ;;
++	  esac
++	  if test "$prev" = rpath; then
++	    case "$rpath " in
++	    *" $arg "*) ;;
++	    *) rpath="$rpath $arg" ;;
++	    esac
++	  else
++	    case "$xrpath " in
++	    *" $arg "*) ;;
++	    *) xrpath="$xrpath $arg" ;;
++	    esac
++	  fi
++	  prev=
++	  continue
++	  ;;
++	xcompiler)
++	  compiler_flags="$compiler_flags $qarg"
++	  prev=
++	  compile_command="$compile_command $qarg"
++	  finalize_command="$finalize_command $qarg"
++	  continue
++	  ;;
++	xlinker)
++	  linker_flags="$linker_flags $qarg"
++	  compiler_flags="$compiler_flags $wl$qarg"
++	  prev=
++	  compile_command="$compile_command $wl$qarg"
++	  finalize_command="$finalize_command $wl$qarg"
++	  continue
++	  ;;
++	*)
++	  eval "$prev=\"\$arg\""
++	  prev=
++	  continue
++	  ;;
++	esac
++      fi # test -n $prev
++
++      prevarg="$arg"
++
++      case $arg in
++      -all-static)
++	if test -n "$link_static_flag"; then
++	  compile_command="$compile_command $link_static_flag"
++	  finalize_command="$finalize_command $link_static_flag"
++	fi
++	continue
++	;;
++
++      -allow-undefined)
++	# FIXME: remove this flag sometime in the future.
++	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
++	continue
++	;;
++
++      -avoid-version)
++	avoid_version=yes
++	continue
++	;;
++
++      -dlopen)
++	prev=dlfiles
++	continue
++	;;
++
++      -dlpreopen)
++	prev=dlprefiles
++	continue
++	;;
++
++      -export-dynamic)
++	export_dynamic=yes
++	continue
++	;;
++
++      -export-symbols | -export-symbols-regex)
++	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
++	  $echo "$modename: more than one -exported-symbols argument is not allowed"
++	  exit 1
++	fi
++	if test "X$arg" = "X-export-symbols"; then
++	  prev=expsyms
++	else
++	  prev=expsyms_regex
++	fi
++	continue
++	;;
++
++      -inst-prefix-dir)
++       prev=inst_prefix
++       continue
++       ;;
++
++      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
++      # so, if we see these flags be careful not to treat them like -L
++      -L[A-Z][A-Z]*:*)
++	case $with_gcc/$host in
++	no/*-*-irix* | no/*-*-nonstopux*)
++	  compile_command="$compile_command $arg"
++	  finalize_command="$finalize_command $arg"
++	  ;;
++	esac
++	continue
++	;;
++
++      -L*)
++	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
++	# We need an absolute path.
++	case $dir in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	*)
++	  absdir=`cd "$dir" && pwd`
++	  if test -z "$absdir"; then
++	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
++	    exit 1
++	  fi
++	  dir="$absdir"
++	  ;;
++	esac
++	case "$deplibs " in
++	*" -L$dir "*) ;;
++	*)
++	  deplibs="$deplibs -L$dir"
++	  lib_search_path="$lib_search_path $dir"
++	  ;;
++	esac
++	case $host in
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  case :$dllsearchpath: in
++	  *":$dir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$dir";;
++	  esac
++	  ;;
++	esac
++	continue
++	;;
++
++      -l*)
++	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
++	  case $host in
++	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
++	    # These systems don't actually have a C or math library (as such)
++	    continue
++	    ;;
++	  *-*-mingw* | *-*-os2*)
++	    # These systems don't actually have a C library (as such)
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-openbsd* | *-*-freebsd*)
++	    # Do not include libc due to us having libc/libc_r.
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  esac
++	 elif test "X$arg" = "X-lc_r"; then
++	  case $host in
++	 *-*-openbsd* | *-*-freebsd*)
++	    # Do not include libc_r directly, use -pthread flag.
++	    continue
++	    ;;
++	  esac
++	fi
++	deplibs="$deplibs $arg"
++	continue
++	;;
++
++      -module)
++	module=yes
++	continue
++	;;
++
++      -no-fast-install)
++	fast_install=no
++	continue
++	;;
++
++      -no-install)
++	case $host in
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  # The PATH hackery in wrapper scripts is required on Windows
++	  # in order for the loader to find any dlls it needs.
++	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
++	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
++	  fast_install=no
++	  ;;
++	*) no_install=yes ;;
++	esac
++	continue
++	;;
++
++      -no-undefined)
++	allow_undefined=no
++	continue
++	;;
++
++      -o) prev=output ;;
++
++      -release)
++	prev=release
++	continue
++	;;
++
++      -rpath)
++	prev=rpath
++	continue
++	;;
++
++      -R)
++	prev=xrpath
++	continue
++	;;
++
++      -R*)
++	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
++	# We need an absolute path.
++	case $dir in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	*)
++	  $echo "$modename: only absolute run-paths are allowed" 1>&2
++	  exit 1
++	  ;;
++	esac
++	case "$xrpath " in
++	*" $dir "*) ;;
++	*) xrpath="$xrpath $dir" ;;
++	esac
++	continue
++	;;
++
++      -static)
++	# The effects of -static are defined in a previous loop.
++	# We used to do the same as -all-static on platforms that
++	# didn't have a PIC flag, but the assumption that the effects
++	# would be equivalent was wrong.  It would break on at least
++	# Digital Unix and AIX.
++	continue
++	;;
++
++      -thread-safe)
++	thread_safe=yes
++	continue
++	;;
++
++      -version-info)
++	prev=vinfo
++	continue
++	;;
++
++      -Wc,*)
++	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
++	arg=
++	save_ifs="$IFS"; IFS=','
++	for flag in $args; do
++	  IFS="$save_ifs"
++	  case $flag in
++	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	    flag="\"$flag\""
++	    ;;
++	  esac
++	  arg="$arg $wl$flag"
++	  compiler_flags="$compiler_flags $flag"
++	done
++	IFS="$save_ifs"
++	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
++	;;
++
++      -Wl,*)
++	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
++	arg=
++	save_ifs="$IFS"; IFS=','
++	for flag in $args; do
++	  IFS="$save_ifs"
++	  case $flag in
++	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	    flag="\"$flag\""
++	    ;;
++	  esac
++	  arg="$arg $wl$flag"
++	  compiler_flags="$compiler_flags $wl$flag"
++	  linker_flags="$linker_flags $flag"
++	done
++	IFS="$save_ifs"
++	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
++	;;
++
++      -Xcompiler)
++	prev=xcompiler
++	continue
++	;;
++
++      -Xlinker)
++	prev=xlinker
++	continue
++	;;
++
++      # Some other compiler flag.
++      -* | +*)
++	# Unknown arguments in both finalize_command and compile_command need
++	# to be aesthetically quoted because they are evaled later.
++	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++	case $arg in
++	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++	;;
++
++      *.lo | *.$objext)
++	# A library or standard object.
++	if test "$prev" = dlfiles; then
++	  # This file was specified with -dlopen.
++	  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++	    dlfiles="$dlfiles $arg"
++	    prev=
++	    continue
++	  else
++	    # If libtool objects are unsupported, then we need to preload.
++	    prev=dlprefiles
++	  fi
++	fi
++
++	if test "$prev" = dlprefiles; then
++	  # Preload the old-style object.
++	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
++	  prev=
++	else
++	  case $arg in
++	  *.lo) libobjs="$libobjs $arg" ;;
++	  *) objs="$objs $arg" ;;
++	  esac
++	fi
++	;;
++
++      *.$libext)
++	# An archive.
++	deplibs="$deplibs $arg"
++	old_deplibs="$old_deplibs $arg"
++	continue
++	;;
++
++      *.la)
++	# A libtool-controlled library.
++
++	if test "$prev" = dlfiles; then
++	  # This library was specified with -dlopen.
++	  dlfiles="$dlfiles $arg"
++	  prev=
++	elif test "$prev" = dlprefiles; then
++	  # The library was specified with -dlpreopen.
++	  dlprefiles="$dlprefiles $arg"
++	  prev=
++	else
++	  deplibs="$deplibs $arg"
++	fi
++	continue
++	;;
++
++      # Some other compiler argument.
++      *)
++	# Unknown arguments in both finalize_command and compile_command need
++	# to be aesthetically quoted because they are evaled later.
++	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++	case $arg in
++	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++	;;
++      esac # arg
++
++      # Now actually substitute the argument into the commands.
++      if test -n "$arg"; then
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++      fi
++    done # argument parsing loop
++
++    if test -n "$prev"; then
++      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
++      $echo "$help" 1>&2
++      exit 1
++    fi
++
++    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
++      eval arg=\"$export_dynamic_flag_spec\"
++      compile_command="$compile_command $arg"
++      finalize_command="$finalize_command $arg"
++    fi
++
++    # calculate the name of the file, without its directory
++    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
++    libobjs_save="$libobjs"
++
++    if test -n "$shlibpath_var"; then
++      # get the directories listed in $shlibpath_var
++      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
++    else
++      shlib_search_path=
++    fi
++    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
++    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
++
++    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
++    if test "X$output_objdir" = "X$output"; then
++      output_objdir="$objdir"
++    else
++      output_objdir="$output_objdir/$objdir"
++    fi
++    # Create the object directory.
++    if test ! -d $output_objdir; then
++      $show "$mkdir $output_objdir"
++      $run $mkdir $output_objdir
++      status=$?
++      if test $status -ne 0 && test ! -d $output_objdir; then
++	exit $status
++      fi
++    fi
++
++    # Determine the type of output
++    case $output in
++    "")
++      $echo "$modename: you must specify an output file" 1>&2
++      $echo "$help" 1>&2
++      exit 1
++      ;;
++    *.$libext) linkmode=oldlib ;;
++    *.lo | *.$objext) linkmode=obj ;;
++    *.la) linkmode=lib ;;
++    *) linkmode=prog ;; # Anything else should be a program.
++    esac
++
++    specialdeplibs=
++    libs=
++    # Find all interdependent deplibs by searching for libraries
++    # that are linked more than once (e.g. -la -lb -la)
++    for deplib in $deplibs; do
++      if test "X$duplicate_deps" = "Xyes" ; then
++	case "$libs " in
++	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	esac
++      fi
++      libs="$libs $deplib"
++    done
++    deplibs=
++    newdependency_libs=
++    newlib_search_path=
++    need_relink=no # whether we're linking any uninstalled libtool libraries
++    notinst_deplibs= # not-installed libtool libraries
++    notinst_path= # paths that contain not-installed libtool libraries
++    case $linkmode in
++    lib)
++	passes="conv link"
++	for file in $dlfiles $dlprefiles; do
++	  case $file in
++	  *.la) ;;
++	  *)
++	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
++	    exit 1
++	    ;;
++	  esac
++	done
++	;;
++    prog)
++	compile_deplibs=
++	finalize_deplibs=
++	alldeplibs=no
++	newdlfiles=
++	newdlprefiles=
++	passes="conv scan dlopen dlpreopen link"
++	;;
++    *)  passes="conv"
++	;;
++    esac
++    for pass in $passes; do
++      if test $linkmode = prog; then
++	# Determine which files to process
++	case $pass in
++	dlopen)
++	  libs="$dlfiles"
++	  save_deplibs="$deplibs" # Collect dlpreopened libraries
++	  deplibs=
++	  ;;
++	dlpreopen) libs="$dlprefiles" ;;
++	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++	esac
++      fi
++      for deplib in $libs; do
++	lib=
++	found=no
++	case $deplib in
++	-l*)
++	  if test $linkmode = oldlib && test $linkmode = obj; then
++	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
++	    continue
++	  fi
++	  if test $pass = conv; then
++	    deplibs="$deplib $deplibs"
++	    continue
++	  fi
++	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
++	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
++	    # Search the libtool library
++	    lib="$searchdir/lib${name}.la"
++	    if test -f "$lib"; then
++	      found=yes
++	      break
++	    fi
++	  done
++	  if test "$found" != yes; then
++	    # deplib doesn't seem to be a libtool library
++	    if test "$linkmode,$pass" = "prog,link"; then
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    else
++	      deplibs="$deplib $deplibs"
++	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
++	    fi
++	    continue
++	  fi
++	  ;; # -l
++	-L*)
++	  case $linkmode in
++	  lib)
++	    deplibs="$deplib $deplibs"
++	    test $pass = conv && continue
++	    newdependency_libs="$deplib $newdependency_libs"
++	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
++	    ;;
++	  prog)
++	    if test $pass = conv; then
++	      deplibs="$deplib $deplibs"
++	      continue
++	    fi
++	    if test $pass = scan; then
++	      deplibs="$deplib $deplibs"
++	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
++	    else
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    fi
++	    ;;
++	  *)
++	    $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
++	    ;;
++	  esac # linkmode
++	  continue
++	  ;; # -L
++	-R*)
++	  if test $pass = link; then
++	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
++	    # Make sure the xrpath contains only unique directories.
++	    case "$xrpath " in
++	    *" $dir "*) ;;
++	    *) xrpath="$xrpath $dir" ;;
++	    esac
++	  fi
++	  deplibs="$deplib $deplibs"
++	  continue
++	  ;;
++	*.la) lib="$deplib" ;;
++	*.$libext)
++	  if test $pass = conv; then
++	    deplibs="$deplib $deplibs"
++	    continue
++	  fi
++	  case $linkmode in
++	  lib)
++	    if test "$deplibs_check_method" != pass_all; then
++	      echo
++	      echo "*** Warning: Trying to link with static lib archive $deplib."
++	      echo "*** I have the capability to make that library automatically link in when"
++	      echo "*** you link to this library.  But I can only do this if you have a"
++	      echo "*** shared version of the library, which you do not appear to have"
++	      echo "*** because the file extensions .$libext of this argument makes me believe"
++	      echo "*** that it is just a static archive that I should not used here."
++	    else
++	      echo
++	      echo "*** Warning: Linking the shared library $output against the"
++	      echo "*** static library $deplib is not portable!"
++	      deplibs="$deplib $deplibs"
++	    fi
++	    continue
++	    ;;
++	  prog)
++	    if test $pass != link; then
++	      deplibs="$deplib $deplibs"
++	    else
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    fi
++	    continue
++	    ;;
++	  esac # linkmode
++	  ;; # *.$libext
++	*.lo | *.$objext)
++	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	    # If there is no dlopen support or we're linking statically,
++	    # we need to preload.
++	    newdlprefiles="$newdlprefiles $deplib"
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    newdlfiles="$newdlfiles $deplib"
++	  fi
++	  continue
++	  ;;
++	%DEPLIBS%)
++	  alldeplibs=yes
++	  continue
++	  ;;
++	esac # case $deplib
++	if test $found = yes || test -f "$lib"; then :
++	else
++	  $echo "$modename: cannot find the library \`$lib'" 1>&2
++	  exit 1
++	fi
++
++	# Check to see that this really is a libtool archive.
++	if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++	  exit 1
++	fi
++
++	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
++	test "X$ladir" = "X$lib" && ladir="."
++
++	dlname=
++	dlopen=
++	dlpreopen=
++	libdir=
++	library_names=
++	old_library=
++	# If the library was installed with an old release of libtool,
++	# it will not redefine variable installed.
++	installed=yes
++
++	# Read the .la file
++	case $lib in
++	*/* | *\\*) . $lib ;;
++	*) . ./$lib ;;
++	esac
++
++	if test "$linkmode,$pass" = "lib,link" ||
++	   test "$linkmode,$pass" = "prog,scan" ||
++	   { test $linkmode = oldlib && test $linkmode = obj; }; then
++	   # Add dl[pre]opened files of deplib
++	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
++	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
++	fi
++
++	if test $pass = conv; then
++	  # Only check for convenience libraries
++	  deplibs="$lib $deplibs"
++	  if test -z "$libdir"; then
++	    if test -z "$old_library"; then
++	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
++	      exit 1
++	    fi
++	    # It is a libtool convenience library, so add in its objects.
++	    convenience="$convenience $ladir/$objdir/$old_library"
++	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
++	    tmp_libs=
++	    for deplib in $dependency_libs; do
++	      deplibs="$deplib $deplibs"
++              if test "X$duplicate_deps" = "Xyes" ; then
++	        case "$tmp_libs " in
++	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	        esac
++              fi
++	      tmp_libs="$tmp_libs $deplib"
++	    done
++	  elif test $linkmode != prog && test $linkmode != lib; then
++	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
++	    exit 1
++	  fi
++	  continue
++	fi # $pass = conv
++
++	# Get the name of the library we link against.
++	linklib=
++	for l in $old_library $library_names; do
++	  linklib="$l"
++	done
++	if test -z "$linklib"; then
++	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
++	  exit 1
++	fi
++
++	# This library was specified with -dlopen.
++	if test $pass = dlopen; then
++	  if test -z "$libdir"; then
++	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
++	    exit 1
++	  fi
++	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	    # If there is no dlname, no dlopen support or we're linking
++	    # statically, we need to preload.
++	    dlprefiles="$dlprefiles $lib"
++	  else
++	    newdlfiles="$newdlfiles $lib"
++	  fi
++	  continue
++	fi # $pass = dlopen
++
++	# We need an absolute path.
++	case $ladir in
++	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
++	*)
++	  abs_ladir=`cd "$ladir" && pwd`
++	  if test -z "$abs_ladir"; then
++	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
++	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
++	    abs_ladir="$ladir"
++	  fi
++	  ;;
++	esac
++	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
++
++	# Find the relevant object directory and library name.
++	if test "X$installed" = Xyes; then
++	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
++	  else
++	    dir="$libdir"
++	    absdir="$libdir"
++	  fi
++	else
++	  dir="$ladir/$objdir"
++	  absdir="$abs_ladir/$objdir"
++	  # Remove this search path later
++	  notinst_path="$notinst_path $abs_ladir"
++	fi # $installed = yes
++	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
++
++	# This library was specified with -dlpreopen.
++	if test $pass = dlpreopen; then
++	  if test -z "$libdir"; then
++	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
++	    exit 1
++	  fi
++	  # Prefer using a static library (so that no silly _DYNAMIC symbols
++	  # are required to link).
++	  if test -n "$old_library"; then
++	    newdlprefiles="$newdlprefiles $dir/$old_library"
++	  # Otherwise, use the dlname, so that lt_dlopen finds it.
++	  elif test -n "$dlname"; then
++	    newdlprefiles="$newdlprefiles $dir/$dlname"
++	  else
++	    newdlprefiles="$newdlprefiles $dir/$linklib"
++	  fi
++	fi # $pass = dlpreopen
++
++	if test -z "$libdir"; then
++	  # Link the convenience library
++	  if test $linkmode = lib; then
++	    deplibs="$dir/$old_library $deplibs"
++	  elif test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$dir/$old_library $compile_deplibs"
++	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
++	  else
++	    deplibs="$lib $deplibs"
++	  fi
++	  continue
++	fi
++
++	if test $linkmode = prog && test $pass != link; then
++	  newlib_search_path="$newlib_search_path $ladir"
++	  deplibs="$lib $deplibs"
++
++	  linkalldeplibs=no
++	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
++	     test "$build_libtool_libs" = no; then
++	    linkalldeplibs=yes
++	  fi
++
++	  tmp_libs=
++	  for deplib in $dependency_libs; do
++	    case $deplib in
++	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
++	    esac
++	    # Need to link against all dependency_libs?
++	    if test $linkalldeplibs = yes; then
++	      deplibs="$deplib $deplibs"
++	    else
++	      # Need to hardcode shared library paths
++	      # or/and link against static libraries
++	      newdependency_libs="$deplib $newdependency_libs"
++	    fi
++	    if test "X$duplicate_deps" = "Xyes" ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	      esac
++	    fi
++	    tmp_libs="$tmp_libs $deplib"
++	  done # for deplib
++	  continue
++	fi # $linkmode = prog...
++
++	link_static=no # Whether the deplib will be linked statically
++	if test -n "$library_names" &&
++	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	  # Link against this shared library
++
++	  if test "$linkmode,$pass" = "prog,link" ||
++	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
++	    # Hardcode the library path.
++	    # Skip directories that are in the system default run-time
++	    # search path.
++	    case " $sys_lib_dlsearch_path " in
++	    *" $absdir "*) ;;
++	    *)
++	      case "$compile_rpath " in
++	      *" $absdir "*) ;;
++	      *) compile_rpath="$compile_rpath $absdir"
++	      esac
++	      ;;
++	    esac
++	    case " $sys_lib_dlsearch_path " in
++	    *" $libdir "*) ;;
++	    *)
++	      case "$finalize_rpath " in
++	      *" $libdir "*) ;;
++	      *) finalize_rpath="$finalize_rpath $libdir"
++	      esac
++	      ;;
++	    esac
++	    if test $linkmode = prog; then
++	      # We need to hardcode the library path
++	      if test -n "$shlibpath_var"; then
++		# Make sure the rpath contains only unique directories.
++		case "$temp_rpath " in
++		*" $dir "*) ;;
++		*" $absdir "*) ;;
++		*) temp_rpath="$temp_rpath $dir" ;;
++		esac
++	      fi
++	    fi
++	  fi # $linkmode,$pass = prog,link...
++
++	  if test "$alldeplibs" = yes &&
++	     { test "$deplibs_check_method" = pass_all ||
++	       { test "$build_libtool_libs" = yes &&
++		 test -n "$library_names"; }; }; then
++	    # We only need to search for static libraries
++	    continue
++	  fi
++
++	  if test "$installed" = no; then
++	    notinst_deplibs="$notinst_deplibs $lib"
++	    need_relink=yes
++	  fi
++
++	  if test -n "$old_archive_from_expsyms_cmds"; then
++	    # figure out the soname
++	    set dummy $library_names
++	    realname="$2"
++	    shift; shift
++	    libname=`eval \\$echo \"$libname_spec\"`
++	    # use dlname if we got it. it's perfectly good, no?
++	    if test -n "$dlname"; then
++	      soname="$dlname"
++	    elif test -n "$soname_spec"; then
++	      # bleh windows
++	      case $host in
++	      *cygwin*)
++		major=`expr $current - $age`
++		versuffix="-$major"
++		;;
++	      esac
++	      eval soname=\"$soname_spec\"
++	    else
++	      soname="$realname"
++	    fi
++
++	    # Make a new name for the extract_expsyms_cmds to use
++	    soroot="$soname"
++	    soname=`echo $soroot | ${SED} -e 's/^.*\///'`
++	    newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
++
++	    # If the library has no export list, then create one now
++	    if test -f "$output_objdir/$soname-def"; then :
++	    else
++	      $show "extracting exported symbol list from \`$soname'"
++	      save_ifs="$IFS"; IFS='~'
++	      eval cmds=\"$extract_expsyms_cmds\"
++	      for cmd in $cmds; do
++		IFS="$save_ifs"
++		$show "$cmd"
++		$run eval "$cmd" || exit $?
++	      done
++	      IFS="$save_ifs"
++	    fi
++
++	    # Create $newlib
++	    if test -f "$output_objdir/$newlib"; then :; else
++	      $show "generating import library for \`$soname'"
++	      save_ifs="$IFS"; IFS='~'
++	      eval cmds=\"$old_archive_from_expsyms_cmds\"
++	      for cmd in $cmds; do
++		IFS="$save_ifs"
++		$show "$cmd"
++		$run eval "$cmd" || exit $?
++	      done
++	      IFS="$save_ifs"
++	    fi
++	    # make sure the library variables are pointing to the new library
++	    dir=$output_objdir
++	    linklib=$newlib
++	  fi # test -n $old_archive_from_expsyms_cmds
++
++	  if test $linkmode = prog || test "$mode" != relink; then
++	    add_shlibpath=
++	    add_dir=
++	    add=
++	    lib_linked=yes
++	    case $hardcode_action in
++	    immediate | unsupported)
++	      if test "$hardcode_direct" = no; then
++		add="$dir/$linklib"
++	      elif test "$hardcode_minus_L" = no; then
++		case $host in
++		*-*-sunos*) add_shlibpath="$dir" ;;
++		esac
++		add_dir="-L$dir"
++		add="-l$name"
++	      elif test "$hardcode_shlibpath_var" = no; then
++		add_shlibpath="$dir"
++		add="-l$name"
++	      else
++		lib_linked=no
++	      fi
++	      ;;
++	    relink)
++	      if test "$hardcode_direct" = yes; then
++		add="$dir/$linklib"
++	      elif test "$hardcode_minus_L" = yes; then
++		add_dir="-L$dir"
++		# Try looking first in the location we're being installed to.
++		if test -n "$inst_prefix_dir"; then
++		  case "$libdir" in
++		  [\/]*)
++		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		    ;;
++		  esac
++		fi
++		add="-l$name"
++	      elif test "$hardcode_shlibpath_var" = yes; then
++		add_shlibpath="$dir"
++		add="-l$name"
++	      else
++		lib_linked=no
++	      fi
++	      ;;
++	    *) lib_linked=no ;;
++	    esac
++
++	    if test "$lib_linked" != yes; then
++	      $echo "$modename: configuration error: unsupported hardcode properties"
++	      exit 1
++	    fi
++
++	    if test -n "$add_shlibpath"; then
++	      case :$compile_shlibpath: in
++	      *":$add_shlibpath:"*) ;;
++	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
++	      esac
++	    fi
++	    if test $linkmode = prog; then
++	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
++	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
++	    else
++	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
++	      test -n "$add" && deplibs="$add $deplibs"
++	      if test "$hardcode_direct" != yes && \
++		 test "$hardcode_minus_L" != yes && \
++		 test "$hardcode_shlibpath_var" = yes; then
++		case :$finalize_shlibpath: in
++		*":$libdir:"*) ;;
++		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
++		esac
++	      fi
++	    fi
++	  fi
++
++	  if test $linkmode = prog || test "$mode" = relink; then
++	    add_shlibpath=
++	    add_dir=
++	    add=
++	    # Finalize command for both is simple: just hardcode it.
++	    if test "$hardcode_direct" = yes; then
++	      add="$libdir/$linklib"
++	    elif test "$hardcode_minus_L" = yes; then
++	      add_dir="-L$libdir"
++	      add="-l$name"
++	    elif test "$hardcode_shlibpath_var" = yes; then
++	      case :$finalize_shlibpath: in
++	      *":$libdir:"*) ;;
++	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
++	      esac
++	      add="-l$name"
++	    else
++	      # We cannot seem to hardcode it, guess we'll fake it.
++	      add_dir="-L$libdir"
++	      # Try looking first in the location we're being installed to.
++	      if test -n "$inst_prefix_dir"; then
++		case "$libdir" in
++		[\/]*)
++		  add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		  ;;
++		esac
++	      fi
++	      add="-l$name"
++	    fi
++
++	    if test $linkmode = prog; then
++	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
++	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
++	    else
++	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
++	      test -n "$add" && deplibs="$add $deplibs"
++	    fi
++	  fi
++	elif test $linkmode = prog; then
++	  if test "$alldeplibs" = yes &&
++	     { test "$deplibs_check_method" = pass_all ||
++	       { test "$build_libtool_libs" = yes &&
++		 test -n "$library_names"; }; }; then
++	    # We only need to search for static libraries
++	    continue
++	  fi
++
++	  # Try to link the static library
++	  # Here we assume that one of hardcode_direct or hardcode_minus_L
++	  # is not unsupported.  This is valid on all known static and
++	  # shared platforms.
++	  if test "$hardcode_direct" != unsupported; then
++	    test -n "$old_library" && linklib="$old_library"
++	    compile_deplibs="$dir/$linklib $compile_deplibs"
++	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
++	  else
++	    compile_deplibs="-l$name -L$dir $compile_deplibs"
++	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
++	  fi
++	elif test "$build_libtool_libs" = yes; then
++	  # Not a shared library
++	  if test "$deplibs_check_method" != pass_all; then
++	    # We're trying link a shared library against a static one
++	    # but the system doesn't support it.
++
++	    # Just print a warning and add the library to dependency_libs so
++	    # that the program can be linked against the static library.
++	    echo
++	    echo "*** Warning: This system can not link to static lib archive $lib."
++	    echo "*** I have the capability to make that library automatically link in when"
++	    echo "*** you link to this library.  But I can only do this if you have a"
++	    echo "*** shared version of the library, which you do not appear to have."
++	    if test "$module" = yes; then
++	      echo "*** But as you try to build a module library, libtool will still create "
++	      echo "*** a static module, that should work as long as the dlopening application"
++	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
++	      if test -z "$global_symbol_pipe"; then
++		echo
++		echo "*** However, this would only work if libtool was able to extract symbol"
++		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++		echo "*** not find such a program.  So, this module is probably useless."
++		echo "*** \`nm' from GNU binutils and a full rebuild may help."
++	      fi
++	      if test "$build_old_libs" = no; then
++		build_libtool_libs=module
++		build_old_libs=yes
++	      else
++		build_libtool_libs=no
++	      fi
++	    fi
++	  else
++	    convenience="$convenience $dir/$old_library"
++	    old_convenience="$old_convenience $dir/$old_library"
++	    deplibs="$dir/$old_library $deplibs"
++	    link_static=yes
++	  fi
++	fi # link shared/static library?
++
++	if test $linkmode = lib; then
++	  if test -n "$dependency_libs" &&
++	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
++	       test $link_static = yes; }; then
++	    # Extract -R from dependency_libs
++	    temp_deplibs=
++	    for libdir in $dependency_libs; do
++	      case $libdir in
++	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
++		   case " $xrpath " in
++		   *" $temp_xrpath "*) ;;
++		   *) xrpath="$xrpath $temp_xrpath";;
++		   esac;;
++	      *) temp_deplibs="$temp_deplibs $libdir";;
++	      esac
++	    done
++	    dependency_libs="$temp_deplibs"
++	  fi
++
++	  newlib_search_path="$newlib_search_path $absdir"
++	  # Link against this library
++	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
++	  # ... and its dependency_libs
++	  tmp_libs=
++	  for deplib in $dependency_libs; do
++	    newdependency_libs="$deplib $newdependency_libs"
++	    if test "X$duplicate_deps" = "Xyes" ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	      esac
++	    fi
++	    tmp_libs="$tmp_libs $deplib"
++	  done
++
++	  if test $link_all_deplibs != no; then
++	    # Add the search paths of all dependency libraries
++	    for deplib in $dependency_libs; do
++	      case $deplib in
++	      -L*) path="$deplib" ;;
++	      *.la)
++		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
++		test "X$dir" = "X$deplib" && dir="."
++		# We need an absolute path.
++		case $dir in
++		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
++		*)
++		  absdir=`cd "$dir" && pwd`
++		  if test -z "$absdir"; then
++		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
++		    absdir="$dir"
++		  fi
++		  ;;
++		esac
++		if grep "^installed=no" $deplib > /dev/null; then
++		  path="-L$absdir/$objdir"
++		else
++		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		  if test -z "$libdir"; then
++		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
++		    exit 1
++		  fi
++		  if test "$absdir" != "$libdir"; then
++		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++		  fi
++		  path="-L$absdir"
++		fi
++		;;
++	      *) continue ;;
++	      esac
++	      case " $deplibs " in
++	      *" $path "*) ;;
++	      *) deplibs="$deplibs $path" ;;
++	      esac
++	    done
++	  fi # link_all_deplibs != no
++	fi # linkmode = lib
++      done # for deplib in $libs
++      if test $pass = dlpreopen; then
++	# Link the dlpreopened libraries before other libraries
++	for deplib in $save_deplibs; do
++	  deplibs="$deplib $deplibs"
++	done
++      fi
++      if test $pass != dlopen; then
++	test $pass != scan && dependency_libs="$newdependency_libs"
++	if test $pass != conv; then
++	  # Make sure lib_search_path contains only unique directories.
++	  lib_search_path=
++	  for dir in $newlib_search_path; do
++	    case "$lib_search_path " in
++	    *" $dir "*) ;;
++	    *) lib_search_path="$lib_search_path $dir" ;;
++	    esac
++	  done
++	  newlib_search_path=
++	fi
++
++	if test "$linkmode,$pass" != "prog,link"; then
++	  vars="deplibs"
++	else
++	  vars="compile_deplibs finalize_deplibs"
++	fi
++	for var in $vars dependency_libs; do
++	  # Add libraries to $var in reverse order
++	  eval tmp_libs=\"\$$var\"
++	  new_libs=
++	  for deplib in $tmp_libs; do
++	    case $deplib in
++	    -L*) new_libs="$deplib $new_libs" ;;
++	    *)
++	      case " $specialdeplibs " in
++	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
++	      *)
++		case " $new_libs " in
++		*" $deplib "*) ;;
++		*) new_libs="$deplib $new_libs" ;;
++		esac
++		;;
++	      esac
++	      ;;
++	    esac
++	  done
++	  tmp_libs=
++	  for deplib in $new_libs; do
++	    case $deplib in
++	    -L*)
++	      case " $tmp_libs " in
++	      *" $deplib "*) ;;
++	      *) tmp_libs="$tmp_libs $deplib" ;;
++	      esac
++	      ;;
++	    *) tmp_libs="$tmp_libs $deplib" ;;
++	    esac
++	  done
++	  eval $var=\"$tmp_libs\"
++	done # for var
++      fi
++      if test "$pass" = "conv" &&
++       { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
++	libs="$deplibs" # reset libs
++	deplibs=
++      fi
++    done # for pass
++    if test $linkmode = prog; then
++      dlfiles="$newdlfiles"
++      dlprefiles="$newdlprefiles"
++    fi
++
++    case $linkmode in
++    oldlib)
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$rpath"; then
++	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$xrpath"; then
++	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$vinfo"; then
++	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$release"; then
++	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
++	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
++      fi
++
++      # Now set the variables for building old libraries.
++      build_libtool_libs=no
++      oldlibs="$output"
++      objs="$objs$old_deplibs"
++      ;;
++
++    lib)
++      # Make sure we only generate libraries of the form `libNAME.la'.
++      case $outputname in
++      lib*)
++	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
++	eval libname=\"$libname_spec\"
++	;;
++      *)
++	if test "$module" = no; then
++	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
++	if test "$need_lib_prefix" != no; then
++	  # Add the "lib" prefix for modules if required
++	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
++	  eval libname=\"$libname_spec\"
++	else
++	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
++	fi
++	;;
++      esac
++
++      if test -n "$objs"; then
++	if test "$deplibs_check_method" != pass_all; then
++	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
++	  exit 1
++	else
++	  echo
++	  echo "*** Warning: Linking the shared library $output against the non-libtool"
++	  echo "*** objects $objs is not portable!"
++	  libobjs="$libobjs $objs"
++	fi
++      fi
++
++      if test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
++      fi
++
++      set dummy $rpath
++      if test $# -gt 2; then
++	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
++      fi
++      install_libdir="$2"
++
++      oldlibs=
++      if test -z "$rpath"; then
++	if test "$build_libtool_libs" = yes; then
++	  # Building a libtool convenience library.
++	  libext=al
++	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
++	  build_libtool_libs=convenience
++	  build_old_libs=yes
++	fi
++
++	if test -n "$vinfo"; then
++	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
++	fi
++
++	if test -n "$release"; then
++	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
++	fi
++      else
++
++	# Parse the version information argument.
++	save_ifs="$IFS"; IFS=':'
++	set dummy $vinfo 0 0 0
++	IFS="$save_ifs"
++
++	if test -n "$8"; then
++	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
++
++	current="$2"
++	revision="$3"
++	age="$4"
++
++	# Check that each of the things are valid numbers.
++	case $current in
++	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	*)
++	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	case $revision in
++	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	*)
++	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	case $age in
++	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	*)
++	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	if test $age -gt $current; then
++	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	fi
++
++	# Calculate the version variables.
++	major=
++	versuffix=
++	verstring=
++	case $version_type in
++	none) ;;
++
++	darwin)
++	  # Like Linux, but with the current version available in
++	  # verstring for coding it into the library header
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
++	  # Darwin ld doesn't like 0 for these options...
++	  minor_current=`expr $current + 1`
++	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  ;;
++
++	freebsd-aout)
++	  major=".$current"
++	  versuffix=".$current.$revision";
++	  ;;
++
++	freebsd-elf)
++	  major=".$current"
++	  versuffix=".$current";
++	  ;;
++
++	irix | nonstopux)
++	  major=`expr $current - $age + 1`
++
++	  case $version_type in
++	    nonstopux) verstring_prefix=nonstopux ;;
++	    *)         verstring_prefix=sgi ;;
++	  esac
++	  verstring="$verstring_prefix$major.$revision"
++
++	  # Add in all the interfaces that we are compatible with.
++	  loop=$revision
++	  while test $loop != 0; do
++	    iface=`expr $revision - $loop`
++	    loop=`expr $loop - 1`
++	    verstring="$verstring_prefix$major.$iface:$verstring"
++	  done
++
++	  # Before this point, $major must not contain `.'.
++	  major=.$major
++	  versuffix="$major.$revision"
++	  ;;
++
++	linux)
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
++	  ;;
++
++	osf)
++	  major=.`expr $current - $age`
++	  versuffix=".$current.$age.$revision"
++	  verstring="$current.$age.$revision"
++
++	  # Add in all the interfaces that we are compatible with.
++	  loop=$age
++	  while test $loop != 0; do
++	    iface=`expr $current - $loop`
++	    loop=`expr $loop - 1`
++	    verstring="$verstring:${iface}.0"
++	  done
++
++	  # Make executables depend on our current version.
++	  verstring="$verstring:${current}.0"
++	  ;;
++
++	sunos)
++	  major=".$current"
++	  versuffix=".$current.$revision"
++	  ;;
++
++	windows)
++	  # Use '-' rather than '.', since we only want one
++	  # extension on DOS 8.3 filesystems.
++	  major=`expr $current - $age`
++	  versuffix="-$major"
++	  ;;
++
++	*)
++	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	# Clear the version info if we defaulted, and they specified a release.
++	if test -z "$vinfo" && test -n "$release"; then
++	  major=
++	  verstring="0.0"
++	  case $version_type in
++	  darwin)
++	    # we can't check for "0.0" in archive_cmds due to quoting
++	    # problems, so we reset it completely
++	    verstring=""
++	    ;;
++	  *)
++	    verstring="0.0"
++	    ;;
++	  esac
++	  if test "$need_version" = no; then
++	    versuffix=
++	  else
++	    versuffix=".0.0"
++	  fi
++	fi
++
++	# Remove version info from name if versioning should be avoided
++	if test "$avoid_version" = yes && test "$need_version" = no; then
++	  major=
++	  versuffix=
++	  verstring=""
++	fi
++
++	# Check to see if the archive will have undefined symbols.
++	if test "$allow_undefined" = yes; then
++	  if test "$allow_undefined_flag" = unsupported; then
++	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
++	    build_libtool_libs=no
++	    build_old_libs=yes
++	  fi
++	else
++	  # Don't allow undefined symbols.
++	  allow_undefined_flag="$no_undefined_flag"
++	fi
++      fi
++
++      if test "$mode" != relink; then
++	# Remove our outputs.
++	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
++	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
++      fi
++
++      # Now set the variables for building old libraries.
++      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
++	oldlibs="$oldlibs $output_objdir/$libname.$libext"
++
++	# Transform .lo files to .o files.
++	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
++      fi
++
++      # Eliminate all temporary directories.
++      for path in $notinst_path; do
++	lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
++	deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
++	dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
++      done
++
++      if test -n "$xrpath"; then
++	# If the user specified any rpath flags, then add them.
++	temp_xrpath=
++	for libdir in $xrpath; do
++	  temp_xrpath="$temp_xrpath -R$libdir"
++	  case "$finalize_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_rpath="$finalize_rpath $libdir" ;;
++	  esac
++	done
++	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
++	  dependency_libs="$temp_xrpath $dependency_libs"
++	fi
++      fi
++
++      # Make sure dlfiles contains only unique files that won't be dlpreopened
++      old_dlfiles="$dlfiles"
++      dlfiles=
++      for lib in $old_dlfiles; do
++	case " $dlprefiles $dlfiles " in
++	*" $lib "*) ;;
++	*) dlfiles="$dlfiles $lib" ;;
++	esac
++      done
++
++      # Make sure dlprefiles contains only unique files
++      old_dlprefiles="$dlprefiles"
++      dlprefiles=
++      for lib in $old_dlprefiles; do
++	case "$dlprefiles " in
++	*" $lib "*) ;;
++	*) dlprefiles="$dlprefiles $lib" ;;
++	esac
++      done
++
++      if test "$build_libtool_libs" = yes; then
++	if test -n "$rpath"; then
++	  case $host in
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
++	    # these systems don't actually have a c library (as such)!
++	    ;;
++	  *-*-rhapsody* | *-*-darwin1.[012])
++	    # Rhapsody C library is in the System framework
++	    deplibs="$deplibs -framework System"
++	    ;;
++	  *-*-netbsd*)
++	    # Don't link with libc until the a.out ld.so is fixed.
++	    ;;
++	  *-*-openbsd* | *-*-freebsd*)
++	    # Do not include libc due to us having libc/libc_r.
++	    ;;
++	  *)
++	    # Add libc to deplibs on all other systems if necessary.
++	    if test $build_libtool_need_lc = "yes"; then
++	      deplibs="$deplibs -lc"
++	    fi
++	    ;;
++	  esac
++	fi
++
++	# Transform deplibs into only deplibs that can be linked in shared.
++	name_save=$name
++	libname_save=$libname
++	release_save=$release
++	versuffix_save=$versuffix
++	major_save=$major
++	# I'm not sure if I'm treating the release correctly.  I think
++	# release should show up in the -l (ie -lgmp5) so we don't want to
++	# add it in twice.  Is that correct?
++	release=""
++	versuffix=""
++	major=""
++	newdeplibs=
++	droppeddeps=no
++	case $deplibs_check_method in
++	pass_all)
++	  # Don't check for shared/static.  Everything works.
++	  # This might be a little naive.  We might want to check
++	  # whether the library exists or not.  But this is on
++	  # osf3 & osf4 and I'm not really sure... Just
++	  # implementing what was already the behaviour.
++	  newdeplibs=$deplibs
++	  ;;
++	test_compile)
++	  # This code stresses the "libraries are programs" paradigm to its
++	  # limits. Maybe even breaks it.  We compile a program, linking it
++	  # against the deplibs as a proxy for the library.  Then we can check
++	  # whether they linked in statically or dynamically with ldd.
++	  $rm conftest.c
++	  cat > conftest.c <<EOF
++	  int main() { return 0; }
++EOF
++	  $rm conftest
++	  $CC -o conftest conftest.c $deplibs
++	  if test $? -eq 0 ; then
++	    ldd_output=`ldd conftest`
++	    for i in $deplibs; do
++	      name="`expr $i : '-l\(.*\)'`"
++	      # If $name is empty we are operating on a -L argument.
++	      if test -n "$name" && test "$name" != "0"; then
++		libname=`eval \\$echo \"$libname_spec\"`
++		deplib_matches=`eval \\$echo \"$library_names_spec\"`
++		set dummy $deplib_matches
++		deplib_match=$2
++		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		  newdeplibs="$newdeplibs $i"
++		else
++		  droppeddeps=yes
++		  echo
++		  echo "*** Warning: dynamic linker does not accept needed library $i."
++		  echo "*** I have the capability to make that library automatically link in when"
++		  echo "*** you link to this library.  But I can only do this if you have a"
++		  echo "*** shared version of the library, which I believe you do not have"
++		  echo "*** because a test_compile did reveal that the linker did not use it for"
++		  echo "*** its dynamic dependency list that programs get resolved with at runtime."
++		fi
++	      else
++		newdeplibs="$newdeplibs $i"
++	      fi
++	    done
++	  else
++	    # Error occured in the first compile.  Let's try to salvage
++	    # the situation: Compile a separate program for each library.
++	    for i in $deplibs; do
++	      name="`expr $i : '-l\(.*\)'`"
++	     # If $name is empty we are operating on a -L argument.
++	      if test -n "$name" && test "$name" != "0"; then
++		$rm conftest
++		$CC -o conftest conftest.c $i
++		# Did it work?
++		if test $? -eq 0 ; then
++		  ldd_output=`ldd conftest`
++		  libname=`eval \\$echo \"$libname_spec\"`
++		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
++		  set dummy $deplib_matches
++		  deplib_match=$2
++		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		    newdeplibs="$newdeplibs $i"
++		  else
++		    droppeddeps=yes
++		    echo
++		    echo "*** Warning: dynamic linker does not accept needed library $i."
++		    echo "*** I have the capability to make that library automatically link in when"
++		    echo "*** you link to this library.  But I can only do this if you have a"
++		    echo "*** shared version of the library, which you do not appear to have"
++		    echo "*** because a test_compile did reveal that the linker did not use this one"
++		    echo "*** as a dynamic dependency that programs can get resolved with at runtime."
++		  fi
++		else
++		  droppeddeps=yes
++		  echo
++		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
++		  echo "***  make it link in!  You will probably need to install it or some"
++		  echo "*** library that it depends on before this library will be fully"
++		  echo "*** functional.  Installing it before continuing would be even better."
++		fi
++	      else
++		newdeplibs="$newdeplibs $i"
++	      fi
++	    done
++	  fi
++	  ;;
++	file_magic*)
++	  set dummy $deplibs_check_method
++	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++	  for a_deplib in $deplibs; do
++	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    # If $name is empty we are operating on a -L argument.
++	    if test -n "$name" && test "$name" != "0"; then
++	      libname=`eval \\$echo \"$libname_spec\"`
++	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
++		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++		    for potent_lib in $potential_libs; do
++		      # Follow soft links.
++		      if ls -lLd "$potent_lib" 2>/dev/null \
++			 | grep " -> " >/dev/null; then
++			continue
++		      fi
++		      # The statement above tries to avoid entering an
++		      # endless loop below, in case of cyclic links.
++		      # We might still enter an endless loop, since a link
++		      # loop can be closed while we follow links,
++		      # but so what?
++		      potlib="$potent_lib"
++		      while test -h "$potlib" 2>/dev/null; do
++			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
++			case $potliblink in
++			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
++			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
++			esac
++		      done
++		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
++			 | ${SED} 10q \
++			 | egrep "$file_magic_regex" > /dev/null; then
++			newdeplibs="$newdeplibs $a_deplib"
++			a_deplib=""
++			break 2
++		      fi
++		    done
++	      done
++	      if test -n "$a_deplib" ; then
++		droppeddeps=yes
++		echo
++		echo "*** Warning: linker path does not have real file for library $a_deplib."
++		echo "*** I have the capability to make that library automatically link in when"
++		echo "*** you link to this library.  But I can only do this if you have a"
++		echo "*** shared version of the library, which you do not appear to have"
++		echo "*** because I did check the linker path looking for a file starting"
++		if test -z "$potlib" ; then
++		  echo "*** with $libname but no candidates were found. (...for file magic test)"
++		else
++		  echo "*** with $libname and none of the candidates passed a file format test"
++		  echo "*** using a file magic. Last file checked: $potlib"
++		fi
++	      fi
++	    else
++	      # Add a -L argument.
++	      newdeplibs="$newdeplibs $a_deplib"
++	    fi
++	  done # Gone through all deplibs.
++	  ;;
++	match_pattern*)
++	  set dummy $deplibs_check_method
++	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++	  for a_deplib in $deplibs; do
++	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    # If $name is empty we are operating on a -L argument.
++	    if test -n "$name" && test "$name" != "0"; then
++	      libname=`eval \\$echo \"$libname_spec\"`
++	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
++		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++		for potent_lib in $potential_libs; do
++		  potlib="$potent_lib" # see symlink-check below in file_magic test
++		  if eval echo \"$potent_lib\" 2>/dev/null \
++		      | ${SED} 10q \
++		      | egrep "$match_pattern_regex" > /dev/null; then
++		    newdeplibs="$newdeplibs $a_deplib"
++		    a_deplib=""
++		    break 2
++		  fi
++		done
++	      done
++	      if test -n "$a_deplib" ; then
++		droppeddeps=yes
++		echo
++		echo "*** Warning: linker path does not have real file for library $a_deplib."
++		echo "*** I have the capability to make that library automatically link in when"
++		echo "*** you link to this library.  But I can only do this if you have a"
++		echo "*** shared version of the library, which you do not appear to have"
++		echo "*** because I did check the linker path looking for a file starting"
++		if test -z "$potlib" ; then
++		  echo "*** with $libname but no candidates were found. (...for regex pattern test)"
++		else
++		  echo "*** with $libname and none of the candidates passed a file format test"
++		  echo "*** using a regex pattern. Last file checked: $potlib"
++		fi
++	      fi
++	    else
++	      # Add a -L argument.
++	      newdeplibs="$newdeplibs $a_deplib"
++	    fi
++	  done # Gone through all deplibs.
++	  ;;
++	none | unknown | *)
++	  newdeplibs=""
++	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
++	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
++	     grep . >/dev/null; then
++	    echo
++	    if test "X$deplibs_check_method" = "Xnone"; then
++	      echo "*** Warning: inter-library dependencies are not supported in this platform."
++	    else
++	      echo "*** Warning: inter-library dependencies are not known to be supported."
++	    fi
++	    echo "*** All declared inter-library dependencies are being dropped."
++	    droppeddeps=yes
++	  fi
++	  ;;
++	esac
++	versuffix=$versuffix_save
++	major=$major_save
++	release=$release_save
++	libname=$libname_save
++	name=$name_save
++
++	case $host in
++	*-*-rhapsody* | *-*-darwin1.[012])
++	  # On Rhapsody replace the C library is the System framework
++	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	  ;;
++	esac
++
++	if test "$droppeddeps" = yes; then
++	  if test "$module" = yes; then
++	    echo
++	    echo "*** Warning: libtool could not satisfy all declared inter-library"
++	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
++	    echo "*** a static module, that should work as long as the dlopening"
++	    echo "*** application is linked with the -dlopen flag."
++	    if test -z "$global_symbol_pipe"; then
++	      echo
++	      echo "*** However, this would only work if libtool was able to extract symbol"
++	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++	      echo "*** not find such a program.  So, this module is probably useless."
++	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
++	    fi
++	    if test "$build_old_libs" = no; then
++	      oldlibs="$output_objdir/$libname.$libext"
++	      build_libtool_libs=module
++	      build_old_libs=yes
++	    else
++	      build_libtool_libs=no
++	    fi
++	  else
++	    echo "*** The inter-library dependencies that have been dropped here will be"
++	    echo "*** automatically added whenever a program is linked with this library"
++	    echo "*** or is declared to -dlopen it."
++
++	    if test $allow_undefined = no; then
++	      echo
++	      echo "*** Since this library must not contain undefined symbols,"
++	      echo "*** because either the platform does not support them or"
++	      echo "*** it was explicitly requested with -no-undefined,"
++	      echo "*** libtool will only create a static version of it."
++	      if test "$build_old_libs" = no; then
++		oldlibs="$output_objdir/$libname.$libext"
++		build_libtool_libs=module
++		build_old_libs=yes
++	      else
++		build_libtool_libs=no
++	      fi
++	    fi
++	  fi
++	fi
++	# Done checking deplibs!
++	deplibs=$newdeplibs
++      fi
++
++      # All the library-specific variables (install_libdir is set above).
++      library_names=
++      old_library=
++      dlname=
++
++      # Test again, we may have decided not to build it any more
++      if test "$build_libtool_libs" = yes; then
++	if test $hardcode_into_libs = yes; then
++	  # Hardcode the library paths
++	  hardcode_libdirs=
++	  dep_rpath=
++	  rpath="$finalize_rpath"
++	  test "$mode" != relink && rpath="$compile_rpath$rpath"
++	  for libdir in $rpath; do
++	    if test -n "$hardcode_libdir_flag_spec"; then
++	      if test -n "$hardcode_libdir_separator"; then
++		if test -z "$hardcode_libdirs"; then
++		  hardcode_libdirs="$libdir"
++		else
++		  # Just accumulate the unique libdirs.
++		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
++		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		    ;;
++		  *)
++		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		    ;;
++		  esac
++		fi
++	      else
++		eval flag=\"$hardcode_libdir_flag_spec\"
++		dep_rpath="$dep_rpath $flag"
++	      fi
++	    elif test -n "$runpath_var"; then
++	      case "$perm_rpath " in
++	      *" $libdir "*) ;;
++	      *) perm_rpath="$perm_rpath $libdir" ;;
++	      esac
++	    fi
++	  done
++	  # Substitute the hardcoded libdirs into the rpath.
++	  if test -n "$hardcode_libdir_separator" &&
++	     test -n "$hardcode_libdirs"; then
++	    libdir="$hardcode_libdirs"
++	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
++	  fi
++	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
++	    # We should set the runpath_var.
++	    rpath=
++	    for dir in $perm_rpath; do
++	      rpath="$rpath$dir:"
++	    done
++	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
++	  fi
++	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
++	fi
++
++	shlibpath="$finalize_shlibpath"
++	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
++	if test -n "$shlibpath"; then
++	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
++	fi
++
++	# Get the real and link names of the library.
++	eval library_names=\"$library_names_spec\"
++	set dummy $library_names
++	realname="$2"
++	shift; shift
++
++	if test -n "$soname_spec"; then
++	  eval soname=\"$soname_spec\"
++	else
++	  soname="$realname"
++	fi
++	test -z "$dlname" && dlname=$soname
++
++	lib="$output_objdir/$realname"
++	for link
++	do
++	  linknames="$linknames $link"
++	done
++
++	# Ensure that we have .o objects for linkers which dislike .lo
++	# (e.g. aix) in case we are running --disable-static
++	for obj in $libobjs; do
++	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
++	  if test "X$xdir" = "X$obj"; then
++	    xdir="."
++	  else
++	    xdir="$xdir"
++	  fi
++	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
++	  if test ! -f $xdir/$oldobj; then
++	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
++	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
++	  fi
++	done
++
++	# Use standard objects if they are pic
++	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++
++	# Prepare the list of exported symbols
++	if test -z "$export_symbols"; then
++	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
++	    $show "generating symbol list for \`$libname.la'"
++	    export_symbols="$output_objdir/$libname.exp"
++	    $run $rm $export_symbols
++	    eval cmds=\"$export_symbols_cmds\"
++	    save_ifs="$IFS"; IFS='~'
++	    for cmd in $cmds; do
++	      IFS="$save_ifs"
++	      $show "$cmd"
++	      $run eval "$cmd" || exit $?
++	    done
++	    IFS="$save_ifs"
++	    if test -n "$export_symbols_regex"; then
++	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
++	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
++	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
++	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
++	    fi
++	  fi
++	fi
++
++	if test -n "$export_symbols" && test -n "$include_expsyms"; then
++	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
++	fi
++
++	if test -n "$convenience"; then
++	  if test -n "$whole_archive_flag_spec"; then
++	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
++	  else
++	    gentop="$output_objdir/${outputname}x"
++	    $show "${rm}r $gentop"
++	    $run ${rm}r "$gentop"
++	    $show "mkdir $gentop"
++	    $run mkdir "$gentop"
++	    status=$?
++	    if test $status -ne 0 && test ! -d "$gentop"; then
++	      exit $status
++	    fi
++	    generated="$generated $gentop"
++
++	    for xlib in $convenience; do
++	      # Extract the objects.
++	      case $xlib in
++	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
++	      *) xabs=`pwd`"/$xlib" ;;
++	      esac
++	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
++	      xdir="$gentop/$xlib"
++
++	      $show "${rm}r $xdir"
++	      $run ${rm}r "$xdir"
++	      $show "mkdir $xdir"
++	      $run mkdir "$xdir"
++	      status=$?
++	      if test $status -ne 0 && test ! -d "$xdir"; then
++		exit $status
++	      fi
++	      $show "(cd $xdir && $AR x $xabs)"
++	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
++
++	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
++	    done
++	  fi
++	fi
++
++	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
++	  eval flag=\"$thread_safe_flag_spec\"
++	  linker_flags="$linker_flags $flag"
++	fi
++
++	# Make a backup of the uninstalled library when relinking
++	if test "$mode" = relink; then
++	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
++	fi
++
++	# Do each of the archive commands.
++	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
++	  eval cmds=\"$archive_expsym_cmds\"
++	else
++	  save_deplibs="$deplibs"
++	  for conv in $convenience; do
++	    tmp_deplibs=
++	    for test_deplib in $deplibs; do
++	      if test "$test_deplib" != "$conv"; then
++		tmp_deplibs="$tmp_deplibs $test_deplib"
++	      fi
++	    done
++	    deplibs="$tmp_deplibs"
++	  done
++	  eval cmds=\"$archive_cmds\"
++	  deplibs="$save_deplibs"
++	fi
++	save_ifs="$IFS"; IFS='~'
++	for cmd in $cmds; do
++	  IFS="$save_ifs"
++	  $show "$cmd"
++	  $run eval "$cmd" || exit $?
++	done
++	IFS="$save_ifs"
++
++	# Restore the uninstalled library and exit
++	if test "$mode" = relink; then
++	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
++	  exit 0
++	fi
++
++	# Create links to the real library.
++	for linkname in $linknames; do
++	  if test "$realname" != "$linkname"; then
++	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
++	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
++	  fi
++	done
++
++	# If -module or -export-dynamic was specified, set the dlname.
++	if test "$module" = yes || test "$export_dynamic" = yes; then
++	  # On all known operating systems, these are identical.
++	  dlname="$soname"
++	fi
++      fi
++      ;;
++
++    obj)
++      if test -n "$deplibs"; then
++	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
++      fi
++
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
++      fi
++
++      if test -n "$rpath"; then
++	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
++      fi
++
++      if test -n "$xrpath"; then
++	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
++      fi
++
++      if test -n "$vinfo"; then
++	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
++      fi
++
++      if test -n "$release"; then
++	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
++      fi
++
++      case $output in
++      *.lo)
++	if test -n "$objs$old_deplibs"; then
++	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
++	  exit 1
++	fi
++	libobj="$output"
++	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
++	;;
++      *)
++	libobj=
++	obj="$output"
++	;;
++      esac
++
++      # Delete the old objects.
++      $run $rm $obj $libobj
++
++      # Objects from convenience libraries.  This assumes
++      # single-version convenience libraries.  Whenever we create
++      # different ones for PIC/non-PIC, this we'll have to duplicate
++      # the extraction.
++      reload_conv_objs=
++      gentop=
++      # reload_cmds runs $LD directly, so let us get rid of
++      # -Wl from whole_archive_flag_spec
++      wl=
++
++      if test -n "$convenience"; then
++	if test -n "$whole_archive_flag_spec"; then
++	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++	else
++	  gentop="$output_objdir/${obj}x"
++	  $show "${rm}r $gentop"
++	  $run ${rm}r "$gentop"
++	  $show "mkdir $gentop"
++	  $run mkdir "$gentop"
++	  status=$?
++	  if test $status -ne 0 && test ! -d "$gentop"; then
++	    exit $status
++	  fi
++	  generated="$generated $gentop"
++
++	  for xlib in $convenience; do
++	    # Extract the objects.
++	    case $xlib in
++	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
++	    *) xabs=`pwd`"/$xlib" ;;
++	    esac
++	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
++	    xdir="$gentop/$xlib"
++
++	    $show "${rm}r $xdir"
++	    $run ${rm}r "$xdir"
++	    $show "mkdir $xdir"
++	    $run mkdir "$xdir"
++	    status=$?
++	    if test $status -ne 0 && test ! -d "$xdir"; then
++	      exit $status
++	    fi
++	    $show "(cd $xdir && $AR x $xabs)"
++	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
++
++	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
++	  done
++	fi
++      fi
++
++      # Create the old-style object.
++      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
++
++      output="$obj"
++      eval cmds=\"$reload_cmds\"
++      save_ifs="$IFS"; IFS='~'
++      for cmd in $cmds; do
++	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
++      done
++      IFS="$save_ifs"
++
++      # Exit if we aren't doing a library object file.
++      if test -z "$libobj"; then
++	if test -n "$gentop"; then
++	  $show "${rm}r $gentop"
++	  $run ${rm}r $gentop
++	fi
++
++	exit 0
++      fi
++
++      if test "$build_libtool_libs" != yes; then
++	if test -n "$gentop"; then
++	  $show "${rm}r $gentop"
++	  $run ${rm}r $gentop
++	fi
++
++	# Create an invalid libtool object if no PIC, so that we don't
++	# accidentally link it into a program.
++	$show "echo timestamp > $libobj"
++	$run eval "echo timestamp > $libobj" || exit $?
++	exit 0
++      fi
++
++      if test -n "$pic_flag" || test "$pic_mode" != default; then
++	# Only do commands if we really have different PIC objects.
++	reload_objs="$libobjs $reload_conv_objs"
++	output="$libobj"
++	eval cmds=\"$reload_cmds\"
++	save_ifs="$IFS"; IFS='~'
++	for cmd in $cmds; do
++	  IFS="$save_ifs"
++	  $show "$cmd"
++	  $run eval "$cmd" || exit $?
++	done
++	IFS="$save_ifs"
++      else
++	# Just create a symlink.
++	$show $rm $libobj
++	$run $rm $libobj
++	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
++	if test "X$xdir" = "X$libobj"; then
++	  xdir="."
++	else
++	  xdir="$xdir"
++	fi
++	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
++	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
++	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
++	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
++      fi
++
++      if test -n "$gentop"; then
++	$show "${rm}r $gentop"
++	$run ${rm}r $gentop
++      fi
++
++      exit 0
++      ;;
++
++    prog)
++      case $host in
++	*cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
++      esac
++      if test -n "$vinfo"; then
++	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
++      fi
++
++      if test -n "$release"; then
++	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
++      fi
++
++      if test "$preload" = yes; then
++	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
++	   test "$dlopen_self_static" = unknown; then
++	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
++	fi
++      fi
++
++      case $host in
++      *-*-rhapsody* | *-*-darwin1.[012])
++	# On Rhapsody replace the C library is the System framework
++	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	case $host in
++	*darwin*)
++	  # Don't allow lazy linking, it breaks C++ global constructors
++	  compile_command="$compile_command ${wl}-bind_at_load"
++	  finalize_command="$finalize_command ${wl}-bind_at_load"
++	  ;;
++	esac
++	;;
++      esac
++
++      compile_command="$compile_command $compile_deplibs"
++      finalize_command="$finalize_command $finalize_deplibs"
++
++      if test -n "$rpath$xrpath"; then
++	# If the user specified any rpath flags, then add them.
++	for libdir in $rpath $xrpath; do
++	  # This is the magic to use -rpath.
++	  case "$finalize_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_rpath="$finalize_rpath $libdir" ;;
++	  esac
++	done
++      fi
++
++      # Now hardcode the library paths
++      rpath=
++      hardcode_libdirs=
++      for libdir in $compile_rpath $finalize_rpath; do
++	if test -n "$hardcode_libdir_flag_spec"; then
++	  if test -n "$hardcode_libdir_separator"; then
++	    if test -z "$hardcode_libdirs"; then
++	      hardcode_libdirs="$libdir"
++	    else
++	      # Just accumulate the unique libdirs.
++	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
++	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		;;
++	      *)
++		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		;;
++	      esac
++	    fi
++	  else
++	    eval flag=\"$hardcode_libdir_flag_spec\"
++	    rpath="$rpath $flag"
++	  fi
++	elif test -n "$runpath_var"; then
++	  case "$perm_rpath " in
++	  *" $libdir "*) ;;
++	  *) perm_rpath="$perm_rpath $libdir" ;;
++	  esac
++	fi
++	case $host in
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  case :$dllsearchpath: in
++	  *":$libdir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$libdir";;
++	  esac
++	  ;;
++	esac
++      done
++      # Substitute the hardcoded libdirs into the rpath.
++      if test -n "$hardcode_libdir_separator" &&
++	 test -n "$hardcode_libdirs"; then
++	libdir="$hardcode_libdirs"
++	eval rpath=\" $hardcode_libdir_flag_spec\"
++      fi
++      compile_rpath="$rpath"
++
++      rpath=
++      hardcode_libdirs=
++      for libdir in $finalize_rpath; do
++	if test -n "$hardcode_libdir_flag_spec"; then
++	  if test -n "$hardcode_libdir_separator"; then
++	    if test -z "$hardcode_libdirs"; then
++	      hardcode_libdirs="$libdir"
++	    else
++	      # Just accumulate the unique libdirs.
++	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
++	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		;;
++	      *)
++		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		;;
++	      esac
++	    fi
++	  else
++	    eval flag=\"$hardcode_libdir_flag_spec\"
++	    rpath="$rpath $flag"
++	  fi
++	elif test -n "$runpath_var"; then
++	  case "$finalize_perm_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
++	  esac
++	fi
++      done
++      # Substitute the hardcoded libdirs into the rpath.
++      if test -n "$hardcode_libdir_separator" &&
++	 test -n "$hardcode_libdirs"; then
++	libdir="$hardcode_libdirs"
++	eval rpath=\" $hardcode_libdir_flag_spec\"
++      fi
++      finalize_rpath="$rpath"
++
++      if test -n "$libobjs" && test "$build_old_libs" = yes; then
++	# Transform all the library objects into standard objects.
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++      fi
++
++      dlsyms=
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	if test -n "$NM" && test -n "$global_symbol_pipe"; then
++	  dlsyms="${outputname}S.c"
++	else
++	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
++	fi
++      fi
++
++      if test -n "$dlsyms"; then
++	case $dlsyms in
++	"") ;;
++	*.c)
++	  # Discover the nlist of each of the dlfiles.
++	  nlist="$output_objdir/${outputname}.nm"
++
++	  $show "$rm $nlist ${nlist}S ${nlist}T"
++	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
++
++	  # Parse the name list into a source file.
++	  $show "creating $output_objdir/$dlsyms"
++
++	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
++/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
++/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
++
++#ifdef __cplusplus
++extern \"C\" {
++#endif
++
++/* Prevent the only kind of declaration conflicts we can make. */
++#define lt_preloaded_symbols some_other_symbol
++
++/* External symbol declarations for the compiler. */\
++"
++
++	  if test "$dlself" = yes; then
++	    $show "generating symbol list for \`$output'"
++
++	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
++
++	    # Add our own program objects to the symbol list.
++	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	    for arg in $progfiles; do
++	      $show "extracting global C symbols from \`$arg'"
++	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
++	    done
++
++	    if test -n "$exclude_expsyms"; then
++	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
++	      $run eval '$mv "$nlist"T "$nlist"'
++	    fi
++
++	    if test -n "$export_symbols_regex"; then
++	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
++	      $run eval '$mv "$nlist"T "$nlist"'
++	    fi
++
++	    # Prepare the list of exported symbols
++	    if test -z "$export_symbols"; then
++	      export_symbols="$output_objdir/$output.exp"
++	      $run $rm $export_symbols
++	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	    else
++	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
++	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++	      $run eval 'mv "$nlist"T "$nlist"'
++	    fi
++	  fi
++
++	  for arg in $dlprefiles; do
++	    $show "extracting global C symbols from \`$arg'"
++	    name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
++	    $run eval 'echo ": $name " >> "$nlist"'
++	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
++	  done
++
++	  if test -z "$run"; then
++	    # Make sure we have at least an empty file.
++	    test -f "$nlist" || : > "$nlist"
++
++	    if test -n "$exclude_expsyms"; then
++	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
++	      $mv "$nlist"T "$nlist"
++	    fi
++
++	    # Try sorting and uniquifying the output.
++	    if grep -v "^: " < "$nlist" |
++		if sort -k 3 </dev/null >/dev/null 2>&1; then
++		  sort -k 3
++		else
++		  sort +2
++		fi |
++		uniq > "$nlist"S; then
++	      :
++	    else
++	      grep -v "^: " < "$nlist" > "$nlist"S
++	    fi
++
++	    if test -f "$nlist"S; then
++	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
++	    else
++	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
++	    fi
++
++	    $echo >> "$output_objdir/$dlsyms" "\
++
++#undef lt_preloaded_symbols
++
++#if defined (__STDC__) && __STDC__
++# define lt_ptr void *
++#else
++# define lt_ptr char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr address;
++}
++lt_preloaded_symbols[] =
++{\
++"
++
++	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
++
++	    $echo >> "$output_objdir/$dlsyms" "\
++  {0, (lt_ptr) 0}
++};
++
++/* This works around a problem in FreeBSD linker */
++#ifdef FREEBSD_WORKAROUND
++static const void *lt_preloaded_setup() {
++  return lt_preloaded_symbols;
++}
++#endif
++
++#ifdef __cplusplus
++}
++#endif\
++"
++	  fi
++
++	  pic_flag_for_symtable=
++	  case $host in
++	  # compiling the symbol table file with pic_flag works around
++	  # a FreeBSD bug that causes programs to crash when -lm is
++	  # linked before any other PIC object.  But we must not use
++	  # pic_flag when linking with -static.  The problem exists in
++	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
++	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
++	    case "$compile_command " in
++	    *" -static "*) ;;
++	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
++	    esac;;
++	  *-*-hpux*)
++	    case "$compile_command " in
++	    *" -static "*) ;;
++	    *) pic_flag_for_symtable=" $pic_flag -DPIC";;
++	    esac
++	  esac
++
++	  # Now compile the dynamic symbol file.
++	  $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++	  $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++
++	  # Clean up the generated files.
++	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
++	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
++
++	  # Transform the symbol file into the correct name.
++	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++	  ;;
++	*)
++	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
++	  exit 1
++	  ;;
++	esac
++      else
++	# We keep going just in case the user didn't refer to
++	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
++	# really was required.
++
++	# Nullify the symbol file.
++	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
++	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++      fi
++
++      if test $need_relink = no || test "$build_libtool_libs" != yes; then
++	# Replace the output file specification.
++	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++	link_command="$compile_command$compile_rpath"
++
++	# We have no uninstalled library dependencies, so finalize right now.
++	$show "$link_command"
++	$run eval "$link_command"
++	status=$?
++
++	# Delete the generated files.
++	if test -n "$dlsyms"; then
++	  $show "$rm $output_objdir/${outputname}S.${objext}"
++	  $run $rm "$output_objdir/${outputname}S.${objext}"
++	fi
++
++	exit $status
++      fi
++
++      if test -n "$shlibpath_var"; then
++	# We should set the shlibpath_var
++	rpath=
++	for dir in $temp_rpath; do
++	  case $dir in
++	  [\\/]* | [A-Za-z]:[\\/]*)
++	    # Absolute path.
++	    rpath="$rpath$dir:"
++	    ;;
++	  *)
++	    # Relative path: add a thisdir entry.
++	    rpath="$rpath\$thisdir/$dir:"
++	    ;;
++	  esac
++	done
++	temp_rpath="$rpath"
++      fi
++
++      if test -n "$compile_shlibpath$finalize_shlibpath"; then
++	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
++      fi
++      if test -n "$finalize_shlibpath"; then
++	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
++      fi
++
++      compile_var=
++      finalize_var=
++      if test -n "$runpath_var"; then
++	if test -n "$perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $perm_rpath; do
++	    rpath="$rpath$dir:"
++	  done
++	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	fi
++	if test -n "$finalize_perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $finalize_perm_rpath; do
++	    rpath="$rpath$dir:"
++	  done
++	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	fi
++      fi
++
++      if test "$no_install" = yes; then
++	# We don't need to create a wrapper script.
++	link_command="$compile_var$compile_command$compile_rpath"
++	# Replace the output file specification.
++	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++	# Delete the old output file.
++	$run $rm $output
++	# Link the executable and exit
++	$show "$link_command"
++	$run eval "$link_command" || exit $?
++	exit 0
++      fi
++
++      if test "$hardcode_action" = relink; then
++	# Fast installation is not supported
++	link_command="$compile_var$compile_command$compile_rpath"
++	relink_command="$finalize_var$finalize_command$finalize_rpath"
++
++	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
++	$echo "$modename: \`$output' will be relinked during installation" 1>&2
++      else
++	if test "$fast_install" != no; then
++	  link_command="$finalize_var$compile_command$finalize_rpath"
++	  if test "$fast_install" = yes; then
++	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++	  else
++	    # fast_install is set to needless
++	    relink_command=
++	  fi
++	else
++	  link_command="$compile_var$compile_command$compile_rpath"
++	  relink_command="$finalize_var$finalize_command$finalize_rpath"
++	fi
++      fi
++
++      # Replace the output file specification.
++      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
++
++      # Delete the old output files.
++      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
++
++      $show "$link_command"
++      $run eval "$link_command" || exit $?
++
++      # Now create the wrapper script.
++      $show "creating $output"
++
++      # Quote the relink command for shipping.
++      if test -n "$relink_command"; then
++	# Preserve any variables that may affect compiler behavior
++	for var in $variables_saved_for_relink; do
++	  if eval test -z \"\${$var+set}\"; then
++	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
++	  elif eval var_value=\$$var; test -z "$var_value"; then
++	    relink_command="$var=; export $var; $relink_command"
++	  else
++	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
++	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
++	  fi
++	done
++	relink_command="(cd `pwd`; $relink_command)"
++	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      fi
++
++      # Quote $echo for shipping.
++      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
++	case $0 in
++	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
++	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++	esac
++	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
++      else
++	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
++      fi
++
++      # Only actually do things if our run command is non-null.
++      if test -z "$run"; then
++	# win32 will think the script is a binary if it has
++	# a .exe suffix, so we strip it off here.
++	case $output in
++	  *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
++	esac
++	# test for cygwin because mv fails w/o .exe extensions
++	case $host in
++	  *cygwin*) exeext=.exe ;;
++	  *) exeext= ;;
++	esac
++	$rm $output
++	trap "$rm $output; exit 1" 1 2 15
++
++	$echo > $output "\
++#! $SHELL
++
++# $output - temporary wrapper script for $objdir/$outputname
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++#
++# The $output program cannot be directly executed until all the libtool
++# libraries that it depends on are installed.
++#
++# This wrapper script should never be moved out of the build directory.
++# If it is, it will not operate correctly.
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed="${SED}"' -e 1s/^X//'
++sed_quote_subst='$sed_quote_subst'
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++
++relink_command=\"$relink_command\"
++
++# This environment variable determines our operation mode.
++if test \"\$libtool_install_magic\" = \"$magic\"; then
++  # install mode needs the following variable:
++  notinst_deplibs='$notinst_deplibs'
++else
++  # When we are sourced in execute mode, \$file and \$echo are already set.
++  if test \"\$libtool_execute_magic\" != \"$magic\"; then
++    echo=\"$qecho\"
++    file=\"\$0\"
++    # Make sure echo works.
++    if test \"X\$1\" = X--no-reexec; then
++      # Discard the --no-reexec flag, and continue.
++      shift
++    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
++      # Yippee, \$echo works!
++      :
++    else
++      # Restart under the correct shell, and then maybe \$echo will work.
++      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
++    fi
++  fi\
++"
++	$echo >> $output "\
++
++  # Find the directory that this script lives in.
++  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
++  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
++
++  # Follow symbolic links until we get to the real thisdir.
++  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
++  while test -n \"\$file\"; do
++    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
++
++    # If there was a directory component, then change thisdir.
++    if test \"x\$destdir\" != \"x\$file\"; then
++      case \"\$destdir\" in
++      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
++      *) thisdir=\"\$thisdir/\$destdir\" ;;
++      esac
++    fi
++
++    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
++    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
++  done
++
++  # Try to get the absolute directory name.
++  absdir=\`cd \"\$thisdir\" && pwd\`
++  test -n \"\$absdir\" && thisdir=\"\$absdir\"
++"
++
++	if test "$fast_install" = yes; then
++	  echo >> $output "\
++  program=lt-'$outputname'$exeext
++  progdir=\"\$thisdir/$objdir\"
++
++  if test ! -f \"\$progdir/\$program\" || \\
++     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
++       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
++
++    file=\"\$\$-\$program\"
++
++    if test ! -d \"\$progdir\"; then
++      $mkdir \"\$progdir\"
++    else
++      $rm \"\$progdir/\$file\"
++    fi"
++
++	  echo >> $output "\
++
++    # relink executable if necessary
++    if test -n \"\$relink_command\"; then
++      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
++      else
++	$echo \"\$relink_command_output\" >&2
++	$rm \"\$progdir/\$file\"
++	exit 1
++      fi
++    fi
++
++    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
++    { $rm \"\$progdir/\$program\";
++      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
++    $rm \"\$progdir/\$file\"
++  fi"
++	else
++	  echo >> $output "\
++  program='$outputname'
++  progdir=\"\$thisdir/$objdir\"
++"
++	fi
++
++	echo >> $output "\
++
++  if test -f \"\$progdir/\$program\"; then"
++
++	# Export our shlibpath_var if we have one.
++	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++	  $echo >> $output "\
++    # Add our own library path to $shlibpath_var
++    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
++
++    # Some systems cannot cope with colon-terminated $shlibpath_var
++    # The second colon is a workaround for a bug in BeOS R4 ${SED}
++    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
++
++    export $shlibpath_var
++"
++	fi
++
++	# fixup the dll searchpath if we need to.
++	if test -n "$dllsearchpath"; then
++	  $echo >> $output "\
++    # Add the dll search path components to the executable PATH
++    PATH=$dllsearchpath:\$PATH
++"
++	fi
++
++	$echo >> $output "\
++    if test \"\$libtool_execute_magic\" != \"$magic\"; then
++      # Run the actual program with our arguments.
++"
++	case $host in
++	# win32 systems need to use the prog path for dll
++	# lookup to work
++	*-*-cygwin* | *-*-pw32*)
++	  $echo >> $output "\
++      exec \$progdir/\$program \${1+\"\$@\"}
++"
++	  ;;
++
++	# Backslashes separate directories on plain windows
++	*-*-mingw | *-*-os2*)
++	  $echo >> $output "\
++      exec \$progdir\\\\\$program \${1+\"\$@\"}
++"
++	  ;;
++
++	*)
++	  $echo >> $output "\
++      # Export the path to the program.
++      PATH=\"\$progdir:\$PATH\"
++      export PATH
++
++      exec \$program \${1+\"\$@\"}
++"
++	  ;;
++	esac
++	$echo >> $output "\
++      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
++      exit 1
++    fi
++  else
++    # The program doesn't exist.
++    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++    \$echo \"This script is just a wrapper for \$program.\" 1>&2
++    echo \"See the $PACKAGE documentation for more information.\" 1>&2
++    exit 1
++  fi
++fi\
++"
++	chmod +x $output
++      fi
++      exit 0
++      ;;
++    esac
++
++    # See if we need to build an old-fashioned archive.
++    for oldlib in $oldlibs; do
++
++      if test "$build_libtool_libs" = convenience; then
++	oldobjs="$libobjs_save"
++	addlibs="$convenience"
++	build_libtool_libs=no
++      else
++	if test "$build_libtool_libs" = module; then
++	  oldobjs="$libobjs_save"
++	  build_libtool_libs=no
++	else
++	  oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
++	fi
++	addlibs="$old_convenience"
++      fi
++
++      if test -n "$addlibs"; then
++	gentop="$output_objdir/${outputname}x"
++	$show "${rm}r $gentop"
++	$run ${rm}r "$gentop"
++	$show "mkdir $gentop"
++	$run mkdir "$gentop"
++	status=$?
++	if test $status -ne 0 && test ! -d "$gentop"; then
++	  exit $status
++	fi
++	generated="$generated $gentop"
++
++	# Add in members from convenience archives.
++	for xlib in $addlibs; do
++	  # Extract the objects.
++	  case $xlib in
++	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
++	  *) xabs=`pwd`"/$xlib" ;;
++	  esac
++	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
++	  xdir="$gentop/$xlib"
++
++	  $show "${rm}r $xdir"
++	  $run ${rm}r "$xdir"
++	  $show "mkdir $xdir"
++	  $run mkdir "$xdir"
++	  status=$?
++	  if test $status -ne 0 && test ! -d "$xdir"; then
++	    exit $status
++	  fi
++	  $show "(cd $xdir && $AR x $xabs)"
++	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
++
++	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
++	done
++      fi
++
++      # Do each command in the archive commands.
++      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
++	eval cmds=\"$old_archive_from_new_cmds\"
++      else
++	# Ensure that we have .o objects in place in case we decided
++	# not to build a shared library, and have fallen back to building
++	# static libs even though --disable-static was passed!
++	for oldobj in $oldobjs; do
++	  if test ! -f $oldobj; then
++	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
++	    if test "X$xdir" = "X$oldobj"; then
++	      xdir="."
++	    else
++	      xdir="$xdir"
++	    fi
++	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
++	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
++	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
++	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
++	  fi
++	done
++
++	eval cmds=\"$old_archive_cmds\"
++      fi
++      save_ifs="$IFS"; IFS='~'
++      for cmd in $cmds; do
++	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
++      done
++      IFS="$save_ifs"
++    done
++
++    if test -n "$generated"; then
++      $show "${rm}r$generated"
++      $run ${rm}r$generated
++    fi
++
++    # Now create the libtool archive.
++    case $output in
++    *.la)
++      old_library=
++      test "$build_old_libs" = yes && old_library="$libname.$libext"
++      $show "creating $output"
++
++      # Preserve any variables that may affect compiler behavior
++      for var in $variables_saved_for_relink; do
++	if eval test -z \"\${$var+set}\"; then
++	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
++	elif eval var_value=\$$var; test -z "$var_value"; then
++	  relink_command="$var=; export $var; $relink_command"
++	else
++	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
++	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
++	fi
++      done
++      # Quote the link command for shipping.
++      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
++      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++
++      # Only create the output if not a dry run.
++      if test -z "$run"; then
++	for installed in no yes; do
++	  if test "$installed" = yes; then
++	    if test -z "$install_libdir"; then
++	      break
++	    fi
++	    output="$output_objdir/$outputname"i
++	    # Replace all uninstalled libtool libraries with the installed ones
++	    newdependency_libs=
++	    for deplib in $dependency_libs; do
++	      case $deplib in
++	      *.la)
++		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
++		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		if test -z "$libdir"; then
++		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
++		  exit 1
++		fi
++		newdependency_libs="$newdependency_libs $libdir/$name"
++		;;
++	      *) newdependency_libs="$newdependency_libs $deplib" ;;
++	      esac
++	    done
++	    dependency_libs="$newdependency_libs"
++	    newdlfiles=
++	    for lib in $dlfiles; do
++	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
++	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++	      if test -z "$libdir"; then
++		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++		exit 1
++	      fi
++	      newdlfiles="$newdlfiles $libdir/$name"
++	    done
++	    dlfiles="$newdlfiles"
++	    newdlprefiles=
++	    for lib in $dlprefiles; do
++	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
++	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++	      if test -z "$libdir"; then
++		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++		exit 1
++	      fi
++	      newdlprefiles="$newdlprefiles $libdir/$name"
++	    done
++	    dlprefiles="$newdlprefiles"
++	  fi
++	  $rm $output
++	  # place dlname in correct position for cygwin
++	  tdlname=$dlname
++	  case $host,$output,$installed,$module,$dlname in
++	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
++	  esac
++	  $echo > $output "\
++# $outputname - a libtool library file
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
++
++# The name that we can dlopen(3).
++dlname='$tdlname'
++
++# Names of this library.
++library_names='$library_names'
++
++# The name of the static archive.
++old_library='$old_library'
++
++# Libraries that this one depends upon.
++dependency_libs='$dependency_libs'
++
++# Version information for $libname.
++current=$current
++age=$age
++revision=$revision
++
++# Is this an already installed library?
++installed=$installed
++
++# Files to dlopen/dlpreopen
++dlopen='$dlfiles'
++dlpreopen='$dlprefiles'
++
++# Directory that this library needs to be installed in:
++libdir='$install_libdir'"
++	  if test "$installed" = no && test $need_relink = yes; then
++	    $echo >> $output "\
++relink_command=\"$relink_command\""
++	  fi
++	done
++      fi
++
++      # Do a symbolic link so that the libtool archive can be found in
++      # LD_LIBRARY_PATH before the program is installed.
++      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
++      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
++      ;;
++    esac
++    exit 0
++    ;;
++
++  # libtool install mode
++  install)
++    modename="$modename: install"
++
++    # There may be an optional sh(1) argument at the beginning of
++    # install_prog (especially on Windows NT).
++    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
++       # Allow the use of GNU shtool's install command.
++       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++      # Aesthetically quote it.
++      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
++      case $arg in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++	arg="\"$arg\""
++	;;
++      esac
++      install_prog="$arg "
++      arg="$1"
++      shift
++    else
++      install_prog=
++      arg="$nonopt"
++    fi
++
++    # The real first argument should be the name of the installation program.
++    # Aesthetically quote it.
++    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++    case $arg in
++    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      arg="\"$arg\""
++      ;;
++    esac
++    install_prog="$install_prog$arg"
++
++    # We need to accept at least all the BSD install flags.
++    dest=
++    files=
++    opts=
++    prev=
++    install_type=
++    isdir=no
++    stripme=
++    for arg
++    do
++      if test -n "$dest"; then
++	files="$files $dest"
++	dest="$arg"
++	continue
++      fi
++
++      case $arg in
++      -d) isdir=yes ;;
++      -f) prev="-f" ;;
++      -g) prev="-g" ;;
++      -m) prev="-m" ;;
++      -o) prev="-o" ;;
++      -s)
++	stripme=" -s"
++	continue
++	;;
++      -*) ;;
++
++      *)
++	# If the previous option needed an argument, then skip it.
++	if test -n "$prev"; then
++	  prev=
++	else
++	  dest="$arg"
++	  continue
++	fi
++	;;
++      esac
++
++      # Aesthetically quote the argument.
++      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++      case $arg in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++	arg="\"$arg\""
++	;;
++      esac
++      install_prog="$install_prog $arg"
++    done
++
++    if test -z "$install_prog"; then
++      $echo "$modename: you must specify an install program" 1>&2
++      $echo "$help" 1>&2
++      exit 1
++    fi
++
++    if test -n "$prev"; then
++      $echo "$modename: the \`$prev' option requires an argument" 1>&2
++      $echo "$help" 1>&2
++      exit 1
++    fi
++
++    if test -z "$files"; then
++      if test -z "$dest"; then
++	$echo "$modename: no file or destination specified" 1>&2
++      else
++	$echo "$modename: you must specify a destination" 1>&2
++      fi
++      $echo "$help" 1>&2
++      exit 1
++    fi
++
++    # Strip any trailing slash from the destination.
++    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
++
++    # Check to see that the destination is a directory.
++    test -d "$dest" && isdir=yes
++    if test "$isdir" = yes; then
++      destdir="$dest"
++      destname=
++    else
++      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
++      test "X$destdir" = "X$dest" && destdir=.
++      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
++
++      # Not a directory, so check to see that there is only one file specified.
++      set dummy $files
++      if test $# -gt 2; then
++	$echo "$modename: \`$dest' is not a directory" 1>&2
++	$echo "$help" 1>&2
++	exit 1
++      fi
++    fi
++    case $destdir in
++    [\\/]* | [A-Za-z]:[\\/]*) ;;
++    *)
++      for file in $files; do
++	case $file in
++	*.lo) ;;
++	*)
++	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	  ;;
++	esac
++      done
++      ;;
++    esac
++
++    # This variable tells wrapper scripts just to set variables rather
++    # than running their programs.
++    libtool_install_magic="$magic"
++
++    staticlibs=
++    future_libdirs=
++    current_libdirs=
++    for file in $files; do
++
++      # Do each installation.
++      case $file in
++      *.$libext)
++	# Do the static libraries later.
++	staticlibs="$staticlibs $file"
++	;;
++
++      *.la)
++	# Check to see that this really is a libtool archive.
++	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
++
++	library_names=
++	old_library=
++	relink_command=
++	# If there is no directory component, then add one.
++	case $file in
++	*/* | *\\*) . $file ;;
++	*) . ./$file ;;
++	esac
++
++	# Add the libdir to current_libdirs if it is the destination.
++	if test "X$destdir" = "X$libdir"; then
++	  case "$current_libdirs " in
++	  *" $libdir "*) ;;
++	  *) current_libdirs="$current_libdirs $libdir" ;;
++	  esac
++	else
++	  # Note the libdir as a future libdir.
++	  case "$future_libdirs " in
++	  *" $libdir "*) ;;
++	  *) future_libdirs="$future_libdirs $libdir" ;;
++	  esac
++	fi
++
++	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
++	test "X$dir" = "X$file/" && dir=
++	dir="$dir$objdir"
++
++	if test -n "$relink_command"; then
++          # Determine the prefix the user has applied to our future dir.
++          inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
++ 
++          # Don't allow the user to place us outside of our expected
++          # location b/c this prevents finding dependent libraries that
++          # are installed to the same prefix.
++          if test "$inst_prefix_dir" = "$destdir"; then
++            $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++            exit 1
++          fi
++ 
++          if test -n "$inst_prefix_dir"; then
++            # Stick the inst_prefix_dir data into the link command.
++            relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++          else
++            relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
++          fi
++
++	  $echo "$modename: warning: relinking \`$file'" 1>&2
++	  $show "$relink_command"
++	  if $run eval "$relink_command"; then :
++	  else
++	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
++	    exit 1
++	  fi
++	fi
++
++	# See the names of the shared library.
++	set dummy $library_names
++	if test -n "$2"; then
++	  realname="$2"
++	  shift
++	  shift
++
++	  srcname="$realname"
++	  test -n "$relink_command" && srcname="$realname"T
++
++	  # Install the shared library and build the symlinks.
++	  $show "$install_prog $dir/$srcname $destdir/$realname"
++	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
++	  if test -n "$stripme" && test -n "$striplib"; then
++	    $show "$striplib $destdir/$realname"
++	    $run eval "$striplib $destdir/$realname" || exit $?
++	  fi
++
++	  if test $# -gt 0; then
++	    # Delete the old symlinks, and create new ones.
++	    for linkname
++	    do
++	      if test "$linkname" != "$realname"; then
++		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++	      fi
++	    done
++	  fi
++
++	  # Do each command in the postinstall commands.
++	  lib="$destdir/$realname"
++	  eval cmds=\"$postinstall_cmds\"
++	  save_ifs="$IFS"; IFS='~'
++	  for cmd in $cmds; do
++	    IFS="$save_ifs"
++	    $show "$cmd"
++	    $run eval "$cmd" || exit $?
++	  done
++	  IFS="$save_ifs"
++	fi
++
++	# Install the pseudo-library for information purposes.
++	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	instname="$dir/$name"i
++	$show "$install_prog $instname $destdir/$name"
++	$run eval "$install_prog $instname $destdir/$name" || exit $?
++
++	# Maybe install the static library, too.
++	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
++	;;
++
++      *.lo)
++	# Install (i.e. copy) a libtool object.
++
++	# Figure out destination file name, if it wasn't already specified.
++	if test -n "$destname"; then
++	  destfile="$destdir/$destname"
++	else
++	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	  destfile="$destdir/$destfile"
++	fi
++
++	# Deduce the name of the destination old-style object file.
++	case $destfile in
++	*.lo)
++	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
++	  ;;
++	*.$objext)
++	  staticdest="$destfile"
++	  destfile=
++	  ;;
++	*)
++	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	# Install the libtool object if requested.
++	if test -n "$destfile"; then
++	  $show "$install_prog $file $destfile"
++	  $run eval "$install_prog $file $destfile" || exit $?
++	fi
++
++	# Install the old object if enabled.
++	if test "$build_old_libs" = yes; then
++	  # Deduce the name of the old-style object file.
++	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
++
++	  $show "$install_prog $staticobj $staticdest"
++	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
++	fi
++	exit 0
++	;;
++
++      *)
++	# Figure out destination file name, if it wasn't already specified.
++	if test -n "$destname"; then
++	  destfile="$destdir/$destname"
++	else
++	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	  destfile="$destdir/$destfile"
++	fi
++
++	# Do a test to see if this is really a libtool program.
++	case $host in
++	*cygwin*|*mingw*)
++	    wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
++	    ;;
++	*)
++	    wrapper=$file
++	    ;;
++	esac
++	if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
++	  notinst_deplibs=
++	  relink_command=
++
++	  # If there is no directory component, then add one.
++	  case $file in
++	  */* | *\\*) . $wrapper ;;
++	  *) . ./$wrapper ;;
++	  esac
++
++	  # Check the variables that should have been set.
++	  if test -z "$notinst_deplibs"; then
++	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
++	    exit 1
++	  fi
++
++	  finalize=yes
++	  for lib in $notinst_deplibs; do
++	    # Check to see that each library is installed.
++	    libdir=
++	    if test -f "$lib"; then
++	      # If there is no directory component, then add one.
++	      case $lib in
++	      */* | *\\*) . $lib ;;
++	      *) . ./$lib ;;
++	      esac
++	    fi
++	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
++	    if test -n "$libdir" && test ! -f "$libfile"; then
++	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
++	      finalize=no
++	    fi
++	  done
++
++	  relink_command=
++	  # If there is no directory component, then add one.
++	  case $file in
++	  */* | *\\*) . $wrapper ;;
++	  *) . ./$wrapper ;;
++	  esac
++
++	  outputname=
++	  if test "$fast_install" = no && test -n "$relink_command"; then
++	    if test "$finalize" = yes && test -z "$run"; then
++	      tmpdir="/tmp"
++	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
++	      tmpdir="$tmpdir/libtool-$$"
++	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
++	      else
++		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
++		continue
++	      fi
++	      file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	      outputname="$tmpdir/$file"
++	      # Replace the output file specification.
++	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++
++	      $show "$relink_command"
++	      if $run eval "$relink_command"; then :
++	      else
++		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
++		${rm}r "$tmpdir"
++		continue
++	      fi
++	      file="$outputname"
++	    else
++	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
++	    fi
++	  else
++	    # Install the binary that we compiled earlier.
++	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
++	  fi
++	fi
++
++	# remove .exe since cygwin /usr/bin/install will append another
++	# one anyways
++	case $install_prog,$host in
++	/usr/bin/install*,*cygwin*)
++	  case $file:$destfile in
++	  *.exe:*.exe)
++	    # this is ok
++	    ;;
++	  *.exe:*)
++	    destfile=$destfile.exe
++	    ;;
++	  *:*.exe)
++	    destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
++	    ;;
++	  esac
++	  ;;
++	esac
++	$show "$install_prog$stripme $file $destfile"
++	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
++	test -n "$outputname" && ${rm}r "$tmpdir"
++	;;
++      esac
++    done
++
++    for file in $staticlibs; do
++      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++
++      # Set up the ranlib parameters.
++      oldlib="$destdir/$name"
++
++      $show "$install_prog $file $oldlib"
++      $run eval "$install_prog \$file \$oldlib" || exit $?
++
++      if test -n "$stripme" && test -n "$striplib"; then
++	$show "$old_striplib $oldlib"
++	$run eval "$old_striplib $oldlib" || exit $?
++      fi
++
++      # Do each command in the postinstall commands.
++      eval cmds=\"$old_postinstall_cmds\"
++      save_ifs="$IFS"; IFS='~'
++      for cmd in $cmds; do
++	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
++      done
++      IFS="$save_ifs"
++    done
++
++    if test -n "$future_libdirs"; then
++      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
++    fi
++
++    if test -n "$current_libdirs"; then
++      # Maybe just do a dry run.
++      test -n "$run" && current_libdirs=" -n$current_libdirs"
++      exec_cmd='$SHELL $0 --finish$current_libdirs'
++    else
++      exit 0
++    fi
++    ;;
++
++  # libtool finish mode
++  finish)
++    modename="$modename: finish"
++    libdirs="$nonopt"
++    admincmds=
++
++    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
++      for dir
++      do
++	libdirs="$libdirs $dir"
++      done
++
++      for libdir in $libdirs; do
++	if test -n "$finish_cmds"; then
++	  # Do each command in the finish commands.
++	  eval cmds=\"$finish_cmds\"
++	  save_ifs="$IFS"; IFS='~'
++	  for cmd in $cmds; do
++	    IFS="$save_ifs"
++	    $show "$cmd"
++	    $run eval "$cmd" || admincmds="$admincmds
++       $cmd"
++	  done
++	  IFS="$save_ifs"
++	fi
++	if test -n "$finish_eval"; then
++	  # Do the single finish_eval.
++	  eval cmds=\"$finish_eval\"
++	  $run eval "$cmds" || admincmds="$admincmds
++       $cmds"
++	fi
++      done
++    fi
++
++    # Exit here if they wanted silent mode.
++    test "$show" = ":" && exit 0
++
++    echo "----------------------------------------------------------------------"
++    echo "Libraries have been installed in:"
++    for libdir in $libdirs; do
++      echo "   $libdir"
++    done
++    echo
++    echo "If you ever happen to want to link against installed libraries"
++    echo "in a given directory, LIBDIR, you must either use libtool, and"
++    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
++    echo "flag during linking and do at least one of the following:"
++    if test -n "$shlibpath_var"; then
++      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
++      echo "     during execution"
++    fi
++    if test -n "$runpath_var"; then
++      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
++      echo "     during linking"
++    fi
++    if test -n "$hardcode_libdir_flag_spec"; then
++      libdir=LIBDIR
++      eval flag=\"$hardcode_libdir_flag_spec\"
++
++      echo "   - use the \`$flag' linker flag"
++    fi
++    if test -n "$admincmds"; then
++      echo "   - have your system administrator run these commands:$admincmds"
++    fi
++    if test -f /etc/ld.so.conf; then
++      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
++    fi
++    echo
++    echo "See any operating system documentation about shared libraries for"
++    echo "more information, such as the ld(1) and ld.so(8) manual pages."
++    echo "----------------------------------------------------------------------"
++    exit 0
++    ;;
++
++  # libtool execute mode
++  execute)
++    modename="$modename: execute"
++
++    # The first argument is the command name.
++    cmd="$nonopt"
++    if test -z "$cmd"; then
++      $echo "$modename: you must specify a COMMAND" 1>&2
++      $echo "$help"
++      exit 1
++    fi
++
++    # Handle -dlopen flags immediately.
++    for file in $execute_dlfiles; do
++      if test ! -f "$file"; then
++	$echo "$modename: \`$file' is not a file" 1>&2
++	$echo "$help" 1>&2
++	exit 1
++      fi
++
++      dir=
++      case $file in
++      *.la)
++	# Check to see that this really is a libtool archive.
++	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
++
++	# Read the libtool library.
++	dlname=
++	library_names=
++
++	# If there is no directory component, then add one.
++	case $file in
++	*/* | *\\*) . $file ;;
++	*) . ./$file ;;
++	esac
++
++	# Skip this library if it cannot be dlopened.
++	if test -z "$dlname"; then
++	  # Warn if it was a shared library.
++	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
++	  continue
++	fi
++
++	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
++	test "X$dir" = "X$file" && dir=.
++
++	if test -f "$dir/$objdir/$dlname"; then
++	  dir="$dir/$objdir"
++	else
++	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++	  exit 1
++	fi
++	;;
++
++      *.lo)
++	# Just add the directory containing the .lo file.
++	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
++	test "X$dir" = "X$file" && dir=.
++	;;
++
++      *)
++	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
++	continue
++	;;
++      esac
++
++      # Get the absolute pathname.
++      absdir=`cd "$dir" && pwd`
++      test -n "$absdir" && dir="$absdir"
++
++      # Now add the directory to shlibpath_var.
++      if eval "test -z \"\$$shlibpath_var\""; then
++	eval "$shlibpath_var=\"\$dir\""
++      else
++	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
++      fi
++    done
++
++    # This variable tells wrapper scripts just to set shlibpath_var
++    # rather than running their programs.
++    libtool_execute_magic="$magic"
++
++    # Check if any of the arguments is a wrapper script.
++    args=
++    for file
++    do
++      case $file in
++      -*) ;;
++      *)
++	# Do a test to see if this is really a libtool program.
++	if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  # If there is no directory component, then add one.
++	  case $file in
++	  */* | *\\*) . $file ;;
++	  *) . ./$file ;;
++	  esac
++
++	  # Transform arg to wrapped name.
++	  file="$progdir/$program"
++	fi
++	;;
++      esac
++      # Quote arguments (to preserve shell metacharacters).
++      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
++      args="$args \"$file\""
++    done
++
++    if test -z "$run"; then
++      if test -n "$shlibpath_var"; then
++	# Export the shlibpath_var.
++	eval "export $shlibpath_var"
++      fi
++
++      # Restore saved enviroment variables
++      if test "${save_LC_ALL+set}" = set; then
++	LC_ALL="$save_LC_ALL"; export LC_ALL
++      fi
++      if test "${save_LANG+set}" = set; then
++	LANG="$save_LANG"; export LANG
++      fi
++
++      # Now prepare to actually exec the command.
++      exec_cmd="\$cmd$args"
++    else
++      # Display what would be done.
++      if test -n "$shlibpath_var"; then
++	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
++	$echo "export $shlibpath_var"
++      fi
++      $echo "$cmd$args"
++      exit 0
++    fi
++    ;;
++
++  # libtool clean and uninstall mode
++  clean | uninstall)
++    modename="$modename: $mode"
++    rm="$nonopt"
++    files=
++    rmforce=
++    exit_status=0
++
++    # This variable tells wrapper scripts just to set variables rather
++    # than running their programs.
++    libtool_install_magic="$magic"
++
++    for arg
++    do
++      case $arg in
++      -f) rm="$rm $arg"; rmforce=yes ;;
++      -*) rm="$rm $arg" ;;
++      *) files="$files $arg" ;;
++      esac
++    done
++
++    if test -z "$rm"; then
++      $echo "$modename: you must specify an RM program" 1>&2
++      $echo "$help" 1>&2
++      exit 1
++    fi
++
++    rmdirs=
++
++    for file in $files; do
++      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
++      if test "X$dir" = "X$file"; then
++	dir=.
++	objdir="$objdir"
++      else
++	objdir="$dir/$objdir"
++      fi
++      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++      test $mode = uninstall && objdir="$dir"
++
++      # Remember objdir for removal later, being careful to avoid duplicates
++      if test $mode = clean; then
++	case " $rmdirs " in
++	  *" $objdir "*) ;;
++	  *) rmdirs="$rmdirs $objdir" ;;
++	esac
++      fi
++
++      # Don't error if the file doesn't exist and rm -f was used.
++      if (test -L "$file") >/dev/null 2>&1 \
++	|| (test -h "$file") >/dev/null 2>&1 \
++	|| test -f "$file"; then
++	:
++      elif test -d "$file"; then
++	exit_status=1
++	continue
++      elif test "$rmforce" = yes; then
++	continue
++      fi
++
++      rmfiles="$file"
++
++      case $name in
++      *.la)
++	# Possibly a libtool archive, so verify it.
++	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  . $dir/$name
++
++	  # Delete the libtool libraries and symlinks.
++	  for n in $library_names; do
++	    rmfiles="$rmfiles $objdir/$n"
++	  done
++	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
++	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++
++	  if test $mode = uninstall; then
++	    if test -n "$library_names"; then
++	      # Do each command in the postuninstall commands.
++	      eval cmds=\"$postuninstall_cmds\"
++	      save_ifs="$IFS"; IFS='~'
++	      for cmd in $cmds; do
++		IFS="$save_ifs"
++		$show "$cmd"
++		$run eval "$cmd"
++		if test $? != 0 && test "$rmforce" != yes; then
++		  exit_status=1
++		fi
++	      done
++	      IFS="$save_ifs"
++	    fi
++
++	    if test -n "$old_library"; then
++	      # Do each command in the old_postuninstall commands.
++	      eval cmds=\"$old_postuninstall_cmds\"
++	      save_ifs="$IFS"; IFS='~'
++	      for cmd in $cmds; do
++		IFS="$save_ifs"
++		$show "$cmd"
++		$run eval "$cmd"
++		if test $? != 0 && test "$rmforce" != yes; then
++		  exit_status=1
++		fi
++	      done
++	      IFS="$save_ifs"
++	    fi
++	    # FIXME: should reinstall the best remaining shared library.
++	  fi
++	fi
++	;;
++
++      *.lo)
++	if test "$build_old_libs" = yes; then
++	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
++	  rmfiles="$rmfiles $dir/$oldobj"
++	fi
++	;;
++
++      *)
++	# Do a test to see if this is a libtool program.
++	if test $mode = clean &&
++	   (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  relink_command=
++	  . $dir/$file
++
++	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
++	  if test "$fast_install" = yes && test -n "$relink_command"; then
++	    rmfiles="$rmfiles $objdir/lt-$name"
++	  fi
++	fi
++	;;
++      esac
++      $show "$rm $rmfiles"
++      $run $rm $rmfiles || exit_status=1
++    done
++
++    # Try to remove the ${objdir}s in the directories where we deleted files
++    for dir in $rmdirs; do
++      if test -d "$dir"; then
++	$show "rmdir $dir"
++	$run rmdir $dir >/dev/null 2>&1
++      fi
++    done
++
++    exit $exit_status
++    ;;
++
++  "")
++    $echo "$modename: you must specify a MODE" 1>&2
++    $echo "$generic_help" 1>&2
++    exit 1
++    ;;
++  esac
++
++  if test -z "$exec_cmd"; then
++    $echo "$modename: invalid operation mode \`$mode'" 1>&2
++    $echo "$generic_help" 1>&2
++    exit 1
++  fi
++fi # test -z "$show_help"
++
++if test -n "$exec_cmd"; then
++  eval exec $exec_cmd
++  exit 1
++fi
++
++# We need to display help for each of the modes.
++case $mode in
++"") $echo \
++"Usage: $modename [OPTION]... [MODE-ARG]...
++
++Provide generalized library-building support services.
++
++    --config          show all configuration variables
++    --debug           enable verbose shell tracing
++-n, --dry-run         display commands without modifying any files
++    --features        display basic configuration information and exit
++    --finish          same as \`--mode=finish'
++    --help            display this help message and exit
++    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
++    --quiet           same as \`--silent'
++    --silent          don't print informational messages
++    --version         print version information
++
++MODE must be one of the following:
++
++      clean           remove files from the build directory
++      compile         compile a source file into a libtool object
++      execute         automatically set library path, then run a program
++      finish          complete the installation of libtool libraries
++      install         install libraries or executables
++      link            create a library or an executable
++      uninstall       remove libraries from an installed directory
++
++MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
++a more detailed description of MODE."
++  exit 0
++  ;;
++
++clean)
++  $echo \
++"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
++
++Remove files from the build directory.
++
++RM is the name of the program to use to delete files associated with each FILE
++(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
++to RM.
++
++If FILE is a libtool library, object or program, all the files associated
++with it are deleted. Otherwise, only FILE itself is deleted using RM."
++  ;;
++
++compile)
++  $echo \
++"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
++
++Compile a source file into a libtool library object.
++
++This mode accepts the following additional options:
++
++  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
++  -prefer-pic       try to building PIC objects only
++  -prefer-non-pic   try to building non-PIC objects only
++  -static           always build a \`.o' file suitable for static linking
++
++COMPILE-COMMAND is a command to be used in creating a \`standard' object file
++from the given SOURCEFILE.
++
++The output file name is determined by removing the directory component from
++SOURCEFILE, then substituting the C source code suffix \`.c' with the
++library object suffix, \`.lo'."
++  ;;
++
++execute)
++  $echo \
++"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
++
++Automatically set library path, then run a program.
++
++This mode accepts the following additional options:
++
++  -dlopen FILE      add the directory containing FILE to the library path
++
++This mode sets the library path environment variable according to \`-dlopen'
++flags.
++
++If any of the ARGS are libtool executable wrappers, then they are translated
++into their corresponding uninstalled binary, and any of their required library
++directories are added to the library path.
++
++Then, COMMAND is executed, with ARGS as arguments."
++  ;;
++
++finish)
++  $echo \
++"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
++
++Complete the installation of libtool libraries.
++
++Each LIBDIR is a directory that contains libtool libraries.
++
++The commands that this mode executes may require superuser privileges.  Use
++the \`--dry-run' option if you just want to see what would be executed."
++  ;;
++
++install)
++  $echo \
++"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
++
++Install executables or libraries.
++
++INSTALL-COMMAND is the installation command.  The first component should be
++either the \`install' or \`cp' program.
++
++The rest of the components are interpreted as arguments to that command (only
++BSD-compatible install options are recognized)."
++  ;;
++
++link)
++  $echo \
++"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
++
++Link object files or libraries together to form another library, or to
++create an executable program.
++
++LINK-COMMAND is a command using the C compiler that you would use to create
++a program from several object files.
++
++The following components of LINK-COMMAND are treated specially:
++
++  -all-static       do not do any dynamic linking at all
++  -avoid-version    do not add a version suffix if possible
++  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
++  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
++  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
++  -export-symbols SYMFILE
++		    try to export only the symbols listed in SYMFILE
++  -export-symbols-regex REGEX
++		    try to export only the symbols matching REGEX
++  -LLIBDIR          search LIBDIR for required installed libraries
++  -lNAME            OUTPUT-FILE requires the installed library libNAME
++  -module           build a library that can dlopened
++  -no-fast-install  disable the fast-install mode
++  -no-install       link a not-installable executable
++  -no-undefined     declare that a library does not refer to external symbols
++  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
++  -release RELEASE  specify package release information
++  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
++  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
++  -static           do not do any dynamic linking of libtool libraries
++  -version-info CURRENT[:REVISION[:AGE]]
++		    specify library version info [each variable defaults to 0]
++
++All other options (arguments beginning with \`-') are ignored.
++
++Every other argument is treated as a filename.  Files ending in \`.la' are
++treated as uninstalled libtool libraries, other files are standard or library
++object files.
++
++If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
++only library objects (\`.lo' files) may be specified, and \`-rpath' is
++required, except when creating a convenience library.
++
++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
++using \`ar' and \`ranlib', or on Windows using \`lib'.
++
++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
++is created, otherwise an executable program is created."
++  ;;
++
++uninstall)
++  $echo \
++"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
++
++Remove libraries from an installation directory.
++
++RM is the name of the program to use to delete files associated with each FILE
++(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
++to RM.
++
++If FILE is a libtool library, all the files associated with it are deleted.
++Otherwise, only FILE itself is deleted using RM."
++  ;;
++
++*)
++  $echo "$modename: invalid operation mode \`$mode'" 1>&2
++  $echo "$help" 1>&2
++  exit 1
++  ;;
++esac
++
++echo
++$echo "Try \`$modename --help' for more information about other modes."
++
++exit 0
++
++# Local Variables:
++# mode:shell-script
++# sh-indentation:2
++# End:
+--- metamail-2.7.orig/debian/mime.noinstall
++++ metamail-2.7/debian/mime.noinstall
+@@ -0,0 +1,5 @@
++image/*; showpicture -viewer xv %s; description="All Graphic Images"
++image/*; showpicture -viewer "xloadimage -view -quiet" %s; description="All Graphic Images"
++audio/*; showaudio %s; description="All Audio Subtypes"
++audio/basic; showaudio %s; compose="audiocompose %s"; edit="audiocompose %s"; description="An Audio Fragment"
++audio-file; sun-audio-file %s; description="Sun Audio Message"
+--- metamail-2.7.orig/debian/control
++++ metamail-2.7/debian/control
+@@ -0,0 +1,23 @@
++Source: metamail
++Section: mail
++Priority: optional
++Maintainer: Debian QA Group <packages@qa.debian.org>
++Build-Depends: debhelper (>= 5), autotools-dev, libncurses-dev
++Standards-Version: 3.7.2
++
++Package: metamail
++Section: mail
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Recommends: sharutils, mime-support (>=3.11-1)
++Description: implementation of MIME
++ Metamail is an implementation of Multi-purpose Internet Mail
++ Extensions (MIME), a proposed standard for multimedia electronic
++ mail on the Internet.
++ .
++ Metamail is configurable and extensible via the "mailcap" mechanism
++ described in an informational RFC that is a companion to the MIME
++ document.  Metamail can be used to turn virtually any mail reader
++ program into a multimedia mail reader.  For information about how
++ to change mail readers so that they can use Metamail, please read
++ the file `/usr/share/doc/metamail/mailers.txt.gz'.
+--- metamail-2.7.orig/debian/mimencode.1
++++ metamail-2.7/debian/mimencode.1
+@@ -0,0 +1,52 @@
++.TH MIMENCODE 1 "Release 1" "Bellcore Prototype"
++.SH NAME
++mimencode - Translate to and from mail-oriented encoding formats
++.SH SYNOPSIS
++.ta 8n
++\fBmimencode\fP	[-u] [-b] [-q] [-p] [file name] [-o outputfile]
++.br
++.SH DESCRIPTION
++The
++.I mimencode
++program simply converts a byte stream into (or out of) one of the standard mail encoding formats defined by MIME, the proposed standard for internet multimedia mail formats.  Such an encoding is necessary because binary data cannot be sent through the mail.  The encodings understood by mimencode are preferable to the use of the uuencode/uudecode programs, for use in mail, in several respects that were important to the authors of MIME.
++
++By default, mimencode reads standard input, and sends a "base64" encoded version of the input to standard output.
++
++The (really not necessary) "-b" option tells mimencode to use the "base64" encoding.
++
++The "-q" option tells mimencode to use the "quoted-printable" encoding instead of base64.
++
++The "-u" option tells mimencode to 
++.I
++decode
++the standard input rather than encode it.  
++
++The "-p" option tells mimencode to translate decoded CRLF sequences into the local newline convention during decoding and to do the reverse during encoding.  This option is only meaningful when  -b (base64 encoding) is in effect.
++
++If a file name argument is given, input is read from that file rather than from standard input.
++
++The "-o" option, which must be followed by a file name, sends output to the named file rather than to standard output.
++.SH RATIONALE
++.I
++Mimencode
++is intended to be a replacement for 
++.I
++uuencode
++for mail and news use.  The reason is simple:  uuencode doesn't work very well in a number of circumstances and ways.  In particular, uuencode uses characters that don't translate well across all mail gateways (particularly ASCII <-> EBCDIC gateways).  Also, uuencode is not standard -- there are several variants floating around, encoding and decoding things in different and incompatible ways, with no "standard" on which to base an implementation.  Finally, uuencode does not generally work well in a pipe, although some variants have been modified to do so.  Mimencode implements the encodings which were defined for MIME as uuencode replacements, and should be considerably more robust for email use.
++.SH SEE ALSO
++metamail(1), mailto(1)
++.SH COPYRIGHT
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++.SH AUTHOR
++Nathaniel S. Borenstein
+--- metamail-2.7.orig/debian/copyright
++++ metamail-2.7/debian/copyright
+@@ -0,0 +1,37 @@
++This is the Debian GNU/Linux prepackaged version of Metamail.
++
++This package was put together by Michael Meskes <meskes@debian.org>,
++from sources obtained from:
++ ftp.bellcore.com:/pub/nsb/mm2.7.tar.Z and /pub/nsb/contrib2.7.tar.Z
++
++This package was then worked on by Herbert Xu <herbert@debian.org>.
++
++****************************************************************
++Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
++
++Permission to use, copy, modify, and distribute this material 
++for any purpose and without fee is hereby granted, provided 
++that the above copyright notice and this permission notice 
++appear in all copies, and that the name of Bellcore not be 
++used in advertising or publicity pertaining to this 
++material without the specific, prior written permission 
++of an authorized representative of Bellcore.  BELLCORE 
++MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
++OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
++WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
++****************************************************************
++
++Most scripts are:
++
++# Conversion from C shell to Bourne shell by Z-Code Software Corp.
++# Conversion Copyright (c) 1992 Z-Code Software Corp.
++# Permission to use, copy, modify, and distribute this material
++# for any purpose and without fee is hereby granted, provided
++# that the above copyright notice and this permission notice
++# appear in all copies, and that the name of Z-Code Software not
++# be used in advertising or publicity pertaining to this
++# material without the specific, prior written permission
++# of an authorized representative of Z-Code.  Z-CODE SOFTWARE
++# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
++# OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
++# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+--- metamail-2.7.orig/debian/metamail.files
++++ metamail-2.7/debian/metamail.files
+@@ -0,0 +1,3 @@
++usr/bin
++usr/lib/libmetamail.so.*
++
+--- metamail-2.7.orig/debian/mime
++++ metamail-2.7/debian/mime
+@@ -0,0 +1,7 @@
++text/plain; shownonascii iso-8859-1 %s; description="Plain ASCII Text"; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
++text/richtext; richtext %s; description="Richtext"; copiousoutput; priority=4
++text/richtext; shownonascii iso-8859-1 -e richtext -p %s; description="Richtext"; copiousoutput; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
++text/enriched; richtext -e %s; description="Enriched Text"; copiousoutput; priority=4
++text/enriched; shownonascii iso-8859-1 -e richtext -e -p %s; description="Enriched Text"; copiousoutput; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
++message/partial; showpartial %s %{id} %{number} %{total}; description="An incomplete message"
++message/external-body; showexternal %s %{access-type} %{name} %{site} %{directory} %{mode} %{server}; needsterminal; description="A reference to data stored in an external location"; composetyped="extcompose %s"
+--- metamail-2.7.orig/debian/README.Debian
++++ metamail-2.7/debian/README.Debian
+@@ -0,0 +1,12 @@
++This is the Debian GNU/Linux prepackaged version of the metamail package.
++
++It installs only a basis of the scripts included in the original metamail
++package. Excluded are Apple specifics (rcvAppleSingle, sndAppleSingle),
++sun specifics (sun-message.csh, sun-audio-file, sun-message, sun-to-mime,
++sun2mime), hebrew specifics (mailto-hebrew), mailserver extensions 
++(mailserver), binary wrapper extensions for mimeencode (mmencode) and richtoak.
++
++I had to fix the source by adding a doublinked list that stores all opened
++tmp files. This list is used at before the program terminates so that all
++tmp files get properly removed.
++
+--- metamail-2.7.orig/debian/rules
++++ metamail-2.7/debian/rules
+@@ -0,0 +1,111 @@
++#!/usr/bin/make -f
++# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
++
++# Uncomment this to turn on verbose mode.
++export DH_VERBOSE=1
++
++export INTERNAL_DESTDIR=debian/tmp
++
++MAJOR=0
++MINOR=0.0
++
++source-updates:
++	dh_testdir
++	sh bootstrap
++
++build: build-stamp
++build-stamp:
++	dh_testdir
++	ln -sf /usr/share/misc/config.sub /usr/share/misc/config.guess config
++	chmod +x ./configure
++	./configure --prefix=/usr
++	$(MAKE)
++	touch $@
++
++clean:
++	dh_testdir
++	dh_testroot
++	-if test -e Makefile; then \
++	  if test -e Makefile.in; then \
++		$(MAKE) distclean; \
++	  else \
++		$(MAKE) clean; \
++	  fi \
++	 fi
++	rm -f config/config.sub config/config.guess
++	dh_clean build-stamp install-stamp mimencode.1
++
++install: install-stamp
++install-stamp: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++
++	-$(MAKE) install DESTDIR=`pwd`/$(INTERNAL_DESTDIR)
++
++	cd $(INTERNAL_DESTDIR)/usr/bin && rm sun-message.csh mailserver \
++	  rcvAppleSingle richtoatk sndAppleSingle sun-audio-file \
++          sun-message sun-to-mime sun2mime mailto-hebrew
++
++	touch $@
++
++binary-indep:
++# No arch-indep packages to be built here.
++
++binary-arch: build install metamail
++
++
++metamail: build install
++	dh_testdir -pmetamail
++	dh_testroot -pmetamail
++
++	dh_installdirs -pmetamail
++	dh_movefiles -pmetamail
++	cp man/mmencode.1 debian/mimencode.1
++
++	dh_link -pmetamail usr/lib/libmetamail.so.$(MAJOR).$(MINOR) \
++	  usr/lib/libmetamail.so.$(MAJOR)
++
++	dh_installdocs -pmetamail CREDITS README mailers.txt \
++	  debian/mime.noinstall
++	dh_installchangelogs -pmetamail
++	dh_installmime -pmetamail
++	dh_installman -pmetamail
++	dh_strip -pmetamail
++	dh_compress -pmetamail
++	dh_fixperms -pmetamail
++	dh_makeshlibs -pmetamail
++	dh_installdeb -pmetamail
++	dh_shlibdeps -pmetamail -l$(shell pwd)/debian/metamail/usr/lib
++	dh_gencontrol -pmetamail -- -isp
++	dh_md5sums -pmetamail
++	dh_builddeb -pmetamail
++
++#libmetamail0: build install
++#	dh_testdir -plibmetamail0
++#	dh_testroot -plibmetamail0
++
++#	dh_installdirs -plibmetamail0
++#	dh_movefiles -plibmetamail0
++
++#	dh_link -plibmetamail0 usr/lib/libmetamail.so.$(MAJOR).$(MINOR) \
++#	  usr/lib/libmetamail.so.$(MAJOR)
++
++#	dh_installdocs -plibmetamail0
++#	dh_installchangelogs -plibmetamail0
++#	dh_strip -plibmetamail0
++#	dh_compress -plibmetamail0
++#	dh_fixperms -plibmetamail0
++#	dh_installdeb -plibmetamail0
++#	dh_shlibdeps -plibmetamail0
++#	dh_gencontrol -plibmetamail0
++#	dh_makeshlibs -plibmetamail0 -V
++#	dh_md5sums -plibmetamail0
++#	dh_builddeb -plibmetamail0
++
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary
++
++
+--- metamail-2.7.orig/debian/manpages
++++ metamail-2.7/debian/manpages
+@@ -0,0 +1,20 @@
++man/audiocompose.1
++man/audiosend.1
++man/extcompose.1
++man/getfilename.1
++man/mailto.1
++man/metamail.1
++man/metasend.1
++man/mime.1
++man/patch-metamail.1
++man/richtext.1
++man/showaudio.1
++man/showexternal.1
++man/shownonascii.1
++man/showpartial.1
++man/showpicture.1
++man/splitmail.1
++man/uudepipe.1
++man/uuenpipe.1
++debian/mimeit.1
++debian/mimencode.1
+--- metamail-2.7.orig/debian/shlibs.local
++++ metamail-2.7/debian/shlibs.local
+@@ -0,0 +1 @@
++libmetamail 0 
+--- metamail-2.7.orig/debian/changelog
++++ metamail-2.7/debian/changelog
+@@ -0,0 +1,453 @@
++metamail (2.7-54) unstable; urgency=low
++
++  * QA upload.
++  * Fix bashisms in bin/showaudio. checkbashisms reports false positives
++    in patch-metamail ($HOSTNAME is defined in that script). (Closes: #465349)
++
++ -- Marc 'HE' Brockschmidt <he@debian.org>  Sun, 09 Mar 2008 00:36:59 +0100
++
++metamail (2.7-53) unstable; urgency=low
++
++  * QA upload.
++  * src/metamail/splitmail.c: Fix segfault on 64-bit machines.  Thanks to
++    John Hughes for the patch.  Closes: #410466.
++  * debian/compat: Set DH_COMPAT here rather than in debian/rules.
++  * debian/rules: Replace dh_installmanpages with dh_installman.
++
++ -- Matej Vela <vela@debian.org>  Sun, 15 Apr 2007 18:01:02 +0200
++
++metamail (2.7-52) unstable; urgency=low
++
++  * QA Group upload.
++  * Set Standards-Version to 3.7.2.
++  * Set DH_COMPAT to 5.
++  * Fixed "Does not provide filenames for attachments", closes:
++    #321968. Patch by Immanuel Halupczok <debian-bugs@karimmi.de>.
++  * Fixed "dumps core with -w option", closes: #357163.
++    Patch by Justin Pryzby <justinpryzby@users.sourceforge.net>.
++
++ -- Anibal Monsalve Salazar <anibal@debian.org>  Wed, 19 Jul 2006 12:53:40 +1000
++
++metamail (2.7-51) unstable; urgency=high
++
++  * QA upload.
++  * Fixed "[CVE-2006-0709] crashes with very long boundaries in
++    messages", closes: #352482, #353539. Patch thanks to
++    Ulf Harnhammar <metaur@telia.com>.
++
++ -- Anibal Monsalve Salazar <anibal@debian.org>  Thu, 23 Feb 2006 09:17:36 +1100
++
++metamail (2.7-50) unstable; urgency=low
++
++  * QA upload.
++  * Automatically update config.sub and config.guess from autotools-dev.
++    Closes: #338566.
++  * man/metamail.1: Fix search path formatting.
++
++ -- Matej Vela <vela@debian.org>  Fri, 11 Nov 2005 07:42:03 +0100
++
++metamail (2.7-49) unstable; urgency=low
++
++  * QA upload.
++  * bin/uuenpipe, bin/uudepipe: Properly handle unreadable files,
++    filenames beginning with "-", and filenames containing whitespace.
++    (These scripts were not meant to take options.)  Closes: #273195.
++  * src/metamail/mailto.c (GetLineMalloced): Fix segfault caused by
++    freeing static storage.  Closes: #300756.
++  * man/metamail.1: Document the -E option.  Closes: #177823.
++  * man/richtext.1: Document the -e option.  Closes: #296120.
++  * Conforms to Standards version 3.6.2.
++
++ -- Matej Vela <vela@debian.org>  Fri, 19 Aug 2005 11:25:02 +0200
++
++metamail (2.7-48) unstable; urgency=low
++
++  * QA Group upload by Javier Fernandez-Sanguino
++  * Fix typos in manpages with patches provided by A Costa (Closes: #311450,
++    #311451, #311452, #311453)
++  * Fix use of temporary files in showpartial so that uses cannot introduce
++    a DOS through the use of hard links. Temporary files are created with
++    mktemp and their filename is stored in ~/.metamail_treeroot (Closes:
++    #321473)
++
++ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Wed, 17 Aug 2005 00:17:20 +0200
++
++metamail (2.7-47) unstable; urgency=low
++
++  * QA Group upload by Anibal Monsalve Salazar.
++  * Fixed "Add/Improve SEE ALSO section for splitmail/mimeit" (Closes:
++    #245647). Patch by Helge Kreutzmann <kreutzm@itp.uni-hannover.de>.
++  * Fixed "8-bit encoding is supported by metamail but not by metasend script"
++    (Closes: #285914). Patch by Sergey Kogan <kogan@sklad.bacon.ru>.
++  * Fixed "additional option when handling unrecognized content types"
++    (Closes: #249823). Patch by Daniel Kraft <da_kraft@web.de>.
++  * Fixed "debug message 'pre access' left in released version
++    (Closes: #184410). Patch by <pmaydell@chiark.greenend.org.uk>.
++
++ -- Anibal Monsalve Salazar <anibal@debian.org>  Sun, 13 Feb 2005 10:43:55 +1100
++
++metamail (2.7-46) unstable; urgency=low
++
++  * QA Group upload orphaning this package
++  * Incorporates previous NMUs (closes: #164074, #185005, #233935)
++  * debian/control: make build-dependency on debhelper versioned
++
++ -- Andrew Pollock <apollock@debian.org>  Tue,  9 Nov 2004 22:14:08 +1100
++
++metamail (2.7-45.3) unstable; urgency=medium
++
++  * Non-maintainer upload by the Security Team
++  * Adjust the patch since Christian 'Naddy' Weisgerber discovered an
++    overzealous use of sizeof().
++
++ -- Martin Schulze <joey@infodrom.org>  Tue,  2 Mar 2004 20:08:51 +0100
++
++metamail (2.7-45.2) unstable; urgency=high
++
++  * NMU
++  * [src/metamail/metamail.c, src/metamail/splitmail.c] Address CAN-2004-0104
++    and CAN-2004-0105 (format string vulnerabilities and buffer overflows).
++    (Addresses #233640 for sid)
++  * [bin/audiocompose] Quote file reference.
++  * [metamail/splitmail.c] Use /usr/sbin/sendmail rather than
++    /usr/lib/sendmail.
++
++ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Fri, 20 Feb 2004 21:22:16 +0100
++
++metamail (2.7-45.1) unstable; urgency=low
++
++  * NMU
++  * Fixed FTBFS: (Closes: #164074)
++    * [configure.in] Added AM_MAINTAINER_MODE.
++    * [debian/rules] Introduced "source-updates" target.
++    * [debian/control] Dropped "libtool" and "automake" build dependencies.
++    * Regenerated auto* files.
++  * [bin/audiosend] Fixed shell syntax by adding a 'then'.
++  * [debian/control] Removed full stop from the one line description.
++
++ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 16 Mar 2003 13:38:42 +0100
++
++metamail (2.7-45) unstable; urgency=low
++
++  * eliminated nasty tmpfile bug that caused removal of temporary files
++    though they were in use by processes that have been backgrounded by
++    metamail. (Closes: #141966)
++
++ -- Michael Moerz <mikem@debian.org>  Mon, 15 Apr 2002 11:07:17 +0200
++
++metamail (2.7-44) unstable; urgency=low
++
++  * renamed mmencode reference from metamail manpage to mimencode
++    (Closes: #137347)
++  * removed mailcap manpage from metamail package so that can go into
++    the mime-support package (Closes:  #139989)
++
++ -- Michael Moerz <mikem@debian.org>  Wed,  3 Apr 2002 02:24:53 +0200
++
++metamail (2.7-43) unstable; urgency=low
++
++  * fixed 64bit architecture problems caused by missing prototypes of
++    functions. The actual pactch was developed by 
++    John R.Daily" <jdaily@progeny.com> (Closes: #126109)
++  * fixed usage message of mimencode by using a patch supplied by
++    David Fries <dfries@mail.win.org> (Closes: #119075)
++
++ -- Michael Moerz <mikem@debian.org>  Sat, 22 Dec 2001 00:35:19 +0100
++
++metamail (2.7-42) unstable; urgency=low
++
++  * fixed bug that caused mailto to honour newlines incorrectly when
++    mimetypes are asked for and checked.
++
++ -- Michael Moerz <mikem@debian.org>  Mon, 15 Oct 2001 22:11:35 +0200
++
++metamail (2.7-41) unstable; urgency=low
++
++  * fixed a minor bug regarding the man page of metamail saying /usr/ucb/reset
++    and not /usr/bin/reset (Closes: #110889)
++  * fixed broken showpartial (Closes: #107538)
++
++ -- Michael Moerz <mikem@debian.org>  Sat,  1 Sep 2001 20:32:01 +0200
++
++metamail (2.7-40) unstable; urgency=low
++
++  * Removed non functional downwards compatiblity code for older
++    mime-support which called install-mime when the previous metamail
++    version was less than 2-7.34. (Closes: #100993)
++  * hardened dependency to mime-support (version 3.11-1 or higher has
++    to be installed now)
++
++ -- Michael Moerz <mikem@debian.org>  Sat, 16 Jun 2001 13:48:12 +0200
++
++metamail (2.7-39) unstable; urgency=low
++
++  * fixed a bug that created a segfault when saving an attachment.
++    (Closes: #88766)
++
++ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Tue, 20 Mar 2001 20:52:20 +0100
++
++metamail (2.7-38) unstable; urgency=low
++
++  * stupid me has again missed a build depends for libncurses-dev.
++    This is fixed now. (Closes: #86559)
++
++ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Sun, 25 Feb 2001 17:05:45 +0100
++
++metamail (2.7-37) unstable; urgency=low
++
++  * Fixed broken build caused by not using a shell for interpreting
++    the bootstrap script (Closes: #85764).
++  * changed rules file so that not only the existence of Makefile
++    is checked, but of Makefile.in too and the decision is made
++    to use make clean or make destclean (Makefile.in present).
++  * fixed build depends to enlist libtool & automake too.
++    (Closes: #86128)
++  * fixed disappearing of mimencode (Closes: #86083)
++
++ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Tue, 13 Feb 2001 14:08:20 +0100
++
++metamail (2.7-36) unstable; urgency=low
++
++  * Fixed broken showpartial where a variable was not set correctly
++    (nullified) and that caused that showpartial didn't work.
++    (Closes: #58614)
++  * Fixed mimeit manpage refering to mm package instead of metamail
++    (Closes: #63033)
++  * added a README.Debian pointing out the debian specific
++    modifications to the package
++  * Fixed the leaving tmp-files behind bug. So now metamail removes
++    all files it generates in /tmp before it terminates.
++    (Closes: #39011)
++  * DH_COMPAT=2 is now in place and functional
++  * converted build-process and .c and .h files to use autoconf and
++    automake. (Now the package will build under woody again.) 
++
++ -- Michael Moerz <e9625136@stud3.tuwien.ac.at>  Thu, 18 Jan 2001 04:26:05 +0100
++
++metamail (2.7-35) unstable; urgency=low
++
++  * Fixed a typo in metasend that resulted in Content-Description
++    being blank when -n wasn't set. (Closes: #70761)
++
++ -- Teemu Hukkanen <tjhukkan@iki.fi>  Sun, 10 Sep 2000 21:58:00 +0300
++
++metamail (2.7-34) frozen unstable; urgency=low
++
++  * The install-all target tried to strip shell scripts, plus several
++    additional flaws, which prevented building, closes: #55260.
++  * Updated for newer mime-support, closes: #47097. Downgraded
++    mime-support dependency to a recommendation, and removed useless
++    version (as the new scheme is used, and 2.02-1 is too old for it).
++  * Updated for Policy 3.1.1.
++
++ -- Josip Rodin <jrodin@jagor.srce.hr>  Tue,  8 Feb 2000 21:15:19 +0100
++
++metamail (2.7-33) unstable; urgency=low
++
++  * Orphaning metamail.
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 20 Nov 1999 20:33:36 -0600
++
++metamail (2.7-32) unstable; urgency=low
++
++  * Fixed postinst script where it didn't add mailcap entries for an initial
++    install.
++  * Don't warn about wild cards in mailcap (fixes #30910).
++  * Use $() instead of `` for command substitution (fixes #33487).
++    Note that metamail does %{} substitutions with the correct quoting.
++    Indeed, it filters out characters like ` so there is no problem even if
++    this fix were not there.  But other applications that currently do not do
++    the required quoting should do so.
++    Also, all packages that add entries to mailcap should check their entries
++    and replace all `` with % substitutions inside with $() so as to avoid
++    the obscure shell rule that `` is terminated by a un-backslashed back-
++    quote.  Indeed, if this back-quote occurs within single or double quotes,
++    the result is undefined.
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 14 Mar 1999 12:58:05 +1100
++
++metamail (2.7-31) frozen unstable; urgency=low
++
++  * Uploaded to slink.
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 15 Nov 1998 15:11:52 +1100
++
++metamail (2.7-30) unstable; urgency=low
++
++  * Use lpr instead of lp for linux (fixes #27259).
++  * Removed all traces of mmencode (fixes #28746).
++  * Rebuilt with libncruses4.
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 31 Oct 1998 15:16:13 +1100
++
++metamail (2.7-29) unstable; urgency=medium
++
++  * Applied security patch from Topi Miettinen (fixes #26877).
++
++ -- Herbert Xu <herbert@debian.org>  Tue, 22 Sep 1998 14:29:27 +1000
++
++metamail (2.7-28) frozen unstable; urgency=high
++
++  * Fixed showpartial (fixes #23595).
++
++ -- Herbert Xu <herbert@debian.org>  Thu, 18 Jun 1998 09:41:50 +1000
++
++metamail (2.7-27) unstable; urgency=low
++
++  * Fixed shownonascii (fixes #19862).
++  * Manually add mimencode.1.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 18 Mar 1998 21:06:39 +1100
++
++metamail (2.7-26) unstable; urgency=low
++
++  * Added -e to all shell scripts (fixes #19802).
++  * Removed #!/bin/sh header from mime.noinstall.
++
++ -- Herbert Xu <herbert@debian.org>  Tue, 17 Mar 1998 21:22:25 +1100
++
++metamail (2.7-25) unstable; urgency=low
++
++  * Use sensible-pager instead of pager.
++  * Upgraded to Standard Version 2.4.0.0.
++  * Removed
++    . mailserver
++    . mailto-hebrew
++    . rcvAppSingle
++    . richtoatk
++    . sndAppSingle
++    . sun-audio-file
++    . sun-message
++    . sun-to-mime
++    . sun2mime
++    as they were either not functional or useless and without a manpage.
++  * Added manpages to mimeit, uuencode and uudecode (fixes #6332).
++  * Converted to debhelper.
++  * Moved mailcap from section 4 to section 5.
++
++ -- Herbert Xu <herbert@debian.org>  Mon,  2 Mar 1998 15:46:44 +1100
++
++metamail (2.7-24) unstable; urgency=high
++
++  * Use tempfile for temporary files.
++  * Removed sun-message.csh.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 15 Oct 1997 10:29:16 +1000
++
++metamail (2.7-23) unstable; urgency=low
++
++  * Fixed uudepipe (#12371).
++
++ -- Herbert Xu <herbert@debian.org>  Tue,  2 Sep 1997 21:37:01 +1000
++
++metamail (2.7-22) unstable; urgency=low
++
++  * Recompiled with libc6.
++  * Removed recommendation of xv | xloadimage (#9706).
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 21 Jun 1997 16:17:29 +1000
++
++metamail (2.7-21) stable frozen unstable; urgency=high
++
++  * Recompiled with gcc-2.7.2.1-8.
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 4 May 1997 23:16:22 +1000
++
++metamail (2.7-20) stable frozen unstable; urgency=high
++
++  * Applyed Olaf Kirch's patch for a possible security hole.
++  * Changed all /usr/lib/sendmail to /usr/sbin/sendmail.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 30 Apr 1997 16:30:51 +1000
++
++metamail (2.7-19) unstable; urgency=low
++
++  * Be smarter about running install-mime when upgrading (#7859).
++  * Changed links to undocumented.7 to undocumented.7.gz.
++
++ -- Herbert Xu <herbert@debian.org>  Mon, 10 Mar 1997 19:44:54 +1100
++
++metamail (2.7-18) unstable; urgency=low
++
++  * Substitued which for whence (#7233).
++
++ -- Herbert Xu <herbert@debian.org>  Tue, 11 Feb 1997 17:34:39 +1100
++
++metamail (2.7-17) unstable; urgency=low
++
++  * New maintainer.
++  * Changed all "RM=/bin/rm" to "RM=rm" in Makefiles.
++  * Modified debian/rules and Makefiles to use debstd.
++  * Adding undocumented links.
++  * Adding #!/bin/sh to shell scripts to help identification.
++  * Fixed bug #6104 and removed extraneous blanks in mailcap.4.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 15 Jan 1997 20:45:07 +1100
++
++metamail (2.7-16) unstable; urgency=LOW
++
++  * Fixed postinst (Bug#5606)
++
++ -- Michael Meskes <meskes@debian.org>  Thu, 5 Dec 1996 14:55:23 +0100
++
++metamail (2.7-15) frozen unstable; urgency=MEDIUM
++
++  * sun2mime now calls /usr/bin/nawk (Bug#5488)
++
++ -- Michael Meskes <meskes@debian.org>  Tue, 19 Nov 1996 09:37:17 +0100
++
++metamail (2.7-14) frozen unstable; urgency=MEDIUM
++
++  * Corrected metasend (and other scripts) to not call echo-n (Bug#5397).
++  * remove echo-n from distribution
++
++ -- Michael Meskes <meskes@debian.org>  Wed, 13 Nov 1996 17:25:19 +0100
++
++metamail (2.7-13) unstable; urgency=LOW
++
++  * Cleaned up postinst (Bug#4720). Other install-mime calls are now
++  * installed just as a doc file.
++
++ -- Michael Meskes <meskes@debian.org>  Sat, 12 Oct 1996 15:15:50 +0200
++
++metamail (2.7-12) unstable; urgency=LOW
++
++  * Added 'Recommends: sharutils' (Bug#4616)
++
++ -- Michael Meskes <meskes@debian.org>  Mon, 30 Sep 1996 14:01:30 +0200
++
++metamail (2.7-11) unstable; urgency=LOW
++
++  * Moved Bourne shell scripts into bin directory, so dpkg-source works.
++  * Fixed showpicture to not use a geometry
++
++ -- Michael Meskes <meskes@debian.org>  Sun, 29 Sep 1996 13:52:41 +0200
++
++metamail (2.7-10) unstable; urgency=LOW
++
++  * Fixed that silly naming bug that caused postinst to be installed as
++  * binary in /usr/bin (bug#4425)
++
++ -- Michael Meskes <meskes@debian.org>  Sat, 7 Sep 1996 12:59:13 +0200
++
++metamail (2.7-9) unstable; urgency=LOW
++
++  * Corrected some minor bugs in debian/ directory and adjusted debian/rules
++  * accordingly. Conversion to new packaging scheme is now completed.
++
++ -- Michael Meskes <meskes@debian.org>  Sun, 1 Sep 1996 11:39:03 +0200
++
++metamail (2.7-8) unstable; urgency=LOW
++
++  * Corrected font name in postinst
++  * Corrected rules file to not install /usr/doc/copyright/README
++
++ -- Michael Meskes <meskes@debian.org>  Thu, 29 Aug 1996 17:11:43 +0200
++
++metamail (2.7-7) unstable; urgency=LOW
++
++  * Corrected dependency (Bug#4305)
++  * New packaging scheme
++
++ -- Michael Meskes <meskes@debian.org>  Wed, 28 Aug 1996 14:05:10 +0200
++
+--- metamail-2.7.orig/debian/mimeit.1
++++ metamail-2.7/debian/mimeit.1
+@@ -0,0 +1,28 @@
++.TH MIMEIT 1 "1998 March 1st" "METAMAIL" "Debian Linux Manual"
++.SH NAME
++mimeit \- base64-encode stdin and mail it
++.SH SYNOPSIS
++.B mimeit
++.I content-type recipient subject
++.RI [ splitmail-options ]
++.SH "DESCRIPTION"
++This manual page documents briefly the
++.B mimeit
++command.
++This manual page was written for the
++.B Debian GNU/Linux
++distribution (but may be used by others), because the original
++program does not have a manual page.
++.PP
++.B mimeit
++base64-encodes the message read from stdin and sends it off
++using
++.BR splitmail (1).
++It will pass all but the first three parameters to \fBsplitmail\fR(1).
++.SH AUTHOR
++.B mimeit
++is part of metamail package.  Manual page added by Herbert Xu
++and fixed by Michael Moerz <e9625136@stud3.tuwien.ac.at>.
++.SH SEE ALSO
++.PP
++\fBMIME\fR(1), \fBsplitmail\fR(1), \fBmunpack\fR(1), \fBmetamail\fR(1)
+--- metamail-2.7.orig/debian/compat
++++ metamail-2.7/debian/compat
+@@ -0,0 +1 @@
++5
+--- metamail-2.7.orig/replace/Makefile.am
++++ metamail-2.7/replace/Makefile.am
+@@ -0,0 +1,9 @@
++## Makefile.am -- Process this file with automake to produce Makefile.in
++
++MAINTAINERCLEANFILES	= Makefile.in
++
++INCLUDES		=  -I$(top_builddir) -I$(top_srcdir)
++
++noinst_LTLIBRARIES	= libreplace.la
++libreplace_la_SOURCES	= 
++libreplace_la_LIBADD	= @LTLIBOBJS@
+--- metamail-2.7.orig/replace/putenv.c
++++ metamail-2.7/replace/putenv.c
+@@ -0,0 +1,100 @@
++/* Copyright (C) 1991 Free Software Foundation, Inc.
++This file is part of the GNU C Library.
++
++The GNU C Library is free software; you can redistribute it and/or
++modify it under the terms of the GNU Library General Public License as
++published by the Free Software Foundation; either version 2 of the
++License, or (at your option) any later version.
++
++The GNU C Library is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++Library General Public License for more details.
++
++You should have received a copy of the GNU Library General Public
++License along with the GNU C Library; see the file COPYING.LIB.  If
++not, write to the Free Software Foundation, Inc., 675 Mass Ave,
++Cambridge, MA 02139, USA.  */
++
++#include <config.h>
++#include <sys/types.h>
++#include <errno.h>
++#ifdef STDC_HEADERS
++#include <stdlib.h>
++#else
++extern int errno;
++#endif
++
++#if defined(STDC_HEADERS) || defined(USG) || defined(SYSV)
++#include <string.h>
++#else /* not (STDC_HEADERS or USG) */
++#include <strings.h>
++#endif /* STDC_HEADERS or USG */
++
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
++#ifndef NULL
++#define NULL 0
++#endif
++
++#if !__STDC__
++#define const
++#endif
++
++extern char **environ;
++
++/* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
++int
++putenv (string)
++     const char *string;
++{
++  char *name_end = index (string, '=');
++  register size_t size;
++  register char **ep;
++
++  if (name_end == NULL)
++    {
++      /* Remove the variable from the environment.  */
++      size = strlen (string);
++      for (ep = environ; *ep != NULL; ++ep)
++	if (!strncmp (*ep, string, size) && (*ep)[size] == '=')
++	  {
++	    while (ep[1] != NULL)
++	      {
++		ep[0] = ep[1];
++		++ep;
++	      }
++	    *ep = NULL;
++	    return 0;
++	  }
++    }
++
++  size = 0;
++  for (ep = environ; *ep != NULL; ++ep)
++    if (!strncmp (*ep, string, name_end - string) &&
++	(*ep)[name_end - string] == '=')
++      break;
++    else
++      ++size;
++
++  if (*ep == NULL)
++    {
++      static char **last_environ = NULL;
++      char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
++      if (new_environ == NULL)
++	return -1;
++      (void) bcopy ((char *) environ, (char *) new_environ, size * sizeof (char *));
++      new_environ[size] = (char *) string;
++      new_environ[size + 1] = NULL;
++      if (last_environ != NULL)
++	free ((char *) last_environ);
++      last_environ = new_environ;
++      environ = new_environ;
++    }
++  else
++    *ep = (char *) string;
++
++  return 0;
++}
+--- metamail-2.7.orig/replace/basename.c
++++ metamail-2.7/replace/basename.c
+@@ -0,0 +1,45 @@
++/* basename.c -- implement basename() for architectures without it
++   Copyright (C) 2000 Gary V. Vaughan
++  
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++  
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++  
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
++#if HAVE_STRING_H
++#  include <string.h>
++#elif HAVE_STRINGS_H
++#  include <strings.h>
++#endif
++
++#if !HAVE_STRRCHR
++#  ifndef strrchr
++#    define strrchr rindex
++#  endif
++#endif
++
++char*
++basename (path)
++     char *path;
++{
++  /* Search for the last directory separator in PATH.  */
++  char *basename = strrchr (path, '/');
++  
++  /* If found, return the address of the following character,
++     or the start of the parameter passed in.  */
++  return basename ? ++basename : (char*)path;
++}
++
+--- metamail-2.7.orig/replace/Makefile.in
++++ metamail-2.7/replace/Makefile.in
+@@ -0,0 +1,343 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++AS = @AS@
++CATCOMMAND = @CATCOMMAND@
++CC = @CC@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++EXEEXT = @EXEEXT@
++LIBTOOL = @LIBTOOL@
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LN_S = @LN_S@
++LPRCOMMAND = @LPRCOMMAND@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_aux_dir = @ac_aux_dir@
++
++MAINTAINERCLEANFILES = Makefile.in
++
++INCLUDES = -I$(top_builddir) -I$(top_srcdir)
++
++noinst_LTLIBRARIES = libreplace.la
++libreplace_la_SOURCES = 
++libreplace_la_LIBADD = @LTLIBOBJS@
++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
++CONFIG_HEADER = ../metamail/config.h
++CONFIG_CLEAN_FILES = 
++LTLIBRARIES =  $(noinst_LTLIBRARIES)
++
++
++DEFS = @DEFS@ -I. -I$(srcdir) -I../metamail
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++libreplace_la_LDFLAGS = 
++libreplace_la_DEPENDENCIES =  @LTLIBOBJS@
++libreplace_la_OBJECTS = 
++CFLAGS = @CFLAGS@
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++DIST_COMMON =  Makefile.am Makefile.in basename.c putenv.c strerror.c \
++vfprintf.c
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = tar
++GZIP_ENV = --best
++DEP_FILES =  .deps/basename.P .deps/putenv.P .deps/strerror.P \
++.deps/vfprintf.P
++SOURCES = $(libreplace_la_SOURCES)
++OBJECTS = $(libreplace_la_OBJECTS)
++
++all: all-redirect
++.SUFFIXES:
++.SUFFIXES: .S .c .lo .o .obj .s
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --foreign replace/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++mostlyclean-noinstLTLIBRARIES:
++
++clean-noinstLTLIBRARIES:
++	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
++
++distclean-noinstLTLIBRARIES:
++
++maintainer-clean-noinstLTLIBRARIES:
++
++# FIXME: We should only use cygpath when building on Windows,
++# and only if it is available.
++.c.obj:
++	$(COMPILE) -c `cygpath -w $<`
++
++.s.o:
++	$(COMPILE) -c $<
++
++.S.o:
++	$(COMPILE) -c $<
++
++mostlyclean-compile:
++	-rm -f *.o core *.core
++	-rm -f *.$(OBJEXT)
++
++clean-compile:
++
++distclean-compile:
++	-rm -f *.tab.c
++
++maintainer-clean-compile:
++
++.s.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.S.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++
++maintainer-clean-libtool:
++
++libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES)
++	$(LINK)  $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = replace
++
++distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign replace/Makefile
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am:
++install-exec: install-exec-am
++
++install-data-am:
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am:
++uninstall: uninstall-am
++all-am: Makefile $(LTLIBRARIES)
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++
++
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
++		mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
++		clean-tags clean-depend clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
++		distclean-libtool distclean-tags distclean-depend \
++		distclean-generic clean-am
++	-rm -f libtool
++
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
++		maintainer-clean-compile maintainer-clean-libtool \
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-am
++
++.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
++clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
++mostlyclean-compile distclean-compile clean-compile \
++maintainer-clean-compile mostlyclean-libtool distclean-libtool \
++clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
++distclean-tags clean-tags maintainer-clean-tags distdir \
++mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+--- metamail-2.7.orig/replace/strerror.c
++++ metamail-2.7/replace/strerror.c
+@@ -0,0 +1,610 @@
++/* strerror.c -- implement strerror() for architectures without it
++   Written by Fred Fish.  fnf@cygnus.com
++   This file is in the public domain.  --Per Bothner.
++*/
++
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
++#ifdef HAVE_SYS_ERRLIST
++/* Note that errno.h (not sure what OS) or stdio.h (BSD 4.4, at least)
++   might declare sys_errlist in a way that the compiler might consider
++   incompatible with our later declaration, perhaps by using const
++   attributes.  So we hide the declaration in errno.h (if any) using a
++   macro. */
++#define sys_errlist no_such_symbol
++#endif
++
++#include <stdio.h>
++
++#if HAVE_ERRNO_H
++#  include <errno.h>
++#endif
++
++#ifdef HAVE_SYS_ERRLIST
++#  undef sys_errlist
++#endif
++
++/*  Routines imported from standard C runtime libraries. */
++
++#ifdef __STDC__
++#include <stddef.h>
++extern void *malloc (size_t size);				/* 4.10.3.3 */
++extern void *memset (void *s, int c, size_t n);			/* 4.11.6.1 */
++#else	/* !__STDC__ */
++extern char *malloc ();		/* Standard memory allocater */
++extern char *memset ();
++#endif	/* __STDC__ */
++
++#ifndef MAX
++#  define MAX(a,b) ((a) > (b) ? (a) : (b))
++#endif
++
++/* Translation table for errno values.  See intro(2) in most UNIX systems
++   Programmers Reference Manuals.
++
++   Note that this table is generally only accessed when it is used at runtime
++   to initialize errno name and message tables that are indexed by errno
++   value.
++
++   Not all of these errnos will exist on all systems.  This table is the only
++   thing that should have to be updated as new error numbers are introduced.
++   It's sort of ugly, but at least its portable. */
++
++struct error_info
++{
++  int value;		/* The numeric value from <errno.h> */
++  const char *name;	/* The equivalent symbolic value */
++#ifndef HAVE_SYS_ERRLIST
++  const char *msg;	/* Short message about this value */
++#endif
++};
++
++#ifndef HAVE_SYS_ERRLIST
++#   define ENTRY(value, name, msg)	{value, name, msg}
++#else
++#   define ENTRY(value, name, msg)	{value, name}
++#endif
++
++static const struct error_info error_table[] =
++{
++#if defined (EPERM)
++  ENTRY(EPERM, "EPERM", "Not owner"),
++#endif
++#if defined (ENOENT)
++  ENTRY(ENOENT, "ENOENT", "No such file or directory"),
++#endif
++#if defined (ESRCH)
++  ENTRY(ESRCH, "ESRCH", "No such process"),
++#endif
++#if defined (EINTR)
++  ENTRY(EINTR, "EINTR", "Interrupted system call"),
++#endif
++#if defined (EIO)
++  ENTRY(EIO, "EIO", "I/O error"),
++#endif
++#if defined (ENXIO)
++  ENTRY(ENXIO, "ENXIO", "No such device or address"),
++#endif
++#if defined (E2BIG)
++  ENTRY(E2BIG, "E2BIG", "Arg list too long"),
++#endif
++#if defined (ENOEXEC)
++  ENTRY(ENOEXEC, "ENOEXEC", "Exec format error"),
++#endif
++#if defined (EBADF)
++  ENTRY(EBADF, "EBADF", "Bad file number"),
++#endif
++#if defined (ECHILD)
++  ENTRY(ECHILD, "ECHILD", "No child processes"),
++#endif
++#if defined (EWOULDBLOCK)	/* Put before EAGAIN, sometimes aliased */
++  ENTRY(EWOULDBLOCK, "EWOULDBLOCK", "Operation would block"),
++#endif
++#if defined (EAGAIN)
++  ENTRY(EAGAIN, "EAGAIN", "No more processes"),
++#endif
++#if defined (ENOMEM)
++  ENTRY(ENOMEM, "ENOMEM", "Not enough space"),
++#endif
++#if defined (EACCES)
++  ENTRY(EACCES, "EACCES", "Permission denied"),
++#endif
++#if defined (EFAULT)
++  ENTRY(EFAULT, "EFAULT", "Bad address"),
++#endif
++#if defined (ENOTBLK)
++  ENTRY(ENOTBLK, "ENOTBLK", "Block device required"),
++#endif
++#if defined (EBUSY)
++  ENTRY(EBUSY, "EBUSY", "Device busy"),
++#endif
++#if defined (EEXIST)
++  ENTRY(EEXIST, "EEXIST", "File exists"),
++#endif
++#if defined (EXDEV)
++  ENTRY(EXDEV, "EXDEV", "Cross-device link"),
++#endif
++#if defined (ENODEV)
++  ENTRY(ENODEV, "ENODEV", "No such device"),
++#endif
++#if defined (ENOTDIR)
++  ENTRY(ENOTDIR, "ENOTDIR", "Not a directory"),
++#endif
++#if defined (EISDIR)
++  ENTRY(EISDIR, "EISDIR", "Is a directory"),
++#endif
++#if defined (EINVAL)
++  ENTRY(EINVAL, "EINVAL", "Invalid argument"),
++#endif
++#if defined (ENFILE)
++  ENTRY(ENFILE, "ENFILE", "File table overflow"),
++#endif
++#if defined (EMFILE)
++  ENTRY(EMFILE, "EMFILE", "Too many open files"),
++#endif
++#if defined (ENOTTY)
++  ENTRY(ENOTTY, "ENOTTY", "Not a typewriter"),
++#endif
++#if defined (ETXTBSY)
++  ENTRY(ETXTBSY, "ETXTBSY", "Text file busy"),
++#endif
++#if defined (EFBIG)
++  ENTRY(EFBIG, "EFBIG", "File too large"),
++#endif
++#if defined (ENOSPC)
++  ENTRY(ENOSPC, "ENOSPC", "No space left on device"),
++#endif
++#if defined (ESPIPE)
++  ENTRY(ESPIPE, "ESPIPE", "Illegal seek"),
++#endif
++#if defined (EROFS)
++  ENTRY(EROFS, "EROFS", "Read-only file system"),
++#endif
++#if defined (EMLINK)
++  ENTRY(EMLINK, "EMLINK", "Too many links"),
++#endif
++#if defined (EPIPE)
++  ENTRY(EPIPE, "EPIPE", "Broken pipe"),
++#endif
++#if defined (EDOM)
++  ENTRY(EDOM, "EDOM", "Math argument out of domain of func"),
++#endif
++#if defined (ERANGE)
++  ENTRY(ERANGE, "ERANGE", "Math result not representable"),
++#endif
++#if defined (ENOMSG)
++  ENTRY(ENOMSG, "ENOMSG", "No message of desired type"),
++#endif
++#if defined (EIDRM)
++  ENTRY(EIDRM, "EIDRM", "Identifier removed"),
++#endif
++#if defined (ECHRNG)
++  ENTRY(ECHRNG, "ECHRNG", "Channel number out of range"),
++#endif
++#if defined (EL2NSYNC)
++  ENTRY(EL2NSYNC, "EL2NSYNC", "Level 2 not synchronized"),
++#endif
++#if defined (EL3HLT)
++  ENTRY(EL3HLT, "EL3HLT", "Level 3 halted"),
++#endif
++#if defined (EL3RST)
++  ENTRY(EL3RST, "EL3RST", "Level 3 reset"),
++#endif
++#if defined (ELNRNG)
++  ENTRY(ELNRNG, "ELNRNG", "Link number out of range"),
++#endif
++#if defined (EUNATCH)
++  ENTRY(EUNATCH, "EUNATCH", "Protocol driver not attached"),
++#endif
++#if defined (ENOCSI)
++  ENTRY(ENOCSI, "ENOCSI", "No CSI structure available"),
++#endif
++#if defined (EL2HLT)
++  ENTRY(EL2HLT, "EL2HLT", "Level 2 halted"),
++#endif
++#if defined (EDEADLK)
++  ENTRY(EDEADLK, "EDEADLK", "Deadlock condition"),
++#endif
++#if defined (ENOLCK)
++  ENTRY(ENOLCK, "ENOLCK", "No record locks available"),
++#endif
++#if defined (EBADE)
++  ENTRY(EBADE, "EBADE", "Invalid exchange"),
++#endif
++#if defined (EBADR)
++  ENTRY(EBADR, "EBADR", "Invalid request descriptor"),
++#endif
++#if defined (EXFULL)
++  ENTRY(EXFULL, "EXFULL", "Exchange full"),
++#endif
++#if defined (ENOANO)
++  ENTRY(ENOANO, "ENOANO", "No anode"),
++#endif
++#if defined (EBADRQC)
++  ENTRY(EBADRQC, "EBADRQC", "Invalid request code"),
++#endif
++#if defined (EBADSLT)
++  ENTRY(EBADSLT, "EBADSLT", "Invalid slot"),
++#endif
++#if defined (EDEADLOCK)
++  ENTRY(EDEADLOCK, "EDEADLOCK", "File locking deadlock error"),
++#endif
++#if defined (EBFONT)
++  ENTRY(EBFONT, "EBFONT", "Bad font file format"),
++#endif
++#if defined (ENOSTR)
++  ENTRY(ENOSTR, "ENOSTR", "Device not a stream"),
++#endif
++#if defined (ENODATA)
++  ENTRY(ENODATA, "ENODATA", "No data available"),
++#endif
++#if defined (ETIME)
++  ENTRY(ETIME, "ETIME", "Timer expired"),
++#endif
++#if defined (ENOSR)
++  ENTRY(ENOSR, "ENOSR", "Out of streams resources"),
++#endif
++#if defined (ENONET)
++  ENTRY(ENONET, "ENONET", "Machine is not on the network"),
++#endif
++#if defined (ENOPKG)
++  ENTRY(ENOPKG, "ENOPKG", "Package not installed"),
++#endif
++#if defined (EREMOTE)
++  ENTRY(EREMOTE, "EREMOTE", "Object is remote"),
++#endif
++#if defined (ENOLINK)
++  ENTRY(ENOLINK, "ENOLINK", "Link has been severed"),
++#endif
++#if defined (EADV)
++  ENTRY(EADV, "EADV", "Advertise error"),
++#endif
++#if defined (ESRMNT)
++  ENTRY(ESRMNT, "ESRMNT", "Srmount error"),
++#endif
++#if defined (ECOMM)
++  ENTRY(ECOMM, "ECOMM", "Communication error on send"),
++#endif
++#if defined (EPROTO)
++  ENTRY(EPROTO, "EPROTO", "Protocol error"),
++#endif
++#if defined (EMULTIHOP)
++  ENTRY(EMULTIHOP, "EMULTIHOP", "Multihop attempted"),
++#endif
++#if defined (EDOTDOT)
++  ENTRY(EDOTDOT, "EDOTDOT", "RFS specific error"),
++#endif
++#if defined (EBADMSG)
++  ENTRY(EBADMSG, "EBADMSG", "Not a data message"),
++#endif
++#if defined (ENAMETOOLONG)
++  ENTRY(ENAMETOOLONG, "ENAMETOOLONG", "File name too long"),
++#endif
++#if defined (EOVERFLOW)
++  ENTRY(EOVERFLOW, "EOVERFLOW", "Value too large for defined data type"),
++#endif
++#if defined (ENOTUNIQ)
++  ENTRY(ENOTUNIQ, "ENOTUNIQ", "Name not unique on network"),
++#endif
++#if defined (EBADFD)
++  ENTRY(EBADFD, "EBADFD", "File descriptor in bad state"),
++#endif
++#if defined (EREMCHG)
++  ENTRY(EREMCHG, "EREMCHG", "Remote address changed"),
++#endif
++#if defined (ELIBACC)
++  ENTRY(ELIBACC, "ELIBACC", "Can not access a needed shared library"),
++#endif
++#if defined (ELIBBAD)
++  ENTRY(ELIBBAD, "ELIBBAD", "Accessing a corrupted shared library"),
++#endif
++#if defined (ELIBSCN)
++  ENTRY(ELIBSCN, "ELIBSCN", ".lib section in a.out corrupted"),
++#endif
++#if defined (ELIBMAX)
++  ENTRY(ELIBMAX, "ELIBMAX", "Attempting to link in too many shared libraries"),
++#endif
++#if defined (ELIBEXEC)
++  ENTRY(ELIBEXEC, "ELIBEXEC", "Cannot exec a shared library directly"),
++#endif
++#if defined (EILSEQ)
++  ENTRY(EILSEQ, "EILSEQ", "Illegal byte sequence"),
++#endif
++#if defined (ENOSYS)
++  ENTRY(ENOSYS, "ENOSYS", "Operation not applicable"),
++#endif
++#if defined (ELOOP)
++  ENTRY(ELOOP, "ELOOP", "Too many symbolic links encountered"),
++#endif
++#if defined (ERESTART)
++  ENTRY(ERESTART, "ERESTART", "Interrupted system call should be restarted"),
++#endif
++#if defined (ESTRPIPE)
++  ENTRY(ESTRPIPE, "ESTRPIPE", "Streams pipe error"),
++#endif
++#if defined (ENOTEMPTY)
++  ENTRY(ENOTEMPTY, "ENOTEMPTY", "Directory not empty"),
++#endif
++#if defined (EUSERS)
++  ENTRY(EUSERS, "EUSERS", "Too many users"),
++#endif
++#if defined (ENOTSOCK)
++  ENTRY(ENOTSOCK, "ENOTSOCK", "Socket operation on non-socket"),
++#endif
++#if defined (EDESTADDRREQ)
++  ENTRY(EDESTADDRREQ, "EDESTADDRREQ", "Destination address required"),
++#endif
++#if defined (EMSGSIZE)
++  ENTRY(EMSGSIZE, "EMSGSIZE", "Message too long"),
++#endif
++#if defined (EPROTOTYPE)
++  ENTRY(EPROTOTYPE, "EPROTOTYPE", "Protocol wrong type for socket"),
++#endif
++#if defined (ENOPROTOOPT)
++  ENTRY(ENOPROTOOPT, "ENOPROTOOPT", "Protocol not available"),
++#endif
++#if defined (EPROTONOSUPPORT)
++  ENTRY(EPROTONOSUPPORT, "EPROTONOSUPPORT", "Protocol not supported"),
++#endif
++#if defined (ESOCKTNOSUPPORT)
++  ENTRY(ESOCKTNOSUPPORT, "ESOCKTNOSUPPORT", "Socket type not supported"),
++#endif
++#if defined (EOPNOTSUPP)
++  ENTRY(EOPNOTSUPP, "EOPNOTSUPP", "Operation not supported on transport endpoint"),
++#endif
++#if defined (EPFNOSUPPORT)
++  ENTRY(EPFNOSUPPORT, "EPFNOSUPPORT", "Protocol family not supported"),
++#endif
++#if defined (EAFNOSUPPORT)
++  ENTRY(EAFNOSUPPORT, "EAFNOSUPPORT", "Address family not supported by protocol"),
++#endif
++#if defined (EADDRINUSE)
++  ENTRY(EADDRINUSE, "EADDRINUSE", "Address already in use"),
++#endif
++#if defined (EADDRNOTAVAIL)
++  ENTRY(EADDRNOTAVAIL, "EADDRNOTAVAIL","Cannot assign requested address"),
++#endif
++#if defined (ENETDOWN)
++  ENTRY(ENETDOWN, "ENETDOWN", "Network is down"),
++#endif
++#if defined (ENETUNREACH)
++  ENTRY(ENETUNREACH, "ENETUNREACH", "Network is unreachable"),
++#endif
++#if defined (ENETRESET)
++  ENTRY(ENETRESET, "ENETRESET", "Network dropped connection because of reset"),
++#endif
++#if defined (ECONNABORTED)
++  ENTRY(ECONNABORTED, "ECONNABORTED", "Software caused connection abort"),
++#endif
++#if defined (ECONNRESET)
++  ENTRY(ECONNRESET, "ECONNRESET", "Connection reset by peer"),
++#endif
++#if defined (ENOBUFS)
++  ENTRY(ENOBUFS, "ENOBUFS", "No buffer space available"),
++#endif
++#if defined (EISCONN)
++  ENTRY(EISCONN, "EISCONN", "Transport endpoint is already connected"),
++#endif
++#if defined (ENOTCONN)
++  ENTRY(ENOTCONN, "ENOTCONN", "Transport endpoint is not connected"),
++#endif
++#if defined (ESHUTDOWN)
++  ENTRY(ESHUTDOWN, "ESHUTDOWN", "Cannot send after transport endpoint shutdown"),
++#endif
++#if defined (ETOOMANYREFS)
++  ENTRY(ETOOMANYREFS, "ETOOMANYREFS", "Too many references: cannot splice"),
++#endif
++#if defined (ETIMEDOUT)
++  ENTRY(ETIMEDOUT, "ETIMEDOUT", "Connection timed out"),
++#endif
++#if defined (ECONNREFUSED)
++  ENTRY(ECONNREFUSED, "ECONNREFUSED", "Connection refused"),
++#endif
++#if defined (EHOSTDOWN)
++  ENTRY(EHOSTDOWN, "EHOSTDOWN", "Host is down"),
++#endif
++#if defined (EHOSTUNREACH)
++  ENTRY(EHOSTUNREACH, "EHOSTUNREACH", "No route to host"),
++#endif
++#if defined (EALREADY)
++  ENTRY(EALREADY, "EALREADY", "Operation already in progress"),
++#endif
++#if defined (EINPROGRESS)
++  ENTRY(EINPROGRESS, "EINPROGRESS", "Operation now in progress"),
++#endif
++#if defined (ESTALE)
++  ENTRY(ESTALE, "ESTALE", "Stale NFS file handle"),
++#endif
++#if defined (EUCLEAN)
++  ENTRY(EUCLEAN, "EUCLEAN", "Structure needs cleaning"),
++#endif
++#if defined (ENOTNAM)
++  ENTRY(ENOTNAM, "ENOTNAM", "Not a XENIX named type file"),
++#endif
++#if defined (ENAVAIL)
++  ENTRY(ENAVAIL, "ENAVAIL", "No XENIX semaphores available"),
++#endif
++#if defined (EISNAM)
++  ENTRY(EISNAM, "EISNAM", "Is a named type file"),
++#endif
++#if defined (EREMOTEIO)
++  ENTRY(EREMOTEIO, "EREMOTEIO", "Remote I/O error"),
++#endif
++  ENTRY(0, NULL, NULL)
++};
++
++#ifdef EVMSERR
++/* This is not in the table, because the numeric value of EVMSERR (32767)
++   lies outside the range of sys_errlist[].  */
++static struct { int value; const char *name, *msg; }
++  evmserr = { EVMSERR, "EVMSERR", "VMS-specific error" };
++#endif
++
++/* Translation table allocated and initialized at runtime.  Indexed by the
++   errno value to find the equivalent symbolic value. */
++
++static const char **error_names;
++static int num_error_names = 0;
++
++/* Translation table allocated and initialized at runtime, if it does not
++   already exist in the host environment.  Indexed by the errno value to find
++   the descriptive string.
++
++   We don't export it for use in other modules because even though it has the
++   same name, it differs from other implementations in that it is dynamically
++   initialized rather than statically initialized. */
++
++#ifndef HAVE_SYS_ERRLIST
++
++static int sys_nerr;
++static const char **sys_errlist;
++
++#else
++
++extern int sys_nerr;
++extern char *sys_errlist[];
++
++#endif
++
++
++#ifndef HAVE_SYS_ERRLIST
++/*
++
++NAME
++
++	init_error_tables -- initialize the name and message tables
++
++SYNOPSIS
++
++	static void init_error_tables ();
++
++DESCRIPTION
++
++	Using the error_table, which is initialized at compile time, generate
++	the error_names and the sys_errlist (if needed) tables, which are
++	indexed at runtime by a specific errno value.
++
++BUGS
++
++	The initialization of the tables may fail under low memory conditions,
++	in which case we don't do anything particularly useful, but we don't
++	bomb either.  Who knows, it might succeed at a later point if we free
++	some memory in the meantime.  In any case, the other routines know
++	how to deal with lack of a table after trying to initialize it.  This
++	may or may not be considered to be a bug, that we don't specifically
++	warn about this particular failure mode.
++
++*/
++
++static void
++init_error_tables ()
++{
++  const struct error_info *eip;
++  int nbytes;
++
++  /* If we haven't already scanned the error_table once to find the maximum
++     errno value, then go find it now. */
++
++  if (num_error_names == 0)
++    {
++      for (eip = error_table; eip -> name != NULL; eip++)
++	{
++	  if (eip -> value >= num_error_names)
++	    {
++	      num_error_names = eip -> value + 1;
++	    }
++	}
++    }
++
++  /* Now attempt to allocate the sys_errlist table, zero it out, and then
++     initialize it from the statically initialized error_table. */
++
++  if (sys_errlist == NULL)
++    {
++      nbytes = num_error_names * sizeof (char *);
++      if ((sys_errlist = (const char **) malloc (nbytes)) != NULL)
++	{
++	  memset (sys_errlist, 0, nbytes);
++	  sys_nerr = num_error_names;
++	  for (eip = error_table; eip -> name != NULL; eip++)
++	    {
++	      sys_errlist[eip -> value] = eip -> msg;
++	    }
++	}
++    }
++}
++#endif
++
++
++/*
++
++NAME
++
++	strerror -- map an error number to an error message string
++
++SYNOPSIS
++
++	char *strerror (int errnoval)
++
++DESCRIPTION
++
++	Maps an errno number to an error message string, the contents of
++	which are implementation defined.  On systems which have the external
++	variables sys_nerr and sys_errlist, these strings will be the same
++	as the ones used by perror().
++
++	If the supplied error number is within the valid range of indices
++	for the sys_errlist, but no message is available for the particular
++	error number, then returns the string "Error NUM", where NUM is the
++	error number.
++
++	If the supplied error number is not a valid index into sys_errlist,
++	returns NULL.
++
++	The returned string is only guaranteed to be valid only until the
++	next call to strerror.
++
++*/
++
++char *
++strerror (errnoval)
++  int errnoval;
++{
++  char *msg;
++  static char buf[32];
++
++#ifndef HAVE_SYS_ERRLIST
++
++  if (error_names == NULL)
++    {
++      init_error_tables ();
++    }
++
++#endif
++
++  if ((errnoval < 0) || (errnoval >= sys_nerr))
++    {
++#ifdef EVMSERR
++      if (errnoval == evmserr.value)
++	msg = evmserr.msg;
++      else
++#endif
++      /* Out of range, just return NULL */
++      msg = NULL;
++    }
++  else if ((sys_errlist == NULL) || (sys_errlist[errnoval] == NULL))
++    {
++      /* In range, but no sys_errlist or no entry at this index. */
++      sprintf (buf, "Error %d", errnoval);
++      msg = buf;
++    }
++  else
++    {
++      /* In range, and a valid message.  Just return the message. */
++      msg = (char *) sys_errlist[errnoval];
++    }
++  
++  return (msg);
++}
+--- metamail-2.7.orig/replace/vfprintf.c
++++ metamail-2.7/replace/vfprintf.c
+@@ -0,0 +1,43 @@
++/* vfprintf.c -- implement vfprintf() for architectures without it
++   Copyright (C) 2000 Gary V. Vaughan
++  
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++  
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++  
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
++#include <stdio.h>
++
++#if HAVE_STDARG_H && !HAVE_VARARGS_H
++#  include <stdarg.h>
++#else /*!HAVE_STDARG_H || HAVE_VARARGS_H*/
++#  include <varargs.h>
++#endif /*HAVE_STDARG_H && !HAVE_VARARGS_H*/
++
++/* Some systems define this! */
++#undef vfprintf
++
++extern int _doprnt ();
++
++int
++vfprintf (file, format, ap)
++     FILE *file;
++     const char *format;
++     va_list ap;
++{
++   return _doprnt (format, ap, file);
++}
+--- metamail-2.7.orig/COPYING
++++ metamail-2.7/COPYING
+@@ -0,0 +1,340 @@
++		    GNU GENERAL PUBLIC LICENSE
++		       Version 2, June 1991
++
++ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
++     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++			    Preamble
++
++  The licenses for most software are designed to take away your
++freedom to share and change it.  By contrast, the GNU General Public
++License is intended to guarantee your freedom to share and change free
++software--to make sure the software is free for all its users.  This
++General Public License applies to most of the Free Software
++Foundation's software and to any other program whose authors commit to
++using it.  (Some other Free Software Foundation software is covered by
++the GNU Library General Public License instead.)  You can apply it to
++your programs, too.
++
++  When we speak of free software, we are referring to freedom, not
++price.  Our General Public Licenses are designed to make sure that you
++have the freedom to distribute copies of free software (and charge for
++this service if you wish), that you receive source code or can get it
++if you want it, that you can change the software or use pieces of it
++in new free programs; and that you know you can do these things.
++
++  To protect your rights, we need to make restrictions that forbid
++anyone to deny you these rights or to ask you to surrender the rights.
++These restrictions translate to certain responsibilities for you if you
++distribute copies of the software, or if you modify it.
++
++  For example, if you distribute copies of such a program, whether
++gratis or for a fee, you must give the recipients all the rights that
++you have.  You must make sure that they, too, receive or can get the
++source code.  And you must show them these terms so they know their
++rights.
++
++  We protect your rights with two steps: (1) copyright the software, and
++(2) offer you this license which gives you legal permission to copy,
++distribute and/or modify the software.
++
++  Also, for each author's protection and ours, we want to make certain
++that everyone understands that there is no warranty for this free
++software.  If the software is modified by someone else and passed on, we
++want its recipients to know that what they have is not the original, so
++that any problems introduced by others will not reflect on the original
++authors' reputations.
++
++  Finally, any free program is threatened constantly by software
++patents.  We wish to avoid the danger that redistributors of a free
++program will individually obtain patent licenses, in effect making the
++program proprietary.  To prevent this, we have made it clear that any
++patent must be licensed for everyone's free use or not licensed at all.
++
++  The precise terms and conditions for copying, distribution and
++modification follow.
++
++		    GNU GENERAL PUBLIC LICENSE
++   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++
++  0. This License applies to any program or other work which contains
++a notice placed by the copyright holder saying it may be distributed
++under the terms of this General Public License.  The "Program", below,
++refers to any such program or work, and a "work based on the Program"
++means either the Program or any derivative work under copyright law:
++that is to say, a work containing the Program or a portion of it,
++either verbatim or with modifications and/or translated into another
++language.  (Hereinafter, translation is included without limitation in
++the term "modification".)  Each licensee is addressed as "you".
++
++Activities other than copying, distribution and modification are not
++covered by this License; they are outside its scope.  The act of
++running the Program is not restricted, and the output from the Program
++is covered only if its contents constitute a work based on the
++Program (independent of having been made by running the Program).
++Whether that is true depends on what the Program does.
++
++  1. You may copy and distribute verbatim copies of the Program's
++source code as you receive it, in any medium, provided that you
++conspicuously and appropriately publish on each copy an appropriate
++copyright notice and disclaimer of warranty; keep intact all the
++notices that refer to this License and to the absence of any warranty;
++and give any other recipients of the Program a copy of this License
++along with the Program.
++
++You may charge a fee for the physical act of transferring a copy, and
++you may at your option offer warranty protection in exchange for a fee.
++
++  2. You may modify your copy or copies of the Program or any portion
++of it, thus forming a work based on the Program, and copy and
++distribute such modifications or work under the terms of Section 1
++above, provided that you also meet all of these conditions:
++
++    a) You must cause the modified files to carry prominent notices
++    stating that you changed the files and the date of any change.
++
++    b) You must cause any work that you distribute or publish, that in
++    whole or in part contains or is derived from the Program or any
++    part thereof, to be licensed as a whole at no charge to all third
++    parties under the terms of this License.
++
++    c) If the modified program normally reads commands interactively
++    when run, you must cause it, when started running for such
++    interactive use in the most ordinary way, to print or display an
++    announcement including an appropriate copyright notice and a
++    notice that there is no warranty (or else, saying that you provide
++    a warranty) and that users may redistribute the program under
++    these conditions, and telling the user how to view a copy of this
++    License.  (Exception: if the Program itself is interactive but
++    does not normally print such an announcement, your work based on
++    the Program is not required to print an announcement.)
++
++These requirements apply to the modified work as a whole.  If
++identifiable sections of that work are not derived from the Program,
++and can be reasonably considered independent and separate works in
++themselves, then this License, and its terms, do not apply to those
++sections when you distribute them as separate works.  But when you
++distribute the same sections as part of a whole which is a work based
++on the Program, the distribution of the whole must be on the terms of
++this License, whose permissions for other licensees extend to the
++entire whole, and thus to each and every part regardless of who wrote it.
++
++Thus, it is not the intent of this section to claim rights or contest
++your rights to work written entirely by you; rather, the intent is to
++exercise the right to control the distribution of derivative or
++collective works based on the Program.
++
++In addition, mere aggregation of another work not based on the Program
++with the Program (or with a work based on the Program) on a volume of
++a storage or distribution medium does not bring the other work under
++the scope of this License.
++
++  3. You may copy and distribute the Program (or a work based on it,
++under Section 2) in object code or executable form under the terms of
++Sections 1 and 2 above provided that you also do one of the following:
++
++    a) Accompany it with the complete corresponding machine-readable
++    source code, which must be distributed under the terms of Sections
++    1 and 2 above on a medium customarily used for software interchange; or,
++
++    b) Accompany it with a written offer, valid for at least three
++    years, to give any third party, for a charge no more than your
++    cost of physically performing source distribution, a complete
++    machine-readable copy of the corresponding source code, to be
++    distributed under the terms of Sections 1 and 2 above on a medium
++    customarily used for software interchange; or,
++
++    c) Accompany it with the information you received as to the offer
++    to distribute corresponding source code.  (This alternative is
++    allowed only for noncommercial distribution and only if you
++    received the program in object code or executable form with such
++    an offer, in accord with Subsection b above.)
++
++The source code for a work means the preferred form of the work for
++making modifications to it.  For an executable work, complete source
++code means all the source code for all modules it contains, plus any
++associated interface definition files, plus the scripts used to
++control compilation and installation of the executable.  However, as a
++special exception, the source code distributed need not include
++anything that is normally distributed (in either source or binary
++form) with the major components (compiler, kernel, and so on) of the
++operating system on which the executable runs, unless that component
++itself accompanies the executable.
++
++If distribution of executable or object code is made by offering
++access to copy from a designated place, then offering equivalent
++access to copy the source code from the same place counts as
++distribution of the source code, even though third parties are not
++compelled to copy the source along with the object code.
++
++  4. You may not copy, modify, sublicense, or distribute the Program
++except as expressly provided under this License.  Any attempt
++otherwise to copy, modify, sublicense or distribute the Program is
++void, and will automatically terminate your rights under this License.
++However, parties who have received copies, or rights, from you under
++this License will not have their licenses terminated so long as such
++parties remain in full compliance.
++
++  5. You are not required to accept this License, since you have not
++signed it.  However, nothing else grants you permission to modify or
++distribute the Program or its derivative works.  These actions are
++prohibited by law if you do not accept this License.  Therefore, by
++modifying or distributing the Program (or any work based on the
++Program), you indicate your acceptance of this License to do so, and
++all its terms and conditions for copying, distributing or modifying
++the Program or works based on it.
++
++  6. Each time you redistribute the Program (or any work based on the
++Program), the recipient automatically receives a license from the
++original licensor to copy, distribute or modify the Program subject to
++these terms and conditions.  You may not impose any further
++restrictions on the recipients' exercise of the rights granted herein.
++You are not responsible for enforcing compliance by third parties to
++this License.
++
++  7. If, as a consequence of a court judgment or allegation of patent
++infringement or for any other reason (not limited to patent issues),
++conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License.  If you cannot
++distribute so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you
++may not distribute the Program at all.  For example, if a patent
++license would not permit royalty-free redistribution of the Program by
++all those who receive copies directly or indirectly through you, then
++the only way you could satisfy both it and this License would be to
++refrain entirely from distribution of the Program.
++
++If any portion of this section is held invalid or unenforceable under
++any particular circumstance, the balance of the section is intended to
++apply and the section as a whole is intended to apply in other
++circumstances.
++
++It is not the purpose of this section to induce you to infringe any
++patents or other property right claims or to contest validity of any
++such claims; this section has the sole purpose of protecting the
++integrity of the free software distribution system, which is
++implemented by public license practices.  Many people have made
++generous contributions to the wide range of software distributed
++through that system in reliance on consistent application of that
++system; it is up to the author/donor to decide if he or she is willing
++to distribute software through any other system and a licensee cannot
++impose that choice.
++
++This section is intended to make thoroughly clear what is believed to
++be a consequence of the rest of this License.
++
++  8. If the distribution and/or use of the Program is restricted in
++certain countries either by patents or by copyrighted interfaces, the
++original copyright holder who places the Program under this License
++may add an explicit geographical distribution limitation excluding
++those countries, so that distribution is permitted only in or among
++countries not thus excluded.  In such case, this License incorporates
++the limitation as if written in the body of this License.
++
++  9. The Free Software Foundation may publish revised and/or new versions
++of the General Public License from time to time.  Such new versions will
++be similar in spirit to the present version, but may differ in detail to
++address new problems or concerns.
++
++Each version is given a distinguishing version number.  If the Program
++specifies a version number of this License which applies to it and "any
++later version", you have the option of following the terms and conditions
++either of that version or of any later version published by the Free
++Software Foundation.  If the Program does not specify a version number of
++this License, you may choose any version ever published by the Free Software
++Foundation.
++
++  10. If you wish to incorporate parts of the Program into other free
++programs whose distribution conditions are different, write to the author
++to ask for permission.  For software which is copyrighted by the Free
++Software Foundation, write to the Free Software Foundation; we sometimes
++make exceptions for this.  Our decision will be guided by the two goals
++of preserving the free status of all derivatives of our free software and
++of promoting the sharing and reuse of software generally.
++
++			    NO WARRANTY
++
++  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
++PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
++REPAIR OR CORRECTION.
++
++  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
++POSSIBILITY OF SUCH DAMAGES.
++
++		     END OF TERMS AND CONDITIONS
++
++	    How to Apply These Terms to Your New Programs
++
++  If you develop a new program, and you want it to be of the greatest
++possible use to the public, the best way to achieve this is to make it
++free software which everyone can redistribute and change under these terms.
++
++  To do so, attach the following notices to the program.  It is safest
++to attach them to the start of each source file to most effectively
++convey the exclusion of warranty; and each file should have at least
++the "copyright" line and a pointer to where the full notice is found.
++
++    <one line to give the program's name and a brief idea of what it does.>
++    Copyright (C) <year>  <name of author>
++
++    This program is free software; you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++
++
++Also add information on how to contact you by electronic and paper mail.
++
++If the program is interactive, make it output a short notice like this
++when it starts in an interactive mode:
++
++    Gnomovision version 69, Copyright (C) year  name of author
++    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
++    This is free software, and you are welcome to redistribute it
++    under certain conditions; type `show c' for details.
++
++The hypothetical commands `show w' and `show c' should show the appropriate
++parts of the General Public License.  Of course, the commands you use may
++be called something other than `show w' and `show c'; they could even be
++mouse-clicks or menu items--whatever suits your program.
++
++You should also get your employer (if you work as a programmer) or your
++school, if any, to sign a "copyright disclaimer" for the program, if
++necessary.  Here is a sample; alter the names:
++
++  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
++  `Gnomovision' (which makes passes at compilers) written by James Hacker.
++
++  <signature of Ty Coon>, 1 April 1989
++  Ty Coon, President of Vice
++
++This General Public License does not permit incorporating your program into
++proprietary programs.  If your program is a subroutine library, you may
++consider it more useful to permit linking proprietary applications with the
++library.  If this is what you want to do, use the GNU Library General
++Public License instead of this License.
+--- metamail-2.7.orig/stamp-h.in
++++ metamail-2.7/stamp-h.in
+@@ -0,0 +1 @@
++timestamp
+--- metamail-2.7.orig/configure
++++ metamail-2.7/configure
+@@ -0,0 +1,7333 @@
++#! /bin/sh
++
++# Guess values for system-dependent variables and create Makefiles.
++# Generated automatically using autoconf version 2.13 
++# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
++#
++# This configure script is free software; the Free Software Foundation
++# gives unlimited permission to copy, distribute and modify it.
++
++# Defaults:
++ac_help=
++ac_default_prefix=/usr/local
++# Any additions from configure.in:
++ac_help="$ac_help
++  --enable-maintainer-mode enable make rules and dependencies not useful
++                          (and sometimes confusing) to the casual installer"
++ac_help="$ac_help
++  --enable-shared[=PKGS]  build shared libraries [default=yes]"
++ac_help="$ac_help
++  --enable-static[=PKGS]  build static libraries [default=yes]"
++ac_help="$ac_help
++  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
++ac_help="$ac_help
++  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
++
++# Find the correct PATH separator.  Usually this is `:', but
++# DJGPP uses `;' like DOS.
++if test "X${PATH_SEPARATOR+set}" != Xset; then
++  UNAME=${UNAME-`uname 2>/dev/null`}
++  case X$UNAME in
++    *-DOS) lt_cv_sys_path_separator=';' ;;
++    *)     lt_cv_sys_path_separator=':' ;;
++  esac
++  PATH_SEPARATOR=$lt_cv_sys_path_separator
++fi
++
++
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
++  ;;
++esac
++
++echo=${ECHO-echo}
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "$0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
++fi
++
++
++ac_help="$ac_help
++  --disable-libtool-lock  avoid locking (might break parallel builds)"
++ac_help="$ac_help
++  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
++
++# Initialize some variables set by options.
++# The variables have the same names as the options, with
++# dashes changed to underlines.
++build=NONE
++cache_file=./config.cache
++exec_prefix=NONE
++host=NONE
++no_create=
++nonopt=NONE
++no_recursion=
++prefix=NONE
++program_prefix=NONE
++program_suffix=NONE
++program_transform_name=s,x,x,
++silent=
++site=
++srcdir=
++target=NONE
++verbose=
++x_includes=NONE
++x_libraries=NONE
++bindir='${exec_prefix}/bin'
++sbindir='${exec_prefix}/sbin'
++libexecdir='${exec_prefix}/libexec'
++datadir='${prefix}/share'
++sysconfdir='${prefix}/etc'
++sharedstatedir='${prefix}/com'
++localstatedir='${prefix}/var'
++libdir='${exec_prefix}/lib'
++includedir='${prefix}/include'
++oldincludedir='/usr/include'
++infodir='${prefix}/info'
++mandir='${prefix}/man'
++
++# Initialize some other variables.
++subdirs=
++MFLAGS= MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
++# Maximum number of lines to put in a shell here document.
++ac_max_here_lines=12
++
++ac_prev=
++for ac_option
++do
++
++  # If the previous option needs an argument, assign it.
++  if test -n "$ac_prev"; then
++    eval "$ac_prev=\$ac_option"
++    ac_prev=
++    continue
++  fi
++
++  case "$ac_option" in
++  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) ac_optarg= ;;
++  esac
++
++  # Accept the important Cygnus configure options, so we can diagnose typos.
++
++  case "$ac_option" in
++
++  -bindir | --bindir | --bindi | --bind | --bin | --bi)
++    ac_prev=bindir ;;
++  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
++    bindir="$ac_optarg" ;;
++
++  -build | --build | --buil | --bui | --bu)
++    ac_prev=build ;;
++  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
++    build="$ac_optarg" ;;
++
++  -cache-file | --cache-file | --cache-fil | --cache-fi \
++  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
++    ac_prev=cache_file ;;
++  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
++  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
++    cache_file="$ac_optarg" ;;
++
++  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++    ac_prev=datadir ;;
++  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
++  | --da=*)
++    datadir="$ac_optarg" ;;
++
++  -disable-* | --disable-*)
++    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
++    # Reject names that are not valid shell variable names.
++    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
++      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
++    fi
++    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
++    eval "enable_${ac_feature}=no" ;;
++
++  -enable-* | --enable-*)
++    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
++    # Reject names that are not valid shell variable names.
++    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
++      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
++    fi
++    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
++    case "$ac_option" in
++      *=*) ;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "enable_${ac_feature}='$ac_optarg'" ;;
++
++  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
++  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
++  | --exec | --exe | --ex)
++    ac_prev=exec_prefix ;;
++  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
++  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
++  | --exec=* | --exe=* | --ex=*)
++    exec_prefix="$ac_optarg" ;;
++
++  -gas | --gas | --ga | --g)
++    # Obsolete; use --with-gas.
++    with_gas=yes ;;
++
++  -help | --help | --hel | --he)
++    # Omit some internal or obsolete options to make the list less imposing.
++    # This message is too long to be a string in the A/UX 3.1 sh.
++    cat << EOF
++Usage: configure [options] [host]
++Options: [defaults in brackets after descriptions]
++Configuration:
++  --cache-file=FILE       cache test results in FILE
++  --help                  print this message
++  --no-create             do not create output files
++  --quiet, --silent       do not print \`checking...' messages
++  --version               print the version of autoconf that created configure
++Directory and file names:
++  --prefix=PREFIX         install architecture-independent files in PREFIX
++                          [$ac_default_prefix]
++  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
++                          [same as prefix]
++  --bindir=DIR            user executables in DIR [EPREFIX/bin]
++  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
++  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
++  --datadir=DIR           read-only architecture-independent data in DIR
++                          [PREFIX/share]
++  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
++  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
++                          [PREFIX/com]
++  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
++  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
++  --includedir=DIR        C header files in DIR [PREFIX/include]
++  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
++  --infodir=DIR           info documentation in DIR [PREFIX/info]
++  --mandir=DIR            man documentation in DIR [PREFIX/man]
++  --srcdir=DIR            find the sources in DIR [configure dir or ..]
++  --program-prefix=PREFIX prepend PREFIX to installed program names
++  --program-suffix=SUFFIX append SUFFIX to installed program names
++  --program-transform-name=PROGRAM
++                          run sed PROGRAM on installed program names
++EOF
++    cat << EOF
++Host type:
++  --build=BUILD           configure for building on BUILD [BUILD=HOST]
++  --host=HOST             configure for HOST [guessed]
++  --target=TARGET         configure for TARGET [TARGET=HOST]
++Features and packages:
++  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
++  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
++  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
++  --x-includes=DIR        X include files are in DIR
++  --x-libraries=DIR       X library files are in DIR
++EOF
++    if test -n "$ac_help"; then
++      echo "--enable and --with options recognized:$ac_help"
++    fi
++    exit 0 ;;
++
++  -host | --host | --hos | --ho)
++    ac_prev=host ;;
++  -host=* | --host=* | --hos=* | --ho=*)
++    host="$ac_optarg" ;;
++
++  -includedir | --includedir | --includedi | --included | --include \
++  | --includ | --inclu | --incl | --inc)
++    ac_prev=includedir ;;
++  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
++  | --includ=* | --inclu=* | --incl=* | --inc=*)
++    includedir="$ac_optarg" ;;
++
++  -infodir | --infodir | --infodi | --infod | --info | --inf)
++    ac_prev=infodir ;;
++  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
++    infodir="$ac_optarg" ;;
++
++  -libdir | --libdir | --libdi | --libd)
++    ac_prev=libdir ;;
++  -libdir=* | --libdir=* | --libdi=* | --libd=*)
++    libdir="$ac_optarg" ;;
++
++  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
++  | --libexe | --libex | --libe)
++    ac_prev=libexecdir ;;
++  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
++  | --libexe=* | --libex=* | --libe=*)
++    libexecdir="$ac_optarg" ;;
++
++  -localstatedir | --localstatedir | --localstatedi | --localstated \
++  | --localstate | --localstat | --localsta | --localst \
++  | --locals | --local | --loca | --loc | --lo)
++    ac_prev=localstatedir ;;
++  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
++  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++    localstatedir="$ac_optarg" ;;
++
++  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
++    ac_prev=mandir ;;
++  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
++    mandir="$ac_optarg" ;;
++
++  -nfp | --nfp | --nf)
++    # Obsolete; use --without-fp.
++    with_fp=no ;;
++
++  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
++  | --no-cr | --no-c)
++    no_create=yes ;;
++
++  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
++  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
++    no_recursion=yes ;;
++
++  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
++  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
++  | --oldin | --oldi | --old | --ol | --o)
++    ac_prev=oldincludedir ;;
++  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
++  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
++  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
++    oldincludedir="$ac_optarg" ;;
++
++  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
++    ac_prev=prefix ;;
++  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
++    prefix="$ac_optarg" ;;
++
++  -program-prefix | --program-prefix | --program-prefi | --program-pref \
++  | --program-pre | --program-pr | --program-p)
++    ac_prev=program_prefix ;;
++  -program-prefix=* | --program-prefix=* | --program-prefi=* \
++  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
++    program_prefix="$ac_optarg" ;;
++
++  -program-suffix | --program-suffix | --program-suffi | --program-suff \
++  | --program-suf | --program-su | --program-s)
++    ac_prev=program_suffix ;;
++  -program-suffix=* | --program-suffix=* | --program-suffi=* \
++  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
++    program_suffix="$ac_optarg" ;;
++
++  -program-transform-name | --program-transform-name \
++  | --program-transform-nam | --program-transform-na \
++  | --program-transform-n | --program-transform- \
++  | --program-transform | --program-transfor \
++  | --program-transfo | --program-transf \
++  | --program-trans | --program-tran \
++  | --progr-tra | --program-tr | --program-t)
++    ac_prev=program_transform_name ;;
++  -program-transform-name=* | --program-transform-name=* \
++  | --program-transform-nam=* | --program-transform-na=* \
++  | --program-transform-n=* | --program-transform-=* \
++  | --program-transform=* | --program-transfor=* \
++  | --program-transfo=* | --program-transf=* \
++  | --program-trans=* | --program-tran=* \
++  | --progr-tra=* | --program-tr=* | --program-t=*)
++    program_transform_name="$ac_optarg" ;;
++
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil)
++    silent=yes ;;
++
++  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
++    ac_prev=sbindir ;;
++  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
++  | --sbi=* | --sb=*)
++    sbindir="$ac_optarg" ;;
++
++  -sharedstatedir | --sharedstatedir | --sharedstatedi \
++  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
++  | --sharedst | --shareds | --shared | --share | --shar \
++  | --sha | --sh)
++    ac_prev=sharedstatedir ;;
++  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
++  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
++  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
++  | --sha=* | --sh=*)
++    sharedstatedir="$ac_optarg" ;;
++
++  -site | --site | --sit)
++    ac_prev=site ;;
++  -site=* | --site=* | --sit=*)
++    site="$ac_optarg" ;;
++
++  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
++    ac_prev=srcdir ;;
++  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
++    srcdir="$ac_optarg" ;;
++
++  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
++  | --syscon | --sysco | --sysc | --sys | --sy)
++    ac_prev=sysconfdir ;;
++  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
++  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
++    sysconfdir="$ac_optarg" ;;
++
++  -target | --target | --targe | --targ | --tar | --ta | --t)
++    ac_prev=target ;;
++  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
++    target="$ac_optarg" ;;
++
++  -v | -verbose | --verbose | --verbos | --verbo | --verb)
++    verbose=yes ;;
++
++  -version | --version | --versio | --versi | --vers)
++    echo "configure generated by autoconf version 2.13"
++    exit 0 ;;
++
++  -with-* | --with-*)
++    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
++    # Reject names that are not valid shell variable names.
++    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
++      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
++    fi
++    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    case "$ac_option" in
++      *=*) ;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "with_${ac_package}='$ac_optarg'" ;;
++
++  -without-* | --without-*)
++    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
++    # Reject names that are not valid shell variable names.
++    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
++      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
++    fi
++    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    eval "with_${ac_package}=no" ;;
++
++  --x)
++    # Obsolete; use --with-x.
++    with_x=yes ;;
++
++  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
++  | --x-incl | --x-inc | --x-in | --x-i)
++    ac_prev=x_includes ;;
++  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
++  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
++    x_includes="$ac_optarg" ;;
++
++  -x-libraries | --x-libraries | --x-librarie | --x-librari \
++  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
++    ac_prev=x_libraries ;;
++  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
++  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
++    x_libraries="$ac_optarg" ;;
++
++  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
++    ;;
++
++  *)
++    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++      echo "configure: warning: $ac_option: invalid host type" 1>&2
++    fi
++    if test "x$nonopt" != xNONE; then
++      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++    fi
++    nonopt="$ac_option"
++    ;;
++
++  esac
++done
++
++if test -n "$ac_prev"; then
++  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
++fi
++
++trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
++
++# File descriptor usage:
++# 0 standard input
++# 1 file creation
++# 2 errors and warnings
++# 3 some systems may open it to /dev/tty
++# 4 used on the Kubota Titan
++# 6 checking for... messages and results
++# 5 compiler messages saved in config.log
++if test "$silent" = yes; then
++  exec 6>/dev/null
++else
++  exec 6>&1
++fi
++exec 5>./config.log
++
++echo "\
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++" 1>&5
++
++# Strip out --no-create and --no-recursion so they do not pile up.
++# Also quote any args containing shell metacharacters.
++ac_configure_args=
++for ac_arg
++do
++  case "$ac_arg" in
++  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
++  | --no-cr | --no-c) ;;
++  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
++  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
++  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
++  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
++  esac
++done
++
++# NLS nuisances.
++# Only set these to C if already set.  These must not be set unconditionally
++# because not all systems understand e.g. LANG=C (notably SCO).
++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
++# Non-C LC_CTYPE values break the ctype check.
++if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
++if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
++
++# confdefs.h avoids OS command line length limits that DEFS can exceed.
++rm -rf conftest* confdefs.h
++# AIX cpp loses on an empty file, so make sure it contains at least a newline.
++echo > confdefs.h
++
++# A filename unique to this package, relative to the directory that
++# configure is in, which we can look for to find out if srcdir is correct.
++ac_unique_file=src/metamail/metamail.c
++
++# Find the source files, if location was not specified.
++if test -z "$srcdir"; then
++  ac_srcdir_defaulted=yes
++  # Try the directory containing this script, then its parent.
++  ac_prog=$0
++  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
++  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
++  srcdir=$ac_confdir
++  if test ! -r $srcdir/$ac_unique_file; then
++    srcdir=..
++  fi
++else
++  ac_srcdir_defaulted=no
++fi
++if test ! -r $srcdir/$ac_unique_file; then
++  if test "$ac_srcdir_defaulted" = yes; then
++    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
++  else
++    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
++  fi
++fi
++srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
++
++# Prefer explicitly selected file to automatically selected ones.
++if test -z "$CONFIG_SITE"; then
++  if test "x$prefix" != xNONE; then
++    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
++  else
++    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
++  fi
++fi
++for ac_site_file in $CONFIG_SITE; do
++  if test -r "$ac_site_file"; then
++    echo "loading site script $ac_site_file"
++    . "$ac_site_file"
++  fi
++done
++
++if test -r "$cache_file"; then
++  echo "loading cache $cache_file"
++  . $cache_file
++else
++  echo "creating cache $cache_file"
++  > $cache_file
++fi
++
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++ac_exeext=
++ac_objext=o
++if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
++  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
++  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
++    ac_n= ac_c='
++' ac_t='	'
++  else
++    ac_n=-n ac_c= ac_t=
++  fi
++else
++  ac_n= ac_c='\c' ac_t=
++fi
++
++
++ac_aux_dir=
++for ac_dir in config $srcdir/config; do
++  if test -f $ac_dir/install-sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f $ac_dir/install.sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  fi
++done
++if test -z "$ac_aux_dir"; then
++  { echo "configure: error: can not find install-sh or install.sh in config $srcdir/config" 1>&2; exit 1; }
++fi
++ac_config_guess=$ac_aux_dir/config.guess
++ac_config_sub=$ac_aux_dir/config.sub
++ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
++
++
++
++
++am__api_version="1.4"
++# Find a good install program.  We prefer a C program (faster),
++# so one script is as good as another.  But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++echo "configure:734: checking for a BSD compatible install" >&5
++if test -z "$INSTALL"; then
++if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
++  for ac_dir in $PATH; do
++    # Account for people who put trailing slashes in PATH elements.
++    case "$ac_dir/" in
++    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++    *)
++      # OSF1 and SCO ODT 3.0 have their own names for install.
++      # Don't use installbsd from OSF since it installs stuff as root
++      # by default.
++      for ac_prog in ginstall scoinst install; do
++        if test -f $ac_dir/$ac_prog; then
++	  if test $ac_prog = install &&
++            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++	    # AIX install.  It has an incompatible calling convention.
++	    :
++	  else
++	    ac_cv_path_install="$ac_dir/$ac_prog -c"
++	    break 2
++	  fi
++	fi
++      done
++      ;;
++    esac
++  done
++  IFS="$ac_save_IFS"
++
++fi
++  if test "${ac_cv_path_install+set}" = set; then
++    INSTALL="$ac_cv_path_install"
++  else
++    # As a last resort, use the slow shell script.  We don't cache a
++    # path for INSTALL within a source directory, because that will
++    # break other packages using the cache if that directory is
++    # removed, or if the path is relative.
++    INSTALL="$ac_install_sh"
++  fi
++fi
++echo "$ac_t""$INSTALL" 1>&6
++
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
++
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++
++echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
++echo "configure:787: checking whether build environment is sane" >&5
++# Just in case
++sleep 1
++echo timestamp > conftestfile
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
++   if test "$*" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftestfile`
++   fi
++   if test "$*" != "X $srcdir/configure conftestfile" \
++      && test "$*" != "X conftestfile $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" 1>&2; exit 1; }
++   fi
++
++   test "$2" = conftestfile
++   )
++then
++   # Ok.
++   :
++else
++   { echo "configure: error: newly created file is older than distributed files!
++Check your system clock" 1>&2; exit 1; }
++fi
++rm -f conftest*
++echo "$ac_t""yes" 1>&6
++if test "$program_transform_name" = s,x,x,; then
++  program_transform_name=
++else
++  # Double any \ or $.  echo might interpret backslashes.
++  cat <<\EOF_SED > conftestsed
++s,\\,\\\\,g; s,\$,$$,g
++EOF_SED
++  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
++  rm -f conftestsed
++fi
++test "$program_prefix" != NONE &&
++  program_transform_name="s,^,${program_prefix},; $program_transform_name"
++# Use a double $ so make ignores it.
++test "$program_suffix" != NONE &&
++  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
++
++# sed with no file args requires a program.
++test "$program_transform_name" = "" && program_transform_name="s,x,x,"
++
++echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
++echo "configure:844: checking whether ${MAKE-make} sets \${MAKE}" >&5
++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftestmake <<\EOF
++all:
++	@echo 'ac_maketemp="${MAKE}"'
++EOF
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
++if test -n "$ac_maketemp"; then
++  eval ac_cv_prog_make_${ac_make}_set=yes
++else
++  eval ac_cv_prog_make_${ac_make}_set=no
++fi
++rm -f conftestmake
++fi
++if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  SET_MAKE=
++else
++  echo "$ac_t""no" 1>&6
++  SET_MAKE="MAKE=${MAKE-make}"
++fi
++
++
++PACKAGE=metamail
++
++VERSION=0.0.1
++
++if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
++  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
++fi
++cat >> confdefs.h <<EOF
++#define PACKAGE "$PACKAGE"
++EOF
++
++cat >> confdefs.h <<EOF
++#define VERSION "$VERSION"
++EOF
++
++
++
++missing_dir=`cd $ac_aux_dir && pwd`
++echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
++echo "configure:890: checking for working aclocal-${am__api_version}" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf.  Sigh.
++if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
++   ACLOCAL=aclocal-${am__api_version}
++   echo "$ac_t""found" 1>&6
++else
++   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
++   echo "$ac_t""missing" 1>&6
++fi
++
++echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
++echo "configure:903: checking for working autoconf" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf.  Sigh.
++if (autoconf --version) < /dev/null > /dev/null 2>&1; then
++   AUTOCONF=autoconf
++   echo "$ac_t""found" 1>&6
++else
++   AUTOCONF="$missing_dir/missing autoconf"
++   echo "$ac_t""missing" 1>&6
++fi
++
++echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
++echo "configure:916: checking for working automake-${am__api_version}" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf.  Sigh.
++if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
++   AUTOMAKE=automake-${am__api_version}
++   echo "$ac_t""found" 1>&6
++else
++   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
++   echo "$ac_t""missing" 1>&6
++fi
++
++echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
++echo "configure:929: checking for working autoheader" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf.  Sigh.
++if (autoheader --version) < /dev/null > /dev/null 2>&1; then
++   AUTOHEADER=autoheader
++   echo "$ac_t""found" 1>&6
++else
++   AUTOHEADER="$missing_dir/missing autoheader"
++   echo "$ac_t""missing" 1>&6
++fi
++
++echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
++echo "configure:942: checking for working makeinfo" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf.  Sigh.
++if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
++   MAKEINFO=makeinfo
++   echo "$ac_t""found" 1>&6
++else
++   MAKEINFO="$missing_dir/missing makeinfo"
++   echo "$ac_t""missing" 1>&6
++fi
++
++
++echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
++echo "configure:956: checking whether to enable maintainer-specific portions of Makefiles" >&5
++    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++  enableval="$enable_maintainer_mode"
++  USE_MAINTAINER_MODE=$enableval
++else
++  USE_MAINTAINER_MODE=no
++fi
++
++  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
++  
++
++if test $USE_MAINTAINER_MODE = yes; then
++  MAINTAINER_MODE_TRUE=
++  MAINTAINER_MODE_FALSE='#'
++else
++  MAINTAINER_MODE_TRUE='#'
++  MAINTAINER_MODE_FALSE=
++fi
++  MAINT=$MAINTAINER_MODE_TRUE
++  
++
++
++
++# Make sure we can run config.sub.
++if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
++else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
++fi
++
++echo $ac_n "checking host system type""... $ac_c" 1>&6
++echo "configure:986: checking host system type" >&5
++
++host_alias=$host
++case "$host_alias" in
++NONE)
++  case $nonopt in
++  NONE)
++    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
++    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
++    fi ;;
++  *) host_alias=$nonopt ;;
++  esac ;;
++esac
++
++host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
++host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++echo "$ac_t""$host" 1>&6
++
++
++# Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1010: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CC="gcc"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++  echo "$ac_t""$CC" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1040: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_prog_rejected=no
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
++        ac_prog_rejected=yes
++	continue
++      fi
++      ac_cv_prog_CC="cc"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++if test $ac_prog_rejected = yes; then
++  # We found a bogon in the path, so make sure we never use it.
++  set dummy $ac_cv_prog_CC
++  shift
++  if test $# -gt 0; then
++    # We chose a different compiler from the bogus one.
++    # However, it has the same basename, so the bogon will be chosen
++    # first if we set CC to just the basename; use the full file name.
++    shift
++    set dummy "$ac_dir/$ac_word" "$@"
++    shift
++    ac_cv_prog_CC="$@"
++  fi
++fi
++fi
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++  echo "$ac_t""$CC" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  if test -z "$CC"; then
++    case "`uname -s`" in
++    *win32* | *WIN32*)
++      # Extract the first word of "cl", so it can be a program name with args.
++set dummy cl; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1091: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CC="cl"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++  echo "$ac_t""$CC" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++ ;;
++    esac
++  fi
++  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
++fi
++
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
++echo "configure:1123: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++cat > conftest.$ac_ext << EOF
++
++#line 1134 "configure"
++#include "confdefs.h"
++
++main(){return(0);}
++EOF
++if { (eval echo configure:1139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  ac_cv_prog_cc_works=yes
++  # If we can't run a trivial program, we are probably using a cross compiler.
++  if (./conftest; exit) 2>/dev/null; then
++    ac_cv_prog_cc_cross=no
++  else
++    ac_cv_prog_cc_cross=yes
++  fi
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_prog_cc_works=no
++fi
++rm -fr conftest*
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
++if test $ac_cv_prog_cc_works = no; then
++  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
++fi
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
++echo "configure:1165: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
++cross_compiling=$ac_cv_prog_cc_cross
++
++echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
++echo "configure:1170: checking whether we are using GNU C" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.c <<EOF
++#ifdef __GNUC__
++  yes;
++#endif
++EOF
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++  ac_cv_prog_gcc=yes
++else
++  ac_cv_prog_gcc=no
++fi
++fi
++
++echo "$ac_t""$ac_cv_prog_gcc" 1>&6
++
++if test $ac_cv_prog_gcc = yes; then
++  GCC=yes
++else
++  GCC=
++fi
++
++ac_test_CFLAGS="${CFLAGS+set}"
++ac_save_CFLAGS="$CFLAGS"
++CFLAGS=
++echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
++echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  echo 'void f(){}' > conftest.c
++if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
++  ac_cv_prog_cc_g=yes
++else
++  ac_cv_prog_cc_g=no
++fi
++rm -f conftest*
++
++fi
++
++echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS="$ac_save_CFLAGS"
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++
++# Find the correct PATH separator.  Usually this is `:', but
++# DJGPP uses `;' like DOS.
++if test "X${PATH_SEPARATOR+set}" != Xset; then
++  UNAME=${UNAME-`uname 2>/dev/null`}
++  case X$UNAME in
++    *-DOS) lt_cv_sys_path_separator=';' ;;
++    *)     lt_cv_sys_path_separator=':' ;;
++  esac
++  PATH_SEPARATOR=$lt_cv_sys_path_separator
++fi
++
++echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
++echo "configure:1241: checking for Cygwin environment" >&5
++if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1246 "configure"
++#include "confdefs.h"
++
++int main() {
++
++#ifndef __CYGWIN__
++#define __CYGWIN__ __CYGWIN32__
++#endif
++return __CYGWIN__;
++; return 0; }
++EOF
++if { (eval echo configure:1257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  ac_cv_cygwin=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_cygwin=no
++fi
++rm -f conftest*
++rm -f conftest*
++fi
++
++echo "$ac_t""$ac_cv_cygwin" 1>&6
++CYGWIN=
++test "$ac_cv_cygwin" = yes && CYGWIN=yes
++echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
++echo "configure:1274: checking for mingw32 environment" >&5
++if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1279 "configure"
++#include "confdefs.h"
++
++int main() {
++return __MINGW32__;
++; return 0; }
++EOF
++if { (eval echo configure:1286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  ac_cv_mingw32=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_mingw32=no
++fi
++rm -f conftest*
++rm -f conftest*
++fi
++
++echo "$ac_t""$ac_cv_mingw32" 1>&6
++MINGW32=
++test "$ac_cv_mingw32" = yes && MINGW32=yes
++echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
++echo "configure:1303: checking how to run the C preprocessor" >&5
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++    # This must be in double quotes, not single quotes, because CPP may get
++  # substituted into the Makefile and "${CC-cc}" will confuse make.
++  CPP="${CC-cc} -E"
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp.
++  cat > conftest.$ac_ext <<EOF
++#line 1318 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -E -traditional-cpp"
++  cat > conftest.$ac_ext <<EOF
++#line 1335 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -nologo -E"
++  cat > conftest.$ac_ext <<EOF
++#line 1352 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP=/lib/cpp
++fi
++rm -f conftest*
++fi
++rm -f conftest*
++fi
++rm -f conftest*
++  ac_cv_prog_CPP="$CPP"
++fi
++  CPP="$ac_cv_prog_CPP"
++else
++  ac_cv_prog_CPP="$CPP"
++fi
++echo "$ac_t""$CPP" 1>&6
++
++# Check whether --enable-shared or --disable-shared was given.
++if test "${enable_shared+set}" = set; then
++  enableval="$enable_shared"
++  p=${PACKAGE-default}
++case $enableval in
++yes) enable_shared=yes ;;
++no) enable_shared=no ;;
++*)
++  enable_shared=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_shared=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac
++else
++  enable_shared=yes
++fi
++
++# Check whether --enable-static or --disable-static was given.
++if test "${enable_static+set}" = set; then
++  enableval="$enable_static"
++  p=${PACKAGE-default}
++case $enableval in
++yes) enable_static=yes ;;
++no) enable_static=no ;;
++*)
++  enable_static=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_static=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac
++else
++  enable_static=yes
++fi
++
++# Check whether --enable-fast-install or --disable-fast-install was given.
++if test "${enable_fast_install+set}" = set; then
++  enableval="$enable_fast_install"
++  p=${PACKAGE-default}
++case $enableval in
++yes) enable_fast_install=yes ;;
++no) enable_fast_install=no ;;
++*)
++  enable_fast_install=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_fast_install=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac
++else
++  enable_fast_install=yes
++fi
++
++echo $ac_n "checking build system type""... $ac_c" 1>&6
++echo "configure:1452: checking build system type" >&5
++
++build_alias=$build
++case "$build_alias" in
++NONE)
++  case $nonopt in
++  NONE) build_alias=$host_alias ;;
++  *) build_alias=$nonopt ;;
++  esac ;;
++esac
++
++build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
++build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++echo "$ac_t""$build" 1>&6
++
++# Check whether --with-gnu-ld or --without-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval="$with_gnu_ld"
++  test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi
++
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
++echo "configure:1481: checking for ld used by GCC" >&5
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | [A-Za-z]:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the path of ld
++      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
++echo "configure:1511: checking for GNU ld" >&5
++else
++  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
++echo "configure:1514: checking for non-GNU ld" >&5
++fi
++if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -z "$LD"; then
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
++	test "$with_gnu_ld" != no && break
++      else
++	test "$with_gnu_ld" != yes && break
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi
++fi
++
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  echo "$ac_t""$LD" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
++echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
++echo "configure:1549: checking if the linker ($LD) is GNU ld" >&5
++if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++  lt_cv_prog_gnu_ld=yes
++else
++  lt_cv_prog_gnu_ld=no
++fi
++fi
++
++echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
++with_gnu_ld=$lt_cv_prog_gnu_ld
++
++
++echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
++echo "configure:1566: checking for $LD option to reload object files" >&5
++if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  lt_cv_ld_reload_flag='-r'
++fi
++
++echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
++reload_flag=$lt_cv_ld_reload_flag
++test -n "$reload_flag" && reload_flag=" $reload_flag"
++
++echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
++echo "configure:1578: checking for BSD-compatible nm" >&5
++if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++    test -z "$ac_dir" && ac_dir=.
++    tmp_nm=$ac_dir/${ac_tool_prefix}nm
++    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
++      # Check to see if the nm accepts a BSD-compat flag.
++      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++      #   nm: unknown option "B" ignored
++      # Tru64's nm complains that /dev/null is an invalid object file
++      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
++	lt_cv_path_NM="$tmp_nm -B"
++	break
++      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	lt_cv_path_NM="$tmp_nm -p"
++	break
++      else
++	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	continue # so that we can try to find one that supports BSD flags
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi
++fi
++
++NM="$lt_cv_path_NM"
++echo "$ac_t""$NM" 1>&6
++
++echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
++echo "configure:1616: checking for a sed that does not truncate output" >&5
++if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  # Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_executable_p="test -f"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
++      fi
++    done
++  done
++done
++
++  # Create a temporary directory, and hook for its removal unless debugging.
++$debug ||
++{
++  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  trap '{ (exit 1); exit 1; }' 1 2 13 15
++}
++
++# Create a (secure) tmp directory for tmp files.
++: ${TMPDIR=/tmp}
++{
++  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
++  test -n "$tmp" && test -d "$tmp"
++}  ||
++{
++  tmp=$TMPDIR/sed$$-$RANDOM
++  (umask 077 && mkdir $tmp)
++} ||
++{
++   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
++   { (exit 1); exit 1; }
++}
++  _max=0
++  _count=0
++  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
++  # along with /bin/sed that truncates output.
++  for _sed in $_sed_list /usr/xpg4/bin/sed; do
++    test ! -f ${_sed} && break
++    cat /dev/null > "$tmp/sed.in"
++    _count=0
++    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
++    # Check for GNU sed and select it if it is found.
++    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
++      lt_cv_path_SED=${_sed}
++      break
++    fi
++    while true; do
++      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
++      mv "$tmp/sed.tmp" "$tmp/sed.in"
++      cp "$tmp/sed.in" "$tmp/sed.nl"
++      echo >>"$tmp/sed.nl"
++      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
++      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
++      # 40000 chars as input seems more than enough
++      test $_count -gt 10 && break
++      _count=`expr $_count + 1`
++      if test $_count -gt $_max; then
++        _max=$_count
++        lt_cv_path_SED=$_sed
++      fi
++    done
++  done
++  rm -rf "$tmp"
++
++fi
++
++if test "X$SED" != "X"; then
++  lt_cv_path_SED=$SED
++else
++  SED=$lt_cv_path_SED
++fi
++echo "$ac_t""$SED" 1>&6
++
++echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
++echo "configure:1700: checking whether ln -s works" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  rm -f conftestdata
++if ln -s X conftestdata 2>/dev/null
++then
++  rm -f conftestdata
++  ac_cv_prog_LN_S="ln -s"
++else
++  ac_cv_prog_LN_S=ln
++fi
++fi
++LN_S="$ac_cv_prog_LN_S"
++if test "$ac_cv_prog_LN_S" = "ln -s"; then
++  echo "$ac_t""yes" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
++echo "configure:1721: checking how to recognise dependent libraries" >&5
++if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given egrep regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi4*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin* | mingw* | pw32*)
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  case "$host_os" in
++  rhapsody* | darwin1.[012])
++    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
++    ;;
++  *) # Darwin 1.3 on
++    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
++    ;;
++  esac
++  ;;
++
++freebsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20*|hpux11*)
++  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libc.sl
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++  irix5* | nonstopux*)
++    # this will be overridden with pass_all, but let us keep it just in case
++    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
++    ;;
++  *)
++    case $LD in
++    *-32|*"-32 ") libmagic=32-bit;;
++    *-n32|*"-n32 ") libmagic=N32;;
++    *-64|*"-64 ") libmagic=64-bit;;
++    *) libmagic=never-match;;
++    esac
++    # this will be overridden with pass_all, but let us keep it just in case
++    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
++    ;;
++  esac
++  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# This must be Linux ELF.
++linux-gnu*)
++  case $host_cpu in
++  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
++    lt_cv_deplibs_check_method=pass_all ;;
++  *)
++    # glibc up to 2.1.1 does not perform some relocations on ARM
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
++  esac
++  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++  ;;
++
++netbsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
++  fi
++  ;;
++
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++openbsd*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++  else
++    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++  fi
++  ;;
++
++osf3* | osf4* | osf5*)
++  # this will be overridden with pass_all, but let us keep it just in case
++  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sco3.2v5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=/lib/libc.so
++  ;;
++
++sysv5uw[78]* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++esac
++
++fi
++
++echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++
++echo $ac_n "checking for object suffix""... $ac_c" 1>&6
++echo "configure:1907: checking for object suffix" >&5
++if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  rm -f conftest*
++echo 'int i = 1;' > conftest.$ac_ext
++if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  for ac_file in conftest.*; do
++    case $ac_file in
++    *.c) ;;
++    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
++    esac
++  done
++else
++  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
++fi
++rm -f conftest*
++fi
++
++echo "$ac_t""$ac_cv_objext" 1>&6
++OBJEXT=$ac_cv_objext
++ac_objext=$ac_cv_objext
++
++
++
++echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
++echo "configure:1933: checking for executable suffix" >&5
++if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
++  ac_cv_exeext=.exe
++else
++  rm -f conftest*
++  echo 'int main () { return 0; }' > conftest.$ac_ext
++  ac_cv_exeext=
++  if { (eval echo configure:1943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++    for file in conftest.*; do
++      case $file in
++      *.$ac_ext | *.c | *.o | *.obj) ;;
++      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
++      esac
++    done
++  else
++    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
++  fi
++  rm -f conftest*
++  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
++fi
++fi
++
++EXEEXT=""
++test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
++echo "$ac_t""${ac_cv_exeext}" 1>&6
++ac_exeext=$EXEEXT
++
++if test $host != $build; then
++  ac_tool_prefix=${host_alias}-
++else
++  ac_tool_prefix=
++fi
++
++
++
++
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
++echo "configure:1974: checking command to parse $NM output" >&5
++if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[BCDT]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[ABCDGISTW]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++irix* | nonstopux*)
++  symcode='[BCDEGRST]'
++  ;;
++osf*)
++  symcode='[BCDEGQRST]'
++  ;;
++solaris* | sysv5*)
++  symcode='[BDT]'
++  ;;
++sysv4)
++  symcode='[DFNSTU]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $host_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
++  symcode='[ABCDGISTW]'
++fi
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if { (eval echo configure:2057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if { (eval echo configure:2060: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
++	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr void *
++#else
++# define lt_ptr char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr address;
++}
++lt_preloaded_symbols[] =
++{
++EOF
++	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  save_LIBS="$LIBS"
++	  save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$no_builtin_flag"
++	  if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$save_LIBS"
++	  CFLAGS="$save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&5
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&5
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
++    fi
++  else
++    echo "$progname: failed program was:" >&5
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++
++fi
++
++global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  global_symbol_to_cdecl=
++  global_symbol_to_c_name_address=
++else
++  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
++  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
++fi
++if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
++then
++  echo "$ac_t""failed" 1>&6
++else
++  echo "$ac_t""ok" 1>&6
++fi
++
++for ac_hdr in dlfcn.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:2160: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2165 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:2170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++
++
++
++
++
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
++echo "configure:2206: checking for ${ac_tool_prefix}file" >&5
++if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case $MAGIC_CMD in
++  /*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++  ?:/*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
++  ;;
++  *)
++  ac_save_MAGIC_CMD="$MAGIC_CMD"
++  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="/usr/bin:$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/${ac_tool_prefix}file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    egrep "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  MAGIC_CMD="$ac_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "$ac_t""$MAGIC_CMD" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    echo $ac_n "checking for file""... $ac_c" 1>&6
++echo "configure:2268: checking for file" >&5
++if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case $MAGIC_CMD in
++  /*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++  ?:/*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
++  ;;
++  *)
++  ac_save_MAGIC_CMD="$MAGIC_CMD"
++  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="/usr/bin:$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    egrep "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  MAGIC_CMD="$ac_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "$ac_t""$MAGIC_CMD" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  else
++    MAGIC_CMD=:
++  fi
++fi
++
++  fi
++  ;;
++esac
++
++# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:2339: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++RANLIB="$ac_cv_prog_RANLIB"
++if test -n "$RANLIB"; then
++  echo "$ac_t""$RANLIB" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++if test -z "$ac_cv_prog_RANLIB"; then
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:2371: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_RANLIB="ranlib"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
++fi
++fi
++RANLIB="$ac_cv_prog_RANLIB"
++if test -n "$RANLIB"; then
++  echo "$ac_t""$RANLIB" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++else
++  RANLIB=":"
++fi
++fi
++
++# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:2406: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++STRIP="$ac_cv_prog_STRIP"
++if test -n "$STRIP"; then
++  echo "$ac_t""$STRIP" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++if test -z "$ac_cv_prog_STRIP"; then
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:2438: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_STRIP="strip"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
++fi
++fi
++STRIP="$ac_cv_prog_STRIP"
++if test -n "$STRIP"; then
++  echo "$ac_t""$STRIP" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++else
++  STRIP=":"
++fi
++fi
++
++
++enable_dlopen=no
++enable_win32_dll=no
++
++# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval="$enable_libtool_lock"
++  :
++fi
++
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '#line 2487 "configure"' > conftest.$ac_ext
++  if { (eval echo configure:2488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
++echo "configure:2509: checking whether the C compiler needs -belf" >&5
++if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++     ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++     cat > conftest.$ac_ext <<EOF
++#line 2522 "configure"
++#include "confdefs.h"
++
++int main() {
++
++; return 0; }
++EOF
++if { (eval echo configure:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  lt_cv_cc_needs_belf=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  lt_cv_cc_needs_belf=no
++fi
++rm -f conftest*
++     ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++fi
++
++echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++
++
++esac
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++need_locks="$enable_libtool_lock"
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
++
++if test x"$host" != x"$build"; then
++  ac_tool_prefix=${host_alias}-
++else
++  ac_tool_prefix=
++fi
++
++# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
++case $host_os in
++linux-gnu*) ;;
++linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
++esac
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++
++# Allow CC to be a program name with arguments.
++set dummy $CC
++compiler="$2"
++
++echo $ac_n "checking for objdir""... $ac_c" 1>&6
++echo "configure:2649: checking for objdir" >&5
++rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  objdir=_libs
++fi
++rmdir .libs 2>/dev/null
++echo "$ac_t""$objdir" 1>&6
++
++
++# Check whether --with-pic or --without-pic was given.
++if test "${with_pic+set}" = set; then
++  withval="$with_pic"
++  pic_mode="$withval"
++else
++  pic_mode=default
++fi
++
++test -z "$pic_mode" && pic_mode=default
++
++# We assume here that the value for lt_cv_prog_cc_pic will not be cached
++# in isolation, and that seeing it set (from the cache) indicates that
++# the associated values are set (in the cache) correctly too.
++echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
++echo "configure:2676: checking for $compiler option to produce PIC" >&5
++if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++   lt_cv_prog_cc_pic=
++  lt_cv_prog_cc_shlib=
++  lt_cv_prog_cc_wl=
++  lt_cv_prog_cc_static=
++  lt_cv_prog_cc_no_builtin=
++  lt_cv_prog_cc_can_build_shared=$can_build_shared
++
++  if test "$GCC" = yes; then
++    lt_cv_prog_cc_wl='-Wl,'
++    lt_cv_prog_cc_static='-static'
++
++    case $host_os in
++    aix*)
++      # Below there is a dirty hack to force normal static linking with -ldl
++      # The problem is because libdl dynamically linked with both libc and
++      # libC (AIX C++ library), which obviously doesn't included in libraries
++      # list by gcc. This cause undefined symbols with -static flags.
++      # This hack allows C programs to be linked with "-static -ldl", but
++      # not sure about C++ programs.
++      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_cv_prog_cc_pic='-fno-common'
++      ;;
++    cygwin* | mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	 lt_cv_prog_cc_pic=-Kconform_pic
++      fi
++      ;;
++    *)
++      lt_cv_prog_cc_pic='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for PIC flags for the system compiler.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      lt_cv_prog_cc_wl='-Wl,'
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_cv_prog_cc_static='-Bstatic'
++      else
++	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
++      lt_cv_prog_cc_pic='+Z'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static='-non_shared'
++      # PIC (with -KPIC) is the default.
++      ;;
++
++    cygwin* | mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++      ;;
++
++    newsos6)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      ;;
++
++    osf3* | osf4* | osf5*)
++      # All OSF/1 code is PIC.
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_cv_prog_cc_pic='-Kpic'
++      lt_cv_prog_cc_static='-dn'
++      lt_cv_prog_cc_shlib='-belf'
++      ;;
++
++    solaris*)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Wl,'
++      ;;
++
++    sunos4*)
++      lt_cv_prog_cc_pic='-PIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Qoption ld '
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Wl,'
++      ;;
++
++    uts4*)
++      lt_cv_prog_cc_pic='-pic'
++      lt_cv_prog_cc_static='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_cv_prog_cc_pic='-Kconform_pic'
++	lt_cv_prog_cc_static='-Bstatic'
++      fi
++      ;;
++
++    *)
++      lt_cv_prog_cc_can_build_shared=no
++      ;;
++    esac
++  fi
++
++fi
++
++if test -z "$lt_cv_prog_cc_pic"; then
++  echo "$ac_t""none" 1>&6
++else
++  echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6
++
++  # Check to make sure the pic_flag actually works.
++  echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
++echo "configure:2824: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
++  if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++      save_CFLAGS="$CFLAGS"
++    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
++    cat > conftest.$ac_ext <<EOF
++#line 2831 "configure"
++#include "confdefs.h"
++
++int main() {
++
++; return 0; }
++EOF
++if { (eval echo configure:2838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++        case $host_os in
++      hpux9* | hpux10* | hpux11*)
++	# On HP-UX, both CC and GCC only warn that PIC is supported... then
++	# they create non-PIC objects.  So, if there were any warnings, we
++	# assume that PIC is not supported.
++	if test -s conftest.err; then
++	  lt_cv_prog_cc_pic_works=no
++	else
++	  lt_cv_prog_cc_pic_works=yes
++	fi
++	;;
++      *)
++	lt_cv_prog_cc_pic_works=yes
++	;;
++      esac
++    
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++        lt_cv_prog_cc_pic_works=no
++    
++fi
++rm -f conftest*
++    CFLAGS="$save_CFLAGS"
++  
++fi
++
++
++  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
++    lt_cv_prog_cc_pic=
++    lt_cv_prog_cc_can_build_shared=no
++  else
++    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
++  fi
++
++  echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6
++fi
++
++# Check for any special shared library compilation flags.
++if test -n "$lt_cv_prog_cc_shlib"; then
++  echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2
++  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
++  else
++   echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
++    lt_cv_prog_cc_can_build_shared=no
++  fi
++fi
++
++echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
++echo "configure:2890: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
++if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++    lt_cv_prog_cc_static_works=no
++  save_LDFLAGS="$LDFLAGS"
++  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
++  cat > conftest.$ac_ext <<EOF
++#line 2898 "configure"
++#include "confdefs.h"
++
++int main() {
++
++; return 0; }
++EOF
++if { (eval echo configure:2905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  lt_cv_prog_cc_static_works=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest*
++  LDFLAGS="$save_LDFLAGS"
++
++fi
++
++
++# Belt *and* braces to stop my trousers falling down:
++test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
++echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6
++
++pic_flag="$lt_cv_prog_cc_pic"
++special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
++wl="$lt_cv_prog_cc_wl"
++link_static_flag="$lt_cv_prog_cc_static"
++no_builtin_flag="$lt_cv_prog_cc_no_builtin"
++can_build_shared="$lt_cv_prog_cc_can_build_shared"
++
++
++# Check to see if options -o and -c are simultaneously supported by compiler
++echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
++echo "configure:2932: checking if $compiler supports -c -o file.$ac_objext" >&5
++if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++$rm -r conftest 2>/dev/null
++mkdir conftest
++cd conftest
++echo "int some_variable = 0;" > conftest.$ac_ext
++mkdir out
++# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
++# that will create temporary files in the current directory regardless of
++# the output directory.  Thus, making CWD read-only will cause this test
++# to fail, enabling locking or at least warning the user not to do parallel
++# builds.
++chmod -w .
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
++compiler_c_o=no
++if { (eval echo configure:2951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
++  # The compiler can only warn and ignore the option if not recognized
++  # So say no if there are warnings
++  if test -s out/conftest.err; then
++    lt_cv_compiler_c_o=no
++  else
++    lt_cv_compiler_c_o=yes
++  fi
++else
++  # Append any errors to the config.log.
++  cat out/conftest.err 1>&5
++  lt_cv_compiler_c_o=no
++fi
++CFLAGS="$save_CFLAGS"
++chmod u+w .
++$rm conftest* out/*
++rmdir out
++cd ..
++rmdir conftest
++$rm -r conftest 2>/dev/null
++
++fi
++
++compiler_c_o=$lt_cv_compiler_c_o
++echo "$ac_t""$compiler_c_o" 1>&6
++
++if test x"$compiler_c_o" = x"yes"; then
++  # Check to see if we can write to a .lo
++  echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
++echo "configure:2980: checking if $compiler supports -c -o file.lo" >&5
++  if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++  lt_cv_compiler_o_lo=no
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -c -o conftest.lo"
++  save_objext="$ac_objext"
++  ac_objext=lo
++  cat > conftest.$ac_ext <<EOF
++#line 2991 "configure"
++#include "confdefs.h"
++
++int main() {
++int some_variable = 0;
++; return 0; }
++EOF
++if { (eval echo configure:2998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++      # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++    if test -s conftest.err; then
++      lt_cv_compiler_o_lo=no
++    else
++      lt_cv_compiler_o_lo=yes
++    fi
++  
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest*
++  ac_objext="$save_objext"
++  CFLAGS="$save_CFLAGS"
++  
++fi
++
++  compiler_o_lo=$lt_cv_compiler_o_lo
++  echo "$ac_t""$compiler_o_lo" 1>&6
++else
++  compiler_o_lo=no
++fi
++
++# Check to see if we can do hard links to lock some files if needed
++hard_links="nottested"
++if test "$compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
++echo "configure:3029: checking if we can lock with hard links" >&5
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$ac_t""$hard_links" 1>&6
++  if test "$hard_links" = no; then
++    echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++if test "$GCC" = yes; then
++  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
++  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
++echo "configure:3048: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++  echo "int some_variable = 0;" > conftest.$ac_ext
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
++  compiler_rtti_exceptions=no
++  cat > conftest.$ac_ext <<EOF
++#line 3054 "configure"
++#include "confdefs.h"
++
++int main() {
++int some_variable = 0;
++; return 0; }
++EOF
++if { (eval echo configure:3061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++      # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++    if test -s conftest.err; then
++      compiler_rtti_exceptions=no
++    else
++      compiler_rtti_exceptions=yes
++    fi
++  
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest*
++  CFLAGS="$save_CFLAGS"
++  echo "$ac_t""$compiler_rtti_exceptions" 1>&6
++
++  if test "$compiler_rtti_exceptions" = "yes"; then
++    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
++  else
++    no_builtin_flag=' -fno-builtin'
++  fi
++fi
++
++# See if the linker supports building shared libraries.
++echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
++echo "configure:3088: checking whether the linker ($LD) supports shared libraries" >&5
++
++allow_undefined_flag=
++no_undefined_flag=
++need_lib_prefix=unknown
++need_version=unknown
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++archive_cmds=
++archive_expsym_cmds=
++old_archive_from_new_cmds=
++old_archive_from_expsyms_cmds=
++export_dynamic_flag_spec=
++whole_archive_flag_spec=
++thread_safe_flag_spec=
++hardcode_into_libs=no
++hardcode_libdir_flag_spec=
++hardcode_libdir_separator=
++hardcode_direct=no
++hardcode_minus_L=no
++hardcode_shlibpath_var=unsupported
++runpath_var=
++link_all_deplibs=unknown
++always_export_symbols=no
++export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
++# include_expsyms should be a list of space-separated symbols to be *always*
++# included in the symbol list
++include_expsyms=
++# exclude_expsyms can be an egrep regular expression of symbols to exclude
++# it will be wrapped by ` (' and `)$', so one must not match beginning or
++# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++# as well as any symbol that contains `d'.
++exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++# platforms (ab)use it in PIC code, but their linkers get confused if
++# the symbol is explicitly referenced.  Since portable code cannot
++# rely on this symbol name, it's probably fine to never include it in
++# preloaded symbol tables.
++extract_expsyms_cmds=
++
++case $host_os in
++cygwin* | mingw* | pw32*)
++  # FIXME: the MSVC++ port hasn't been tested in a loooong time
++  # When not using gcc, we currently assume that we are using
++  # Microsoft Visual C++.
++  if test "$GCC" != yes; then
++    with_gnu_ld=no
++  fi
++  ;;
++openbsd*)
++  with_gnu_ld=no
++  ;;
++esac
++
++ld_shlibs=yes
++if test "$with_gnu_ld" = yes; then
++  # If archive_cmds runs LD, not CC, wlarc should be empty
++  wlarc='${wl}'
++
++  # See if GNU ld supports shared libraries.
++  case $host_os in
++  aix3* | aix4* | aix5*)
++    # On AIX, the GNU linker is very broken
++    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
++    ld_shlibs=no
++    cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++
++    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++    # that the semantics of dynamic libraries on AmigaOS, at least up
++    # to version 4, is to share data among multiple programs linked
++    # with the same dynamic library.  Since this doesn't match the
++    # behavior of shared libraries on other platforms, we can use
++    # them.
++    ld_shlibs=no
++    ;;
++
++  beos*)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      allow_undefined_flag=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec='-L$libdir'
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++
++    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
++      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
++      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
++      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
++      else $CC -o impgen impgen.c ; fi)~
++      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
++
++    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
++
++    # cygwin and mingw dlls have different entry points and sets of symbols
++    # to exclude.
++    # FIXME: what about values for MSVC?
++    dll_entry=__cygwin_dll_entry@12
++    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
++    case $host_os in
++    mingw*)
++      # mingw values
++      dll_entry=_DllMainCRTStartup@12
++      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
++      ;;
++    esac
++
++    # mingw and cygwin differ, and it's simplest to just exclude the union
++    # of the two symbol sets.
++    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
++
++    # recent cygwin and mingw systems supply a stub DllMain which the user
++    # can override, but on older systems we have to supply one (in ltdll.c)
++    if test "x$lt_cv_need_dllmain" = "xyes"; then
++      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
++      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
++	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
++    else
++      ltdll_obj=
++      ltdll_cmds=
++    fi
++
++    # Extract the symbol export list from an `--export-all' def file,
++    # then regenerate the def file from the symbol export list, so that
++    # the compiled dll only exports the symbol export list.
++    # Be careful not to strip the DATA tag left be newer dlltools.
++    export_symbols_cmds="$ltdll_cmds"'
++      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
++      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
++
++    # If the export-symbols file already is a .def file (1st line
++    # is EXPORTS), use it as is.
++    # If DATA tags from a recent dlltool are present, honour them!
++    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname-def;
++      else
++	echo EXPORTS > $output_objdir/$soname-def;
++	_lt_hint=1;
++	cat $export_symbols | while read symbol; do
++	 set dummy \$symbol;
++	 case \$# in
++	   2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
++	   4) echo "   \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
++	   *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
++	 esac;
++	 _lt_hint=`expr 1 + \$_lt_hint`;
++	done;
++      fi~
++      '"$ltdll_cmds"'
++      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
++      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
++      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++      wlarc=
++    else
++      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    fi
++    ;;
++
++  solaris* | sysv5*)
++    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
++      ld_shlibs=no
++      cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  sunos4*)
++    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    wlarc=
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++  esac
++
++  if test "$ld_shlibs" = yes; then
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    case $host_os in
++    cygwin* | mingw* | pw32*)
++      # dlltool doesn't understand --whole-archive et. al.
++      whole_archive_flag_spec=
++      ;;
++    *)
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++	whole_archive_flag_spec=
++      fi
++      ;;
++    esac
++  fi
++else
++  # PORTME fill in a description of your system's linker (not GNU ld)
++  case $host_os in
++  aix3*)
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++    # Note: this linker hardcodes the directories in LIBPATH if there
++    # are no directories specified by -L.
++    hardcode_minus_L=yes
++    if test "$GCC" = yes && test -z "$link_static_flag"; then
++      # Neither direct hardcoding nor static linking is supported with a
++      # broken collect2.
++      hardcode_direct=unsupported
++    fi
++    ;;
++
++  aix4* | aix5*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	  ;;
++	  esac
++	done
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    hardcode_direct=yes
++    archive_cmds=''
++    hardcode_libdir_separator=':'
++    if test "$GCC" = yes; then
++      case $host_os in aix4.[012]|aix4.[012].*)
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	  strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  hardcode_direct=yes
++	else
++	  # We have old collect2
++	  hardcode_direct=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  hardcode_minus_L=yes
++	  hardcode_libdir_flag_spec='-L$libdir'
++	  hardcode_libdir_separator=
++	fi
++      esac
++
++      shared_flag='-shared'
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	shared_flag='${wl}-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
++
++    # It seems that -bexpall can do strange things, so it is better to
++    # generate a list of symbols to export.
++    always_export_symbols=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      allow_undefined_flag='-berok'
++      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
++      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++    else
++      if test "$host_cpu" = ia64; then
++	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++	allow_undefined_flag="-z nodefs"
++	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag='${wl}-berok'
++	# This is a bit strange, but is similar to how AIX traditionally builds
++	# it's shared libraries.
++	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    # see comment about different semantics on the GNU ld section
++    ld_shlibs=no
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec=' '
++    allow_undefined_flag=unsupported
++    # Tell ltmain to make .lib files, not .a files.
++    libext=lib
++    # FIXME: Setting linknames here is a bad hack.
++    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++    # The linker will automatically build a .lib file if we build a DLL.
++    old_archive_from_new_cmds='true'
++    # FIXME: Should let the user specify the lib program.
++    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++    fix_srcfile_path='`cygpath -w "$srcfile"`'
++    ;;
++
++  darwin* | rhapsody*)
++    case "$host_os" in
++    rhapsody* | darwin1.[012])
++      allow_undefined_flag='-undefined suppress'
++      ;;
++    *) # Darwin 1.3 on
++      allow_undefined_flag='-flat_namespace -undefined suppress'
++      ;;
++    esac
++    # FIXME: Relying on posixy $() will cause problems for
++    #        cross-compilation, but unfortunately the echo tests do not
++    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
++    #	     `"' quotes if we put them in here... so don't!
++    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
++    # We need to add '_' to the symbols in $export_symbols first
++    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    whole_archive_flag_spec='-all_load $convenience'
++    ;;
++
++  freebsd1*)
++    ld_shlibs=no
++    ;;
++
++  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++  # support.  Future versions do this automatically, but an explicit c++rt0.o
++  # does not break anything, and helps significantly (at the cost of a little
++  # extra space).
++  freebsd2.2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++  freebsd2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++  freebsd*)
++    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  hpux9* | hpux10* | hpux11*)
++    case $host_os in
++    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
++    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
++    esac
++    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_direct=yes
++    hardcode_minus_L=yes # Not in the search PATH, but as the default
++			 # location of the library.
++    export_dynamic_flag_spec='${wl}-E'
++    ;;
++
++  irix5* | irix6* | nonstopux*)
++    if test "$GCC" = yes; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    else
++      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='-rpath $libdir'
++    fi
++    hardcode_libdir_separator=:
++    link_all_deplibs=yes
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++    else
++      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++    fi
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  newsos6)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_shlibpath_var=no
++    ;;
++
++  openbsd*)
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec='${wl}-E'
++    else
++      case "$host_os" in
++      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_libdir_flag_spec='-R$libdir'
++        ;;
++      *)
++        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++        ;;
++      esac
++    fi
++    ;;
++
++  os2*)
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    allow_undefined_flag=unsupported
++    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++    ;;
++
++  osf3*)
++    if test "$GCC" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++
++  osf4* | osf5*)	# as osf3* with the addition of -msym flag
++    if test "$GCC" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++      #Both c and cxx compiler support -rpath directly
++      hardcode_libdir_flag_spec='-rpath $libdir'
++    fi
++    hardcode_libdir_separator=:
++    ;;
++
++  sco3.2v5*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_shlibpath_var=no
++    runpath_var=LD_RUN_PATH
++    hardcode_runpath_var=yes
++    export_dynamic_flag_spec='${wl}-Bexport'
++    ;;
++
++  solaris*)
++    # gcc --version < 3.0 without binutils cannot create self contained
++    # shared libraries reliably, requiring libgcc.a to resolve some of
++    # the object symbols generated in some cases.  Libraries that use
++    # assert need libgcc.a to resolve __eprintf, for example.  Linking
++    # a copy of libgcc.a into every shared library to guarantee resolving
++    # such symbols causes other problems:  According to Tim Van Holder
++    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
++    # (to the application) exception stack for one thing.
++    no_undefined_flag=' -z defs'
++    if test "$GCC" = yes; then
++      case `$CC --version 2>/dev/null` in
++      [12].*)
++	cat <<EOF 1>&2
++
++*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
++*** create self contained shared libraries on Solaris systems, without
++*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
++*** -no-undefined support, which will at least allow you to build shared
++*** libraries.  However, you may find that when you link such libraries
++*** into an application without using GCC, you have to manually add
++*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
++*** upgrade to a newer version of GCC.  Another option is to rebuild your
++*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
++
++EOF
++        no_undefined_flag=
++	;;
++      esac
++    fi
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_shlibpath_var=no
++    case $host_os in
++    solaris2.[0-5] | solaris2.[0-5].*) ;;
++    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++    esac
++    link_all_deplibs=yes
++    ;;
++
++  sunos4*)
++    if test "x$host_vendor" = xsequent; then
++      # Use $CC to link under sequent, because it throws in some extra .o
++      # files that make .init and .fini sections work.
++      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++    else
++      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++    fi
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4)
++    case $host_vendor in
++      sni)
++        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++        hardcode_direct=yes # is this really true???
++        ;;
++      siemens)
++        ## LD is ld it makes a PLAMLIB
++        ## CC just makes a GrossModule.
++        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++        reload_cmds='$CC -r -o $output$reload_objs'
++        hardcode_direct=no
++        ;;
++      motorola)
++        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++        ;;
++    esac
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4.3*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_shlibpath_var=no
++    export_dynamic_flag_spec='-Bexport'
++    ;;
++
++  sysv5*)
++    no_undefined_flag=' -z text'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++    hardcode_libdir_flag_spec=
++    hardcode_shlibpath_var=no
++    runpath_var='LD_RUN_PATH'
++    ;;
++
++  uts4*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  dgux*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4*MP*)
++    if test -d /usr/nec; then
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ld_shlibs=yes
++    fi
++    ;;
++
++  sysv4.2uw2*)
++    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_minus_L=no
++    hardcode_shlibpath_var=no
++    hardcode_runpath_var=yes
++    runpath_var=LD_RUN_PATH
++    ;;
++
++  sysv5uw7* | unixware7*)
++    no_undefined_flag='${wl}-z ${wl}text'
++    if test "$GCC" = yes; then
++      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++    else
++      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++    fi
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    ld_shlibs=no
++    ;;
++  esac
++fi
++echo "$ac_t""$ld_shlibs" 1>&6
++test "$ld_shlibs" = no && can_build_shared=no
++
++# Check hardcoding attributes.
++echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
++echo "configure:3787: checking how to hardcode library paths into programs" >&5
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
++   test -n "$runpath_var"; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$hardcode_shlibpath_var" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++echo "$ac_t""$hardcode_action" 1>&6
++
++striplib=
++old_striplib=
++echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
++echo "configure:3815: checking whether stripping libraries is possible" >&5
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$ac_t""yes" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++
++# PORTME Fill in your ld.so characteristics
++echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
++echo "configure:3829: checking dynamic linker characteristics" >&5
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}.so$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	     echo ' yes '
++	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	  :
++	else
++	  can_build_shared=no
++	fi
++	;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can
++    # not hardcode correct soname into executable. Probably we can
++    # add versioning support to collect2, so additional links can
++    # be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}.so$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  hardcode_into_libs=yes
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}.so'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  export_dynamic_flag_spec=-rdynamic
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  need_version=no
++  need_lib_prefix=no
++  case $GCC,$host_os in
++  yes,cygwin*)
++    library_names_spec='$libname.dll.a'
++    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
++    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog .libs/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    ;;
++  yes,mingw*)
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
++    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
++    ;;
++  yes,pw32*)
++    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
++    ;;
++  *)
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  # FIXME: Relying on posixy $() will cause problems for
++  #        cross-compilation, but unfortunately the echo tests do not
++  #        yet detect zsh echo's removal of \ escapes.
++  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
++  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++freebsd*-gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU/FreeBSD ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  *)
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  dynamic_linker="$host_os dld.sl"
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  shlibpath_var=SHLIB_PATH
++  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
++  soname_spec='${libname}${release}.sl$major'
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)          version_type=irix ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux-gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++    soname_spec='${libname}${release}.so$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case "$host_os" in
++    openbsd2.[89] | openbsd2.[89].*)
++      shlibpath_overrides_runpath=no
++      ;;
++    *)
++      shlibpath_overrides_runpath=yes
++      ;;
++    esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++os2*)
++  libname_spec='$name'
++  need_lib_prefix=no
++  library_names_spec='$libname.dll $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_version=no
++  need_lib_prefix=no
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  hardcode_into_libs=yes
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
++    soname_spec='$libname.so.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$ac_t""$dynamic_linker" 1>&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++# Report the final consequences.
++echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
++echo "configure:4253: checking if libtool supports shared libraries" >&5
++echo "$ac_t""$can_build_shared" 1>&6
++
++echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
++echo "configure:4257: checking whether to build shared libraries" >&5
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix4*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++  ;;
++esac
++echo "$ac_t""$enable_shared" 1>&6
++
++echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
++echo "configure:4280: checking whether to build static libraries" >&5
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++echo "$ac_t""$enable_static" 1>&6
++
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  *)
++    echo $ac_n "checking for shl_load""... $ac_c" 1>&6
++echo "configure:4321: checking for shl_load" >&5
++if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 4326 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char shl_load();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++shl_load();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:4349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_shl_load=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_shl_load=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="shl_load"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
++echo "configure:4367: checking for shl_load in -ldld" >&5
++ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldld  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 4375 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char shl_load();
++
++int main() {
++shl_load()
++; return 0; }
++EOF
++if { (eval echo configure:4386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dlopen""... $ac_c" 1>&6
++echo "configure:4405: checking for dlopen" >&5
++if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 4410 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char dlopen();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++dlopen();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_dlopen=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_dlopen=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dlopen"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
++echo "configure:4451: checking for dlopen in -ldl" >&5
++ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldl  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 4459 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char dlopen();
++
++int main() {
++dlopen()
++; return 0; }
++EOF
++if { (eval echo configure:4470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
++echo "configure:4489: checking for dlopen in -lsvld" >&5
++ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lsvld  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 4497 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char dlopen();
++
++int main() {
++dlopen()
++; return 0; }
++EOF
++if { (eval echo configure:4508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
++echo "configure:4527: checking for dld_link in -ldld" >&5
++ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldld  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 4535 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char dld_link();
++
++int main() {
++dld_link()
++; return 0; }
++EOF
++if { (eval echo configure:4546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++	      
++fi
++
++	    
++fi
++
++	  
++fi
++
++	
++fi
++
++      
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++        test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
++echo "configure:4602: checking whether a program can dlopen itself" >&5
++if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 4612 "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++    
++fi
++
++echo "$ac_t""$lt_cv_dlopen_self" 1>&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
++echo "configure:4696: checking whether a statically linked program can dlopen itself" >&5
++if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 4706 "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++      
++fi
++
++echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++if test "$enable_shared" = yes && test "$GCC" = yes; then
++  case $archive_cmds in
++  *'~'*)
++    # FIXME: we may have to deal with multi-command sequences.
++    ;;
++  '$CC '*)
++    # Test whether the compiler implicitly links with -lc since on some
++    # systems, -lgcc has to come before -lc. If gcc already passes -lc
++    # to ld, don't add -lc before -lgcc.
++    echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
++echo "configure:4816: checking whether -lc should be explicitly linked in" >&5
++    if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  $rm conftest*
++    echo 'static int dummy;' > conftest.$ac_ext
++
++    if { (eval echo configure:4823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++      soname=conftest
++      lib=conftest
++      libobjs=conftest.$ac_objext
++      deplibs=
++      wl=$lt_cv_prog_cc_wl
++      compiler_flags=-v
++      linker_flags=-v
++      verstring=
++      output_objdir=.
++      libname=conftest
++      save_allow_undefined_flag=$allow_undefined_flag
++      allow_undefined_flag=
++      if { (eval echo configure:4836: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
++      then
++	lt_cv_archive_cmds_need_lc=no
++      else
++	lt_cv_archive_cmds_need_lc=yes
++      fi
++      allow_undefined_flag=$save_allow_undefined_flag
++    else
++      cat conftest.err 1>&5
++    fi
++fi
++
++    echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
++    ;;
++  esac
++fi
++need_lc=${lt_cv_archive_cmds_need_lc-yes}
++
++# The second clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  :
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  test -f Makefile && make "$ltmain"
++fi
++
++if test -f "$ltmain"; then
++  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
++  $rm -f "${ofile}T"
++
++  echo creating $ofile
++
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS SED \
++    AR AR_FLAGS CC LD LN_S NM SHELL \
++    reload_flag reload_cmds wl \
++    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
++    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
++    library_names_spec soname_spec \
++    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
++    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
++    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
++    old_striplib striplib file_magic_cmd export_symbols_cmds \
++    deplibs_check_method allow_undefined_flag no_undefined_flag \
++    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
++    global_symbol_to_c_name_address \
++    hardcode_libdir_flag_spec hardcode_libdir_separator  \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++
++    case $var in
++    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
++    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  cat <<__EOF__ > "${ofile}T"
++#! $SHELL
++
++# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996-2000 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# 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.
++
++# A sed that does not truncate output.
++SED=$lt_SED
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="${SED} -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++# ### BEGIN LIBTOOL CONFIG
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$need_lc
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# The default C compiler.
++CC=$lt_CC
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC
++
++# The linker used to build libraries.
++LD=$lt_LD
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_wl
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_pic_flag
++pic_mode=$pic_mode
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_compiler_c_o
++
++# Can we write directly to a .lo ?
++compiler_o_lo=$lt_compiler_o_lo
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_link_static_flag
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_no_builtin_flag
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
++
++# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
++
++# ### END LIBTOOL CONFIG
++
++__EOF__
++
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "${ofile}T"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  case $host_os in
++  cygwin* | mingw* | pw32* | os2*)
++    cat <<'EOF' >> "${ofile}T"
++      # This is a source program that is used to create dlls on Windows
++      # Don't remove nor modify the starting and closing comments
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
++#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++	# This is a source program that is used to create import libraries
++	# on Windows for dlls which lack them. Don't remove nor modify the
++	# starting and closing comments
++# /* impgen.c starts here */
++# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
++#
++#  This file is part of GNU libtool.
++#
++#  This program is free software; you can redistribute it and/or modify
++#  it under the terms of the GNU General Public License as published by
++#  the Free Software Foundation; either version 2 of the License, or
++#  (at your option) any later version.
++#
++#  This program is distributed in the hope that it will be useful,
++#  but WITHOUT ANY WARRANTY; without even the implied warranty of
++#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#  GNU General Public License for more details.
++#
++#  You should have received a copy of the GNU General Public License
++#  along with this program; if not, write to the Free Software
++#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#  */
++#
++# #include <stdio.h>		/* for printf() */
++# #include <unistd.h>		/* for open(), lseek(), read() */
++# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
++# #include <string.h>		/* for strdup() */
++#
++# /* O_BINARY isn't required (or even defined sometimes) under Unix */
++# #ifndef O_BINARY
++# #define O_BINARY 0
++# #endif
++#
++# static unsigned int
++# pe_get16 (fd, offset)
++#      int fd;
++#      int offset;
++# {
++#   unsigned char b[2];
++#   lseek (fd, offset, SEEK_SET);
++#   read (fd, b, 2);
++#   return b[0] + (b[1]<<8);
++# }
++#
++# static unsigned int
++# pe_get32 (fd, offset)
++#     int fd;
++#     int offset;
++# {
++#   unsigned char b[4];
++#   lseek (fd, offset, SEEK_SET);
++#   read (fd, b, 4);
++#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++# }
++#
++# static unsigned int
++# pe_as32 (ptr)
++#      void *ptr;
++# {
++#   unsigned char *b = ptr;
++#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++# }
++#
++# int
++# main (argc, argv)
++#     int argc;
++#     char *argv[];
++# {
++#     int dll;
++#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
++#     unsigned long export_rva, export_size, nsections, secptr, expptr;
++#     unsigned long name_rvas, nexp;
++#     unsigned char *expdata, *erva;
++#     char *filename, *dll_name;
++#
++#     filename = argv[1];
++#
++#     dll = open(filename, O_RDONLY|O_BINARY);
++#     if (dll < 1)
++# 	return 1;
++#
++#     dll_name = filename;
++#
++#     for (i=0; filename[i]; i++)
++# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
++# 	    dll_name = filename + i +1;
++#
++#     pe_header_offset = pe_get32 (dll, 0x3c);
++#     opthdr_ofs = pe_header_offset + 4 + 20;
++#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
++#
++#     if (num_entries < 1) /* no exports */
++# 	return 1;
++#
++#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
++#     export_size = pe_get32 (dll, opthdr_ofs + 100);
++#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
++#     secptr = (pe_header_offset + 4 + 20 +
++# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
++#
++#     expptr = 0;
++#     for (i = 0; i < nsections; i++)
++#     {
++# 	char sname[8];
++# 	unsigned long secptr1 = secptr + 40 * i;
++# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
++# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
++# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
++# 	lseek(dll, secptr1, SEEK_SET);
++# 	read(dll, sname, 8);
++# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
++# 	{
++# 	    expptr = fptr + (export_rva - vaddr);
++# 	    if (export_rva + export_size > vaddr + vsize)
++# 		export_size = vsize - (export_rva - vaddr);
++# 	    break;
++# 	}
++#     }
++#
++#     expdata = (unsigned char*)malloc(export_size);
++#     lseek (dll, expptr, SEEK_SET);
++#     read (dll, expdata, export_size);
++#     erva = expdata - export_rva;
++#
++#     nexp = pe_as32 (expdata+24);
++#     name_rvas = pe_as32 (expdata+32);
++#
++#     printf ("EXPORTS\n");
++#     for (i = 0; i<nexp; i++)
++#     {
++# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
++# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
++#     }
++#
++#     return 0;
++# }
++# /* impgen.c ends here */
++
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
++
++  mv -f "${ofile}T" "$ofile" || \
++    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
++  chmod +x "$ofile"
++fi
++
++
++
++
++
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++
++# Prevent multiple expansion
++
++
++
++
++# Extract the first word of "lp", so it can be a program name with args.
++set dummy lp; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:5425: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_LPRCOMMAND'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$LPRCOMMAND"; then
++  ac_cv_prog_LPRCOMMAND="$LPRCOMMAND" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_LPRCOMMAND="lp"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++LPRCOMMAND="$ac_cv_prog_LPRCOMMAND"
++if test -n "$LPRCOMMAND"; then
++  echo "$ac_t""$LPRCOMMAND" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++# Extract the first word of "lpr", so it can be a program name with args.
++set dummy lpr; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:5454: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_LPRCOMMAND'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$LPRCOMMAND"; then
++  ac_cv_prog_LPRCOMMAND="$LPRCOMMAND" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_LPRCOMMAND="lpr"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++LPRCOMMAND="$ac_cv_prog_LPRCOMMAND"
++if test -n "$LPRCOMMAND"; then
++  echo "$ac_t""$LPRCOMMAND" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++# Extract the first word of "cat", so it can be a program name with args.
++set dummy cat; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:5484: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CATCOMMAND'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CATCOMMAND"; then
++  ac_cv_prog_CATCOMMAND="$CATCOMMAND" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CATCOMMAND="cat"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++CATCOMMAND="$ac_cv_prog_CATCOMMAND"
++if test -n "$CATCOMMAND"; then
++  echo "$ac_t""$CATCOMMAND" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++# Extract the first word of "type", so it can be a program name with args.
++set dummy type; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:5513: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CATCOMMAND'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CATCOMMAND"; then
++  ac_cv_prog_CATCOMMAND="$CATCOMMAND" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CATCOMMAND="type"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++CATCOMMAND="$ac_cv_prog_CATCOMMAND"
++if test -n "$CATCOMMAND"; then
++  echo "$ac_t""$CATCOMMAND" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++
++
++for ac_hdr in stdlib.h unistd.h errno.h assert.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:5546: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5551 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_hdr in sys/time.h time.h signal.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:5586: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5591 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_hdr in string.h strings.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:5626: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5631 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ break
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++
++# @start variadic
++case $am_cv_prog_cc_stdc,$ac_cv_header_varargs_h in
++no,)
++	# Non-ANSI compiler, so we must use varargs.h.
++	for ac_hdr in varargs.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:5671: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5676 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++	;;
++*,yes)
++	# Parent package is using varargs.h which is incompatible with 
++	# stdarg.h, so we do the same (recheck to generate checking...
++	# message).
++	for ac_hdr in varargs.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:5716: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5721 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++	;;
++*)
++	# If stdarg.h is present define HAVE_STDARG_H.
++	for ac_hdr in stdarg.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:5759: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5764 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++	;;
++esac
++
++case x$ac_cv_header_stdarg_h$ac_cv_header_varargs_h in
++x*yes*) ;;
++*) { echo "configure: error: Could not find stdarg.h or varargs.h" 1>&2; exit 1; } ;;
++esac
++# @end variadic
++
++echo $ac_n "checking for working const""... $ac_c" 1>&6
++echo "configure:5805: checking for working const" >&5
++if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5810 "configure"
++#include "confdefs.h"
++
++int main() {
++
++/* Ultrix mips cc rejects this.  */
++typedef int charset[2]; const charset x;
++/* SunOS 4.1.1 cc rejects this.  */
++char const *const *ccp;
++char **p;
++/* NEC SVR4.0.2 mips cc rejects this.  */
++struct point {int x, y;};
++static struct point const zero = {0,0};
++/* AIX XL C 1.02.0.0 rejects this.
++   It does not let you subtract one const X* pointer from another in an arm
++   of an if-expression whose if-part is not a constant expression */
++const char *g = "string";
++ccp = &g + (g ? g-g : 0);
++/* HPUX 7.0 cc rejects these. */
++++ccp;
++p = (char**) ccp;
++ccp = (char const *const *) p;
++{ /* SCO 3.2v4 cc rejects this.  */
++  char *t;
++  char const *s = 0 ? (char *) 0 : (char const *) 0;
++
++  *t++ = 0;
++}
++{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
++  int x[] = {25, 17};
++  const int *foo = &x[0];
++  ++foo;
++}
++{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++  typedef const int *iptr;
++  iptr p = 0;
++  ++p;
++}
++{ /* AIX XL C 1.02.0.0 rejects this saying
++     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++  struct s { int j; const int *ap[3]; };
++  struct s *b; b->j = 5;
++}
++{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++  const int foo = 10;
++}
++
++; return 0; }
++EOF
++if { (eval echo configure:5859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  ac_cv_c_const=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_c_const=no
++fi
++rm -f conftest*
++fi
++
++echo "$ac_t""$ac_cv_c_const" 1>&6
++if test $ac_cv_c_const = no; then
++  cat >> confdefs.h <<\EOF
++#define const 
++EOF
++
++fi
++
++echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
++echo "configure:5880: checking for ANSI C header files" >&5
++if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5885 "configure"
++#include "confdefs.h"
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:5893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  ac_cv_header_stdc=yes
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++cat > conftest.$ac_ext <<EOF
++#line 5910 "configure"
++#include "confdefs.h"
++#include <string.h>
++EOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  egrep "memchr" >/dev/null 2>&1; then
++  :
++else
++  rm -rf conftest*
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++cat > conftest.$ac_ext <<EOF
++#line 5928 "configure"
++#include "confdefs.h"
++#include <stdlib.h>
++EOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  egrep "free" >/dev/null 2>&1; then
++  :
++else
++  rm -rf conftest*
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++if test "$cross_compiling" = yes; then
++  :
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5949 "configure"
++#include "confdefs.h"
++#include <ctype.h>
++#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int main () { int i; for (i = 0; i < 256; i++)
++if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
++exit (0); }
++
++EOF
++if { (eval echo configure:5960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
++  :
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  ac_cv_header_stdc=no
++fi
++rm -fr conftest*
++fi
++
++fi
++fi
++
++echo "$ac_t""$ac_cv_header_stdc" 1>&6
++if test $ac_cv_header_stdc = yes; then
++  cat >> confdefs.h <<\EOF
++#define STDC_HEADERS 1
++EOF
++
++fi
++
++echo $ac_n "checking for size_t""... $ac_c" 1>&6
++echo "configure:5984: checking for size_t" >&5
++if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 5989 "configure"
++#include "confdefs.h"
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++EOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
++  rm -rf conftest*
++  ac_cv_type_size_t=yes
++else
++  rm -rf conftest*
++  ac_cv_type_size_t=no
++fi
++rm -f conftest*
++
++fi
++echo "$ac_t""$ac_cv_type_size_t" 1>&6
++if test $ac_cv_type_size_t = no; then
++  cat >> confdefs.h <<\EOF
++#define size_t unsigned
++EOF
++
++fi
++
++echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
++echo "configure:6017: checking whether time.h and sys/time.h may both be included" >&5
++if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6022 "configure"
++#include "confdefs.h"
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
++int main() {
++struct tm *tp;
++; return 0; }
++EOF
++if { (eval echo configure:6031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  ac_cv_header_time=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_header_time=no
++fi
++rm -f conftest*
++fi
++
++echo "$ac_t""$ac_cv_header_time" 1>&6
++if test $ac_cv_header_time = yes; then
++  cat >> confdefs.h <<\EOF
++#define TIME_WITH_SYS_TIME 1
++EOF
++
++fi
++
++
++for ac_func in killpg kill
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6055: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6060 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in bcopy memcpy
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6110: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6115 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in bzero memset
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6165: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6170 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ break
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in bcmp memcmp
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6220: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6225 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in index strchr
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6275: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6280 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in rindex strrchr
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6330: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6335 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in initstate srand
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6385: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6390 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in random rand
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6440: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6445 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++
++for ac_func in calloc
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6496: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6501 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++for ac_func in basename strerror vfprintf
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6551: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6556 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
++fi
++done
++
++
++for ac_func in putenv
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:6608: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6613 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:6636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
++fi
++done
++
++
++
++
++# @end 5
++# @start 1
++
++
++Xsed="sed -e s/^X//"
++LTLIBOBJS=`echo X"$LIBOBJS"|$Xsed -e "s,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,"`
++
++
++
++
++
++
++trap '' 1 2 15
++cat > confcache <<\EOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs.  It is not useful on other systems.
++# If it contains results you don't want to keep, you may remove or edit it.
++#
++# By default, configure uses ./config.cache as the cache file,
++# creating it if it does not exist already.  You can give configure
++# the --cache-file=FILE option to use a different cache file; that is
++# what configure does when it calls configure scripts in
++# subdirectories, so they share the cache.
++# Giving --cache-file=/dev/null disables caching, for debugging configure.
++# config.status only pays attention to the cache file if you give it the
++# --recheck option to rerun configure.
++#
++EOF
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, don't put newlines in cache variables' values.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++(set) 2>&1 |
++  case `(ac_space=' '; set | grep ac_space) 2>&1` in
++  *ac_space=\ *)
++    # `set' does not quote correctly, so add quotes (double-quote substitution
++    # turns \\\\ into \\, and sed turns \\ into \).
++    sed -n \
++      -e "s/'/'\\\\''/g" \
++      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
++    ;;
++  *)
++    # `set' quotes correctly as required by POSIX, so do not add quotes.
++    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
++    ;;
++  esac >> confcache
++if cmp -s $cache_file confcache; then
++  :
++else
++  if test -w $cache_file; then
++    echo "updating cache $cache_file"
++    cat confcache > $cache_file
++  else
++    echo "not updating unwritable cache $cache_file"
++  fi
++fi
++rm -f confcache
++
++trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
++
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++# Let make expand exec_prefix.
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++
++# Any assignment to VPATH causes Sun make to only execute
++# the first set of double-colon rules, so remove it if not needed.
++# If there is a colon in the path, we need to keep it.
++if test "x$srcdir" = x.; then
++  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
++fi
++
++trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
++
++DEFS=-DHAVE_CONFIG_H
++
++# Without the "./", some shells look in PATH for config.status.
++: ${CONFIG_STATUS=./config.status}
++
++echo creating $CONFIG_STATUS
++rm -f $CONFIG_STATUS
++cat > $CONFIG_STATUS <<EOF
++#! /bin/sh
++# Generated automatically by configure.
++# Run this file to recreate the current configuration.
++# This directory was configured as follows,
++# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++#
++# $0 $ac_configure_args
++#
++# Compiler output produced by configure, useful for debugging
++# configure, is in ./config.log if it exists.
++
++ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
++for ac_option
++do
++  case "\$ac_option" in
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
++    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
++  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
++    echo "$CONFIG_STATUS generated by autoconf version 2.13"
++    exit 0 ;;
++  -help | --help | --hel | --he | --h)
++    echo "\$ac_cs_usage"; exit 0 ;;
++  *) echo "\$ac_cs_usage"; exit 1 ;;
++  esac
++done
++
++ac_given_srcdir=$srcdir
++ac_given_INSTALL="$INSTALL"
++
++trap 'rm -fr `echo "Makefile replace/Makefile metamail/Makefile src/Makefile \
++	   src/metamail/Makefile src/richmail/Makefile bin/Makefile metamail/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++EOF
++cat >> $CONFIG_STATUS <<EOF
++
++# Protect against being on the right side of a sed subst in config.status.
++sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
++ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
++$ac_vpsub
++$extrasub
++s%@SHELL@%$SHELL%g
++s%@CFLAGS@%$CFLAGS%g
++s%@CPPFLAGS@%$CPPFLAGS%g
++s%@CXXFLAGS@%$CXXFLAGS%g
++s%@FFLAGS@%$FFLAGS%g
++s%@DEFS@%$DEFS%g
++s%@LDFLAGS@%$LDFLAGS%g
++s%@LIBS@%$LIBS%g
++s%@exec_prefix@%$exec_prefix%g
++s%@prefix@%$prefix%g
++s%@program_transform_name@%$program_transform_name%g
++s%@bindir@%$bindir%g
++s%@sbindir@%$sbindir%g
++s%@libexecdir@%$libexecdir%g
++s%@datadir@%$datadir%g
++s%@sysconfdir@%$sysconfdir%g
++s%@sharedstatedir@%$sharedstatedir%g
++s%@localstatedir@%$localstatedir%g
++s%@libdir@%$libdir%g
++s%@includedir@%$includedir%g
++s%@oldincludedir@%$oldincludedir%g
++s%@infodir@%$infodir%g
++s%@mandir@%$mandir%g
++s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
++s%@INSTALL_DATA@%$INSTALL_DATA%g
++s%@PACKAGE@%$PACKAGE%g
++s%@VERSION@%$VERSION%g
++s%@ACLOCAL@%$ACLOCAL%g
++s%@AUTOCONF@%$AUTOCONF%g
++s%@AUTOMAKE@%$AUTOMAKE%g
++s%@AUTOHEADER@%$AUTOHEADER%g
++s%@MAKEINFO@%$MAKEINFO%g
++s%@SET_MAKE@%$SET_MAKE%g
++s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
++s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
++s%@MAINT@%$MAINT%g
++s%@host@%$host%g
++s%@host_alias@%$host_alias%g
++s%@host_cpu@%$host_cpu%g
++s%@host_vendor@%$host_vendor%g
++s%@host_os@%$host_os%g
++s%@CC@%$CC%g
++s%@build@%$build%g
++s%@build_alias@%$build_alias%g
++s%@build_cpu@%$build_cpu%g
++s%@build_vendor@%$build_vendor%g
++s%@build_os@%$build_os%g
++s%@LN_S@%$LN_S%g
++s%@OBJEXT@%$OBJEXT%g
++s%@EXEEXT@%$EXEEXT%g
++s%@ECHO@%$ECHO%g
++s%@RANLIB@%$RANLIB%g
++s%@STRIP@%$STRIP%g
++s%@CPP@%$CPP%g
++s%@LIBTOOL@%$LIBTOOL%g
++s%@LIBTOOL_DEPS@%$LIBTOOL_DEPS%g
++s%@LPRCOMMAND@%$LPRCOMMAND%g
++s%@CATCOMMAND@%$CATCOMMAND%g
++s%@LIBOBJS@%$LIBOBJS%g
++s%@LTLIBOBJS@%$LTLIBOBJS%g
++s%@ac_aux_dir@%$ac_aux_dir%g
++
++CEOF
++EOF
++
++cat >> $CONFIG_STATUS <<\EOF
++
++# Split the substitutions into bite-sized pieces for seds with
++# small command number limits, like on Digital OSF/1 and HP-UX.
++ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
++ac_file=1 # Number of current file.
++ac_beg=1 # First line for current file.
++ac_end=$ac_max_sed_cmds # Line after last line for current file.
++ac_more_lines=:
++ac_sed_cmds=""
++while $ac_more_lines; do
++  if test $ac_beg -gt 1; then
++    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
++  else
++    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
++  fi
++  if test ! -s conftest.s$ac_file; then
++    ac_more_lines=false
++    rm -f conftest.s$ac_file
++  else
++    if test -z "$ac_sed_cmds"; then
++      ac_sed_cmds="sed -f conftest.s$ac_file"
++    else
++      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
++    fi
++    ac_file=`expr $ac_file + 1`
++    ac_beg=$ac_end
++    ac_end=`expr $ac_end + $ac_max_sed_cmds`
++  fi
++done
++if test -z "$ac_sed_cmds"; then
++  ac_sed_cmds=cat
++fi
++EOF
++
++cat >> $CONFIG_STATUS <<EOF
++
++CONFIG_FILES=\${CONFIG_FILES-"Makefile replace/Makefile metamail/Makefile src/Makefile \
++	   src/metamail/Makefile src/richmail/Makefile bin/Makefile"}
++EOF
++cat >> $CONFIG_STATUS <<\EOF
++for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case "$ac_file" in
++  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
++       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
++  *) ac_file_in="${ac_file}.in" ;;
++  esac
++
++  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
++
++  # Remove last slash and all that follows it.  Not all systems have dirname.
++  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
++  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
++    # The file is in a subdirectory.
++    test ! -d "$ac_dir" && mkdir "$ac_dir"
++    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
++    # A "../" for each directory in $ac_dir_suffix.
++    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
++  else
++    ac_dir_suffix= ac_dots=
++  fi
++
++  case "$ac_given_srcdir" in
++  .)  srcdir=.
++      if test -z "$ac_dots"; then top_srcdir=.
++      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
++  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
++  *) # Relative path.
++    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
++    top_srcdir="$ac_dots$ac_given_srcdir" ;;
++  esac
++
++  case "$ac_given_INSTALL" in
++  [/$]*) INSTALL="$ac_given_INSTALL" ;;
++  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++  esac
++
++  echo creating "$ac_file"
++  rm -f "$ac_file"
++  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
++  case "$ac_file" in
++  *Makefile*) ac_comsub="1i\\
++# $configure_input" ;;
++  *) ac_comsub= ;;
++  esac
++
++  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
++  sed -e "$ac_comsub
++s%@configure_input@%$configure_input%g
++s%@srcdir@%$srcdir%g
++s%@top_srcdir@%$top_srcdir%g
++s%@INSTALL@%$INSTALL%g
++" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
++fi; done
++rm -f conftest.s*
++
++# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
++# NAME is the cpp macro being defined and VALUE is the value it is being given.
++#
++# ac_d sets the value in "#define NAME VALUE" lines.
++ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
++ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
++ac_dC='\3'
++ac_dD='%g'
++# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
++ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
++ac_uB='\([ 	]\)%\1#\2define\3'
++ac_uC=' '
++ac_uD='\4%g'
++# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
++ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
++ac_eB='$%\1#\2define\3'
++ac_eC=' '
++ac_eD='%g'
++
++if test "${CONFIG_HEADERS+set}" != set; then
++EOF
++cat >> $CONFIG_STATUS <<EOF
++  CONFIG_HEADERS="metamail/config.h"
++EOF
++cat >> $CONFIG_STATUS <<\EOF
++fi
++for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case "$ac_file" in
++  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
++       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
++  *) ac_file_in="${ac_file}.in" ;;
++  esac
++
++  echo creating $ac_file
++
++  rm -f conftest.frag conftest.in conftest.out
++  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
++  cat $ac_file_inputs > conftest.in
++
++EOF
++
++# Transform confdefs.h into a sed script conftest.vals that substitutes
++# the proper values into config.h.in to produce config.h.  And first:
++# Protect against being on the right side of a sed subst in config.status.
++# Protect against being in an unquoted here document in config.status.
++rm -f conftest.vals
++cat > conftest.hdr <<\EOF
++s/[\\&%]/\\&/g
++s%[\\$`]%\\&%g
++s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
++s%ac_d%ac_u%gp
++s%ac_u%ac_e%gp
++EOF
++sed -n -f conftest.hdr confdefs.h > conftest.vals
++rm -f conftest.hdr
++
++# This sed command replaces #undef with comments.  This is necessary, for
++# example, in the case of _POSIX_SOURCE, which is predefined and required
++# on some systems where configure will not decide to define it.
++cat >> conftest.vals <<\EOF
++s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
++EOF
++
++# Break up conftest.vals because some shells have a limit on
++# the size of here documents, and old seds have small limits too.
++
++rm -f conftest.tail
++while :
++do
++  ac_lines=`grep -c . conftest.vals`
++  # grep -c gives empty output for an empty file on some AIX systems.
++  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
++  # Write a limited-size here document to conftest.frag.
++  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
++  echo 'CEOF
++  sed -f conftest.frag conftest.in > conftest.out
++  rm -f conftest.in
++  mv conftest.out conftest.in
++' >> $CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
++  rm -f conftest.vals
++  mv conftest.tail conftest.vals
++done
++rm -f conftest.vals
++
++cat >> $CONFIG_STATUS <<\EOF
++  rm -f conftest.frag conftest.h
++  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
++  cat conftest.in >> conftest.h
++  rm -f conftest.in
++  if cmp -s $ac_file conftest.h 2>/dev/null; then
++    echo "$ac_file is unchanged"
++    rm -f conftest.h
++  else
++    # Remove last slash and all that follows it.  Not all systems have dirname.
++      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
++      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
++      # The file is in a subdirectory.
++      test ! -d "$ac_dir" && mkdir "$ac_dir"
++    fi
++    rm -f $ac_file
++    mv conftest.h $ac_file
++  fi
++fi; done
++
++EOF
++cat >> $CONFIG_STATUS <<EOF
++
++
++  srcdir=$srcdir
++  ac_cv_func_bzero=$ac_cv_func_bzero
++  ac_cv_func_memset=$ac_cv_func_memset
++  ac_cv_func_strchr=$ac_cv_func_strchr
++  ac_cv_func_strrchr=$ac_cv_func_strrchr
++# @end 5
++  ac_cv_func_basename=$ac_cv_func_basename
++  ac_cv_func_strcspn=$ac_cv_func_strcspn
++  ac_cv_func_strerror=$ac_cv_func_strerror
++  ac_cv_func_strsignal=$ac_cv_func_strsignal
++  ac_cv_func_strspn=$ac_cv_func_strspn
++  ac_cv_func_vfprintf=$ac_cv_func_vfprintf
++  ac_cv_func_waitpid=$ac_cv_func_waitpid
++  ac_cv_header_assert_h=$ac_cv_header_assert_h
++  ac_cv_header_errno_h=$ac_cv_header_errno_h
++  ac_cv_header_stdlib_h=$ac_cv_header_stdlib_h
++  ac_cv_header_stdarg_h=$ac_cv_header_stdarg_h
++  ac_cv_header_string_h=$ac_cv_header_string_h
++  ac_cv_header_strings_h=$ac_cv_header_strings_h
++  ac_cv_header_sys_wait_h=$ac_cv_header_sys_wait_h
++  ac_cv_header_unistd_h=$ac_cv_header_unistd_h
++  ac_cv_header_varargs_h=$ac_cv_header_varargs_h
++  LPRCOMMAND=$LPRCOMMAND
++  CATCOMMAND=$CATCOMMAND
++  host=$host
++# @start 5
++
++
++EOF
++cat >> $CONFIG_STATUS <<\EOF
++test -z "$CONFIG_HEADERS" || echo timestamp > metamail/stamp-h
++
++  if test -n "$CONFIG_FILES" && test -n "$CONFIG_HEADERS"; then
++    # If both these vars are non-empty, then config.status wasn't run by
++    # automake rules (which always set one or the other to empty).
++    CONFIG_OTHER=${CONFIG_OTHER-METAMAIL/common.h}
++  fi
++  case "$CONFIG_OTHER" in
++  *metamail/common.h*)
++    outfile=metamail/common.h
++    stampfile=metamail/stamp-common
++    tmpfile=${outfile}T
++    dirname="sed s,^.*/,,g"
++
++    echo creating $outfile
++    cat > $tmpfile << _EOF_
++/*  -*- Mode: C -*-
++ * --------------------------------------------------------------------
++ * DO NOT EDIT THIS FILE!  It has been automatically generated
++ * from:    configure.in and `echo $outfile|$dirname`.in
++ * on host: `(hostname || uname -n) 2>/dev/null | sed 1q`
++ * --------------------------------------------------------------------
++ */
++
++#ifndef METAMAIL_COMMON_H
++#define METAMAIL_COMMON_H 1
++
++#include <stdio.h>
++#include <ctype.h>        // ??? ok here
++#include <sys/types.h>
++#include <sys/stat.h>     // ??? ok here
++
++// ??? following ok here without check?
++#include <pwd.h>
++#include <sys/time.h>
++#include <sys/types.h>
++#include <sys/file.h>
++#include <signal.h>
++
++#include <termio.h>
++#include <fcntl.h>
++#include <sys/utsname.h>
++_EOF_
++
++    case "${host}" in
++      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
++
++#include <linux/limits.h>
++
++_EOF_
++;;
++    esac
++
++# @end 5
++# @start 4
++    # Add the code to include these headers only if autoconf has
++    # shown them to be present.
++    if test x$ac_cv_header_stdlib_h = xyes; then
++      echo '#include <stdlib.h>' >> $tmpfile
++    fi
++    if test x$ac_cv_header_unistd_h = xyes; then
++      echo '#include <unistd.h>' >> $tmpfile
++    fi
++    if test x$ac_cv_header_sys_wait_h = xyes; then
++      echo '#include <sys/wait.h>' >> $tmpfile
++    fi
++    if test x$ac_cv_header_errno_h = xyes; then
++      echo '#include <errno.h>' >> $tmpfile
++    fi
++    cat >> $tmpfile << '_EOF_'
++
++#ifndef errno
++/* Some sytems #define this! */
++extern int errno;
++#endif
++
++_EOF_
++    if test x$ac_cv_header_string_h = xyes; then
++      echo '#include <string.h>' >> $tmpfile
++    elif test x$ac_cv_header_strings_h = xyes; then
++      echo '#include <strings.h>' >> $tmpfile
++    fi
++
++# *******************
++# start variadic parameters 
++#
++    if test x$ac_cv_header_stdarg_h = xyes \
++	&& test x$ac_cv_header_varargs_h != xyes
++    then
++      cat >> $tmpfile << '_EOF_'
++
++#include <stdarg.h>
++#ifndef VA_START
++#  define VA_START(a, f) va_start(a, f)
++#endif /* VA_START */
++
++_EOF_
++    else
++      cat >> $tmpfile << '_EOF_'
++	
++#include <varargs.h>
++#ifndef VA_START
++#  define VA_START(a, f) va_start(a)
++#endif /* VA_START */
++       
++_EOF_
++    fi
++#
++# end variadic parameters
++# ***********************
++
++    if test x$ac_cv_header_assert_h = xyes; then
++      cat >> $tmpfile << '_EOF_'
++
++#include <assert.h>
++#define METAMAIL_ASSERT assert
++
++_EOF_
++else
++        echo '#define METAMAIL_ASSERT(expr)  ((void) 0)' >> $tmpfile
++    fi
++# @end 4
++# @start 5
++    if test x$ac_cv_func_killpg = xno && \
++       test x$ac_cv_func_kill = xyes; then
++      cat >> $tmpfile << '_EOF_'
++#define killbg(pid, sig) ((int) kill (-(pid), sig))
++_EOF_
++    fi 
++    if test x$ac_cv_func_bcopy = xno && \
++       test x$ac_cv_func_memcpy = xyes; then
++      cat >> $tmpfile << '_EOF_'
++#define bcopy(src, dest, n) ((void) memcpy (dest, src, n))
++_EOF_
++    fi
++    if test x$ac_cv_func_bzero = xno && \
++       test x$ac_cv_func_memset = xyes; then
++      cat >> $tmpfile << '_EOF_'
++#define bzero(buf, bytes) ((void) memset (buf, 0, bytes))
++_EOF_
++    fi
++    if test x$ac_cv_func_bcmp = xno && \
++       test x$ac_cv_func_memcmp = xyes; then
++      echo '#define bcmp memcmp' >> $tmpfile
++    fi
++    if test x$ac_cv_func_index = xno && \
++       test x$ac_cv_func_strchr = xyes; then
++      echo '#define index strchr' >> $tmpfile
++    fi
++    if test x$ac_cv_func_rindex = xno && \
++       test x$ac_cv_func_strrchr = xyes; then
++      echo '#define rindex strrchr' >> $tmpfile
++    fi
++    if test x$ac_cv_func_initstate = xno && \
++       test x$ac_cv_func_srand = xyes; then
++      echo '#define initstate srand' >> $tmpfile
++    fi
++    if test x$ac_cv_func_random = xno && \
++       test x$ac_cv_func_rand = xyes; then
++      echo '#define random rand' >> $tmpfile
++    fi
++
++    # The ugly but portable cpp stuff comes from here
++    infile=$srcdir/metamail/`echo $outfile | sed 's,.*/,,g;s,\..*$,,g'`-h.in
++    sed '/^##.*$/d' $infile >> $tmpfile 
++
++# @end 5
++    ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
++    if test x$ac_cv_func_basename = xno; then
++      echo 'extern char *basename PARAMS((const char *path));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_strerror = xno; then
++      echo 'extern char *strerror PARAMS((int err));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_strsignal = xno; then
++      echo 'extern char *strsignal PARAMS((int signo));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_vfprintf = xno; then
++      echo 'extern int vfprintf PARAMS((FILE *file, const char* format, va_list ap));' >> ${tmpfile}2
++    fi
++    if test x$ac_cv_func_waitpid = xno; then 
++	echo 'extern pid_t waitpid PARAMS((pid_t pid, int *pstatus, int options));' >> ${tmpfile}2
++    fi
++
++    if test -f ${tmpfile}2; then
++      cat >> $tmpfile << '_EOF_'
++
++BEGIN_C_DECLS
++_EOF_
++      cat ${tmpfile}2 >> $tmpfile
++      echo 'END_C_DECLS' >> $tmpfile
++      ${RM-/bin/rm -f} ${tmpfile}2 2>/dev/null
++    fi
++
++    if test -n ${LPRCOMMAND}; then
++      echo '#define LPRCOMMAND "'${LPRCOMMAND}'"' >> $tmpfile
++      echo '#define LPRTEMPLATE "'${LPRCOMMAND}' %s"' >> $tmpfile
++    fi
++    if test -n ${CATCOMMAND}; then
++      echo '#define CATCOMMAND "'${CATCOMMAND}'"' >> $tmpfile
++      echo '#define CATTEMPLATE "'${CATCOMMAND}' %s"' >> $tmpfile
++    fi
++
++    case "${host}" in
++      *-*-linux-gnu*) cat >> $tmpfile << '_EOF_'
++#define TMPNAME_MAX NAME_MAX
++static struct termio MyTtyStateIn, MyTtyStateOut;
++
++_EOF_
++;;
++      *) cat >> $tmpfile << '_EOF_'
++
++#define TMPNAME_MAX	1000
++#define NAME_MAX	1000
++static struct sgttyb MyTtyStateIn, MyTtyStateOut;
++
++_EOF_
++;;
++    esac
++
++    cat >> $tmpfile << '_EOF_'
++
++
++#endif /* !METAMAIL_COMMON_H */
++_EOF_
++
++    if cmp -s $tmpfile $outfile; then
++      echo $outfile is unchanged
++      rm -f $tmpfile
++    else
++      mv $tmpfile $outfile
++      touch $stampfile
++    fi
++    ;;
++  esac
++# @start 5
++
++test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h.in
++exit 0
++EOF
++chmod +x $CONFIG_STATUS
++rm -fr confdefs* $ac_clean_files
++test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
++
diff --git a/source/n/mtr/mtr.SlackBuild b/source/n/mtr/mtr.SlackBuild
index 4f53c5876..4ebea21e1 100755
--- a/source/n/mtr/mtr.SlackBuild
+++ b/source/n/mtr/mtr.SlackBuild
@@ -84,7 +84,6 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* FORMATS INSTALL NEWS README* SECURITY TODO \
   $PKG/usr/doc/$PKGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
diff --git a/source/n/mutt/mutt.SlackBuild b/source/n/mutt/mutt.SlackBuild
index e9ca32754..3de6e3075 100755
--- a/source/n/mutt/mutt.SlackBuild
+++ b/source/n/mutt/mutt.SlackBuild
@@ -1,6 +1,5 @@
 #!/bin/sh
-
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2002-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,47 +19,64 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+PKGNAM=mutt
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
-VERSION=1.4.2.3
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
-
+TMP=${TMP:-/tmp}
+CWD=`pwd` 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+elif [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
 PKG=$TMP/package-mutt
 rm -rf $PKG
-mkdir -p $TMP $PKG
+mkdir $PKG
 cd $TMP
-rm -rf $(basename mutt-$VERSION i)
-tar xvf $CWD/mutt-$VERSION.tar.bz2 || exit 1
-cd $(basename mutt-$VERSION i) || exit 1
-
+rm -rf mutt-$VERSION
+tar xvf $CWD/mutt-$VERSION.tar.?z* || exit 1
+cd mutt-$VERSION || exit 1
 chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+
+# "error creating gpgme context: Not operational?" bugfix
+# http://dev.mutt.org/trac/ticket/3300
+zcat $CWD/mutt.gpgme.diff.gz | patch -p1 --verbose || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
+  --docdir=/usr/doc/mutt-$VERSION \
+  --with-docdir=/usr/doc/mutt-$VERSION \
   --sysconfdir=/etc/mutt \
   --with-mailpath=/var/spool/mail \
   --enable-pop \
   --enable-imap \
   --with-ssl \
+  --with-sasl \
+  --enable-smtp \
+  --enable-gpgme \
+  --enable-hcache \
   --enable-locales-fix \
   --without-wc-funcs \
   --build=$ARCH-slackware-linux
@@ -68,26 +84,49 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
-gzip -9 $PKG/usr/man/man?/*
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
-# Don't mv the mutt docs directory, because mutt uses 'em.
-# Make a link instead.
-( cd $PKG/usr/doc ; rm -rf mutt-$VERSION ; ln -sf mutt mutt-$VERSION )
 # This stuff is redundant or not useful to most people, IMHO.
 # If you want it, use the source, Luke.
-rm -rf \
-  $PKG/usr/doc/mutt/html \
-  $PKG/usr/doc/mutt/ChangeLog
+rm -f $PKG/usr/doc/mutt-$VERSION/*.html
+rm -f $PKG/etc/mutt/*.dist
+
+# This is an ancient artifact
+rm -f $PKG/usr/doc/mutt-$VERSION/samples/ca-bundle.crt
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mv $PKG/etc/mutt/Muttrc $PKG/etc/mutt/Muttrc.new
 
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/mutt-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n ../mutt-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/n/mutt/mutt.gpgme.diff b/source/n/mutt/mutt.gpgme.diff
new file mode 100644
index 000000000..8f8c40a4f
--- /dev/null
+++ b/source/n/mutt/mutt.gpgme.diff
@@ -0,0 +1,34 @@
+--- mutt-1.5.20/init.c.orig	2009-07-21 17:54:59 +0200
++++ mutt-1.5.20/init.c	2009-07-21 17:59:47 +0200
+@@ -37,7 +37,6 @@
+ #endif
+ 
+ 
+-
+ #include "mx.h"
+ #include "init.h"
+ #include "mailbox.h"
+@@ -50,6 +49,10 @@
+ #include <errno.h>
+ #include <sys/wait.h>
+ 
++#if defined(CRYPT_BACKEND_GPGME)
++#include <gpgme.h>
++#endif
++
+ #define CHECK_PAGER \
+   if ((CurrentMenu == MENU_PAGER) && (idx >= 0) &&	\
+ 	    (MuttVars[idx].flags & R_RESORT)) \
+@@ -3262,6 +3265,11 @@
+ 
+   mutt_read_histfile ();
+ 
++#ifdef CRYPT_BACKEND_GPGME
++  /* needed since version 1.2.0, ticket #3300 */
++  gpgme_check_version (NULL);
++#endif
++
+ #if 0
+   set_option (OPTWEED); /* turn weeding on by default */
+ #endif
+
diff --git a/source/n/nc/nc.SlackBuild b/source/n/nc/nc.SlackBuild
index aafa123ba..90f133d9f 100755
--- a/source/n/nc/nc.SlackBuild
+++ b/source/n/nc/nc.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,15 +23,26 @@
 
 VERSION=1.10
 SRCVER=110
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/n/net-snmp/net-snmp.SlackBuild b/source/n/net-snmp/net-snmp.SlackBuild
index c9ca3e71e..88ef2d43f 100755
--- a/source/n/net-snmp/net-snmp.SlackBuild
+++ b/source/n/net-snmp/net-snmp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 
 
 PKGNAM=net-snmp
-VERSION=${VERSION:-5.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -60,6 +60,8 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
+zcat $CWD/net-snmp.net-snmp-create-v3-user.etc.snmpd.conf.diff.gz | patch -p1 --verbose || exit 1
+
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -90,6 +92,10 @@ CFLAGS="$SLKCFLAGS" \
   --program-prefix= \
   --build=$ARCH-slackware-linux
 
+# This appears to require additional third-party python modules?
+# Maybe something for later.
+# --with-python-modules 
+
 # Build and install:
 # This seems to not play well with "-j N"...
 make INSTALLDIRS=vendor || exit 1
@@ -143,17 +149,9 @@ fi
 # This removes our DESTDIR from the packlist filenames, to keep perl's
 # internal inventories consistent and correct.
 find $PKG -name .packlist | while read plist ; do
-  sed -e "s%/share/man%/man%g" \
-      -e "s%$PKG%%g" \
-      -e "s%\.1$%\.1\.gz%g" \
-      -e "s%\.2$%\.2\.gz%g" \
-      -e "s%\.3$%\.3\.gz%g" \
-      -e "s%\.3pm$%\.3pm\.gz%g" \
-      -e "s%\.4$%\.4\.gz%g" \
-      -e "s%\.5$%\.5\.gz%g" \
-      -e "s%\.6$%\.6\.gz%g" \
-      -e "s%\.7$%\.7\.gz%g" \
-      -e "s%\.8$%\.8\.gz%g" \
+  sed -e "s%$PKG%%g" \
+      -e "s%/share/man%/man%g" \
+      -re "s%\.([1-9]n?|3pm)$%&.gz%g   # extend man filenames for .gz" \
       ${plist} > ${plist}.new
       mv -f ${plist}.new ${plist}
 done
diff --git a/source/n/net-snmp/net-snmp.net-snmp-create-v3-user.etc.snmpd.conf.diff b/source/n/net-snmp/net-snmp.net-snmp-create-v3-user.etc.snmpd.conf.diff
new file mode 100644
index 000000000..b726c4713
--- /dev/null
+++ b/source/n/net-snmp/net-snmp.net-snmp-create-v3-user.etc.snmpd.conf.diff
@@ -0,0 +1,14 @@
+Let net-snmp-create-v3-user save settings into /etc/ instead of /usr/
+
+diff -up net-snmp-5.5/net-snmp-create-v3-user.in.orig net-snmp-5.5/net-snmp-create-v3-user.in
+--- net-snmp-5.5/net-snmp-create-v3-user.in.orig	2008-07-22 16:33:25.000000000 +0200
++++ net-snmp-5.5/net-snmp-create-v3-user.in	2009-09-29 16:30:36.000000000 +0200
+@@ -158,7 +158,7 @@ if test ! -d $outfile ; then
+     touch $outfile
+ fi
+ echo $line >> $outfile
+-outfile="@datadir@/snmp/snmpd.conf"
++outfile="/etc/snmp/snmpd.conf"
+ line="$token $user"
+ echo "adding the following line to $outfile:"
+ echo "  " $line
diff --git a/source/n/net-tools/net-tools.SlackBuild b/source/n/net-tools/net-tools.SlackBuild
index e757722aa..5f11755d0 100755
--- a/source/n/net-tools/net-tools.SlackBuild
+++ b/source/n/net-tools/net-tools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,17 @@
 
 PKGNAM=net-tools
 VERSION=${VERSION:-1.60}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -41,6 +49,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 cd $TMP
@@ -54,8 +64,11 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/net-tools_1.60-19.diff.gz | patch -p1 --backup --verbose || exit
-zcat $CWD/net-tools.diff.gz | patch -p1 --backup --verbose || exit
+zcat $CWD/net-tools_1.60-23.diff.gz | patch -p1 --backup --verbose || exit 1
+zcat $CWD/net-tools.diff.gz | patch -p1 --backup --verbose || exit 1
+zcat $CWD/net-tools.struct.x25_address.gcc4.diff.gz | patch -p1 --backup --verbose || exit 1
+zcat $CWD/net-tools.switch.default.gcc4.diff.gz | patch -p1 --backup --verbose || exit 1
+zcat $CWD/net-tools.mii-tool.string.diff.gz | patch -p1 --backup --verbose || exit 1
 
 mkdir -p $PKG/usr/doc/net-tools-1.60
 cp -a README README.ipv6 $PKG/usr/doc/net-tools-1.60
diff --git a/source/n/net-tools/net-tools.mii-tool.string.diff b/source/n/net-tools/net-tools.mii-tool.string.diff
new file mode 100644
index 000000000..aaa5b09e3
--- /dev/null
+++ b/source/n/net-tools/net-tools.mii-tool.string.diff
@@ -0,0 +1,29 @@
+--- ./mii-tool.c.orig	2000-05-21 09:31:17.000000000 -0500
++++ ./mii-tool.c	2010-08-12 12:46:05.063607571 -0500
+@@ -379,16 +379,16 @@
+ /*--------------------------------------------------------------------*/
+ 
+ const char *usage =
+-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
+-       -V, --version               display version information
+-       -v, --verbose               more verbose output
+-       -R, --reset                 reset MII to poweron state
+-       -r, --restart               restart autonegotiation
+-       -w, --watch                 monitor for link status changes
+-       -l, --log                   with -w, write events to syslog
+-       -A, --advertise=media,...   advertise only specified media
+-       -F, --force=media           force specified media technology
+-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
++"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...] \n\
++       -V, --version               display version information \n\
++       -v, --verbose               more verbose output \n\
++       -R, --reset                 reset MII to poweron state \n\
++       -r, --restart               restart autonegotiation \n\
++       -w, --watch                 monitor for link status changes \n\
++       -l, --log                   with -w, write events to syslog \n\
++       -A, --advertise=media,...   advertise only specified media \n\
++       -F, --force=media           force specified media technology \n\
++media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD, \n\
+        (to advertise both HD and FD) 100baseTx, 10baseT\n";
+ 
+ int main(int argc, char **argv)
diff --git a/source/n/net-tools/net-tools.struct.x25_address.gcc4.diff b/source/n/net-tools/net-tools.struct.x25_address.gcc4.diff
new file mode 100644
index 000000000..25a42ed7a
--- /dev/null
+++ b/source/n/net-tools/net-tools.struct.x25_address.gcc4.diff
@@ -0,0 +1,11 @@
+--- ./lib/x25_sr.c.orig	2000-05-20 08:38:10.000000000 -0500
++++ ./lib/x25_sr.c	2010-08-12 12:13:35.147112052 -0500
+@@ -77,7 +77,7 @@
+   rt.sigdigits=sigdigits;
+ 
+   /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
+-  memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
++  memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
+ 
+   while (*args) {
+ 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
diff --git a/source/n/net-tools/net-tools.switch.default.gcc4.diff b/source/n/net-tools/net-tools.switch.default.gcc4.diff
new file mode 100644
index 000000000..4d7090e0f
--- /dev/null
+++ b/source/n/net-tools/net-tools.switch.default.gcc4.diff
@@ -0,0 +1,42 @@
+--- ./hostname.c.orig	2001-04-08 12:04:23.000000000 -0500
++++ ./hostname.c	2010-08-12 12:19:29.181510641 -0500
+@@ -78,6 +78,7 @@
+             fprintf(stderr, _("%s: name too long\n"), program_name);
+             break;
+         default:
++            break;
+         }
+ 	exit(1);
+     }
+@@ -98,6 +99,7 @@
+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
+ 	    break;
+ 	default:
++            break;
+ 	}
+ 	exit(1);
+     };
+@@ -117,6 +119,7 @@
+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
+ 	    break;
+ 	default:
++	    break;
+ 	}
+ 	exit(1);
+     };
+@@ -174,6 +177,7 @@
+ 	printf("%s\n", hp->h_name);
+ 	break;
+     default:
++        break;
+     }
+ }
+ 
+@@ -330,7 +334,6 @@
+ 	case 'h':
+ 	default:
+ 	    usage();
+-
+ 	};
+ 
+ 
diff --git a/source/n/net-tools/net-tools_1.60-19.diff b/source/n/net-tools/net-tools_1.60-19.diff
deleted file mode 100644
index f754f02d5..000000000
--- a/source/n/net-tools/net-tools_1.60-19.diff
+++ /dev/null
@@ -1,29401 +0,0 @@
---- net-tools-1.60.orig/lib/ether.c
-+++ net-tools-1.60/lib/ether.c
-@@ -2,7 +2,7 @@
-  * lib/ether.c        This file contains an implementation of the "Ethernet"
-  *              support functions.
-  *
-- * Version:     $Id: ether.c,v 1.7 1999/09/27 11:00:47 philip Exp $
-+ * Version:     $Id: ether.c,v 1.8 2002/07/30 05:17:29 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -39,7 +39,7 @@
- {
-     static char buff[64];
- 
--    snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X",
-+    snprintf(buff, sizeof(buff), "%02x:%02x:%02x:%02x:%02x:%02x",
- 	     (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
- 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
- 	);
---- net-tools-1.60.orig/lib/inet6.c
-+++ net-tools-1.60/lib/inet6.c
-@@ -3,7 +3,7 @@
-  *              support functions for the net-tools.
-  *              (most of it copied from lib/inet.c 1.26).
-  *
-- * Version:     $Id: inet6.c,v 1.10 2000/10/28 11:04:00 pb Exp $
-+ * Version:     $Id: inet6.c,v 1.12 2002/12/10 01:03:09 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -44,6 +44,21 @@
- 
- extern int h_errno;		/* some netdb.h versions don't export this */
- 
-+char * fix_v4_address(char *buf, struct in6_addr *in6) 
-+{ 
-+	if (IN6_IS_ADDR_V4MAPPED(in6->s6_addr)) { 
-+			char *s =strchr(buf, '.'); 
-+			if (s) { 
-+				while (s > buf && *s != ':')
-+					--s;
-+				if (*s == ':') ++s; 	
-+				else s = NULL; 
-+			} 	
-+			if (s) return s;
-+	} 
-+	return buf; 
-+} 
-+
- static int INET6_resolve(char *name, struct sockaddr_in6 *sin6)
- {
-     struct addrinfo req, *ai;
-@@ -83,14 +98,14 @@
- 	return (-1);
-     }
-     if (numeric & 0x7FFF) {
--	inet_ntop(AF_INET6, &sin6->sin6_addr, name, 80);
-+	inet_ntop( AF_INET6, &sin6->sin6_addr, name, 80);
- 	return (0);
-     }
-     if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
-         if (numeric & 0x8000)
- 	    strcpy(name, "default");
- 	else
--	    strcpy(name, "*");
-+	    strcpy(name, "[::]");
- 	return (0);
-     }
- 
-@@ -109,13 +124,14 @@
- }
- 
- 
-+
- /* Display an Internet socket address. */
- static char *INET6_print(unsigned char *ptr)
- {
-     static char name[80];
- 
-     inet_ntop(AF_INET6, (struct in6_addr *) ptr, name, 80);
--    return name;
-+	return fix_v4_address(name, (struct in6_addr *)ptr);
- }
- 
- 
-@@ -129,13 +145,14 @@
- 	return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff));
-     if (INET6_rresolve(buff, (struct sockaddr_in6 *) sap, numeric) != 0)
- 	return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff));
--    return (buff);
-+    return (fix_v4_address(buff, &((struct sockaddr_in6 *)sap)->sin6_addr));
- }
- 
- 
- static int INET6_getsock(char *bufp, struct sockaddr *sap)
- {
-     struct sockaddr_in6 *sin6;
-+	char *p;
- 
-     sin6 = (struct sockaddr_in6 *) sap;
-     sin6->sin6_family = AF_INET6;
-@@ -143,7 +160,9 @@
- 
-     if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0)
- 	return (-1);
--
-+	p = fix_v4_address(bufp, &sin6->sin6_addr);
-+	if (p != bufp) 
-+		memcpy(bufp, p, strlen(p)+1); 
-     return 16;			/* ?;) */
- }
- 
---- net-tools-1.60.orig/lib/inet6_gr.c
-+++ net-tools-1.60/lib/inet6_gr.c
-@@ -1,4 +1,4 @@
--/*
-+ /*
-    Modifications:
-    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets,
-    snprintf instead of sprintf
-@@ -71,11 +71,15 @@
-         printf(_("INET6 (IPv6) not configured in this system.\n"));
- 	return 1;
-     }
--    printf(_("Kernel IPv6 routing table\n"));
- 
--    printf(_("Destination                                 "
--	     "Next Hop                                "
--	     "Flags Metric Ref    Use Iface\n"));
-+    if (numeric & RTF_CACHE)
-+    	printf(_("Kernel IPv6 routing cache\n"));
-+    else
-+    	printf(_("Kernel IPv6 routing table\n"));
-+
-+    printf(_("Destination                    "
-+	     "Next Hop                   "
-+	     "Flag Met Ref Use If\n"));
- 
-     while (fgets(buff, 1023, fp)) {
- 	num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %s\n",
-@@ -87,13 +91,19 @@
- 		     &slen,
- 		     naddr6p[0], naddr6p[1], naddr6p[2], naddr6p[3],
- 		     naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7],
--		     &metric, &use, &refcnt, &iflags, iface);
-+		     &metric, &refcnt, &use, &iflags, iface);
- #if 0
- 	if (num < 23)
- 	    continue;
- #endif
--	if (!(iflags & RTF_UP))
--	    continue;
-+	if (iflags & RTF_CACHE) {
-+		if (!(numeric & RTF_CACHE))
-+			continue;
-+	} else {
-+		if (numeric & RTF_CACHE)
-+			continue;
-+	}
-+			
- 	/* Fetch and resolve the target address. */
- 	snprintf(addr6, sizeof(addr6), "%s:%s:%s:%s:%s:%s:%s:%s",
- 		 addr6p[0], addr6p[1], addr6p[2], addr6p[3],
-@@ -112,7 +122,12 @@
- 		 inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1));
- 
- 	/* Decode the flags. */
--	strcpy(flags, "U");
-+
-+	flags[0]=0;
-+	if (iflags & RTF_UP)
-+	    strcat(flags, "U");
-+	if (iflags & RTF_REJECT)
-+	    strcat(flags, "!");
- 	if (iflags & RTF_GATEWAY)
- 	    strcat(flags, "G");
- 	if (iflags & RTF_HOST)
-@@ -123,9 +138,19 @@
- 	    strcat(flags, "A");
- 	if (iflags & RTF_CACHE)
- 	    strcat(flags, "C");
-+	if (iflags & RTF_ALLONLINK)
-+	    strcat(flags, "a");
-+	if (iflags & RTF_EXPIRES)
-+	    strcat(flags, "e");
-+	if (iflags & RTF_MODIFIED)
-+	    strcat(flags, "m");
-+	if (iflags & RTF_NONEXTHOP)
-+	    strcat(flags, "n");
-+	if (iflags & RTF_FLOW)
-+	    strcat(flags, "f");
- 
- 	/* Print the info. */
--	printf("%-43s %-39s %-5s %-6d %-2d %7d %-8s\n",
-+	printf("%-30s %-26s %-4s %-3d %-1d%6d %s\n",
- 	       addr6, naddr6, flags, metric, refcnt, use, iface);
-     }
- 
-@@ -144,8 +169,7 @@
-     char addr6p[8][5], haddrp[6][3];
- 
-     if (!fp) {
--	ESYSNOT("nd_print", "ND Table");
--	return 1;
-+	return rprint_fib6(ext, numeric | RTF_CACHE);
-     }
-     printf(_("Kernel IPv6 Neighbour Cache\n"));
- 
---- net-tools-1.60.orig/lib/ipx_gr.c
-+++ net-tools-1.60/lib/ipx_gr.c
-@@ -38,21 +38,27 @@
-     char net[128], router_net[128];
-     char router_node[128];
-     int num;
--    FILE *fp = fopen(_PATH_PROCNET_IPX_ROUTE, "r");
-+    FILE *fp;
-     struct aftype *ap;
-     struct sockaddr sa;
- 
--    if ((ap = get_afntype(AF_IPX)) == NULL) {
--	EINTERN("lib/ipx_rt.c", "AF_IPX missing");
--	return (-1);
--    }
-+    fp = fopen(_PATH_PROCNET_IPX_ROUTE1, "r");
- 
-     if (!fp) {
--        perror(_PATH_PROCNET_IPX_ROUTE);
--        printf(_("IPX not configured in this system.\n"));
-+        fp = fopen(_PATH_PROCNET_IPX_ROUTE2, "r");
-+    }
-+    
-+    if (!fp) {
-+        perror(NULL);
-+        printf(_("IPX routing not in file %s or %s found.\n"), _PATH_PROCNET_IPX_ROUTE1, _PATH_PROCNET_IPX_ROUTE2);
- 	return 1;
-     }
- 
-+    if ((ap = get_afntype(AF_IPX)) == NULL) {
-+	EINTERN("lib/ipx_rt.c", "AF_IPX missing");
-+	return (-1);
-+    }
-+
-     printf(_("Kernel IPX routing table\n"));	/* xxx */
-     printf(_("Destination               Router Net                Router Node\n"));
- 
---- net-tools-1.60.orig/lib/proc.c
-+++ net-tools-1.60/lib/proc.c
-@@ -1,11 +1,12 @@
- /* Tolerant /proc file parser. Copyright 1998 Andi Kleen */
--/* $Id: proc.c,v 1.4 1999/01/05 20:54:00 philip Exp $ */ 
-+/* $Id: proc.c,v 1.5 2007/12/01 18:44:57 ecki Exp $ */ 
- /* Fixme: cannot currently cope with removed fields */ 
- 
- #include <string.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <ctype.h>
-+#include <unistd.h>
- 
- /* Caller must free return string. */
- 
-@@ -72,3 +73,22 @@
-     va_end(ap);
-     return flag;
- }
-+
-+
-+FILE *proc_fopen(const char *name)
-+{
-+    static char *buffer;
-+    static size_t pagesz;
-+    FILE *fd = fopen(name, "r");
-+
-+    if (fd == NULL)
-+      return NULL;
-+      
-+    if (!buffer) {
-+      pagesz = getpagesize();
-+      buffer = malloc(pagesz);
-+    }
-+    
-+    setvbuf(fd, buffer, _IOFBF, pagesz);
-+    return fd;
-+}
---- net-tools-1.60.orig/lib/proc.h
-+++ net-tools-1.60/lib/proc.h
-@@ -1,5 +1,7 @@
--
--
--/* Generate a suitable scanf format for a column title line */
-+/* 
-+ * prototypes for proc.c
-+ */
- char *proc_gen_fmt(char *name, int more, FILE * fh,...);
- int   proc_guess_fmt(char *name, FILE* fh,...);
-+FILE *proc_fopen(const char *name);
-+
---- net-tools-1.60.orig/lib/util-ank.c
-+++ net-tools-1.60/lib/util-ank.c
-@@ -293,7 +293,7 @@
- 	return 0;
- }
- 
--const char *format_host(int af, void *addr, __u8 *abuf, int alen)
-+const char *format_host(int af, void *addr, char *abuf, int alen)
- {
- #ifdef RESOLVE_HOSTNAMES
- 	if (resolve_hosts) {
---- net-tools-1.60.orig/lib/Makefile
-+++ net-tools-1.60/lib/Makefile
-@@ -16,7 +16,7 @@
- #
- 
- 
--HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o
-+HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o eui64.o
- AFOBJS	 = unix.o inet.o inet6.o ax25.o ipx.o ddp.o ipx.o netrom.o af.o rose.o econet.o x25.o
- AFGROBJS = inet_gr.o inet6_gr.o ipx_gr.o ddp_gr.o netrom_gr.o ax25_gr.o rose_gr.o getroute.o x25_gr.o
- AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o x25_sr.o
---- net-tools-1.60.orig/lib/ddp_gr.c
-+++ net-tools-1.60/lib/ddp_gr.c
-@@ -1,3 +1,20 @@
-+/*
-+ * lib/ddp_gr.c         Prinbting of DDP (AppleTalk) routing table
-+ *                      used by the NET-LIB.
-+ *
-+ * NET-LIB      
-+ *
-+ * Version:     $Id: ddp_gr.c,v 1.4 2002/06/02 05:25:15 ecki Exp $
-+ *
-+ * Author:      Ajax <ajax@firest0rm.org>
-+ *
-+ * Modification:
-+ *  2002-06-02 integrated into main source by Bernd Eckenfels
-+ *
-+ */
-+
-+/* TODO: name lookups (/etc/atalk.names?  NBP?) */
-+
- #include "config.h"
- 
- #if HAVE_AFATALK
-@@ -16,9 +33,61 @@
- #include "pathnames.h"
- #include "intl.h"
- 
-+/* stolen from inet_gr.c */
-+#define flags_decode(i,o) do {                  \
-+        o[0] = '\0';                            \
-+        if (i & RTF_UP) strcat(o, "U");         \
-+        if (i & RTF_GATEWAY) strcat(o, "G");    \
-+        if (i & RTF_REJECT) strcat(o, "!");     \
-+        if (i & RTF_HOST) strcat(o, "H");       \
-+        if (i & RTF_REINSTATE) strcat(o, "R");  \
-+        if (i & RTF_DYNAMIC) strcat(o, "D");    \
-+        if (i & RTF_MODIFIED) strcat(o, "M");   \
-+        if (i & RTF_DEFAULT) strcat(o, "d");    \
-+        if (i & RTF_ALLONLINK) strcat(o, "a");  \
-+        if (i & RTF_ADDRCONF) strcat(o, "c");   \
-+        if (i & RTF_NONEXTHOP) strcat(o, "o");  \
-+        if (i & RTF_EXPIRES) strcat(o, "e");    \
-+        if (i & RTF_CACHE) strcat(o, "c");      \
-+        if (i & RTF_FLOW) strcat(o, "f");       \
-+        if (i & RTF_POLICY) strcat(o, "p");     \
-+        if (i & RTF_LOCAL) strcat(o, "l");      \
-+        if (i & RTF_MTU) strcat(o, "u");        \
-+        if (i & RTF_WINDOW) strcat(o, "w");     \
-+        if (i & RTF_IRTT) strcat(o, "i");       \
-+        if (i & RTF_NOTCACHED) strcat(o, "n");  \
-+    } while (0)
-+
- int DDP_rprint(int options)
- {
--    fprintf(stderr, _("Routing table for `ddp' not yet supported.\n"));
--    return (1);
-+    FILE *fp;
-+    char *dest, *gw, *dev, *flags;
-+    char oflags[32];
-+    char *hdr = "Destination     Gateway         Device          Flags";
-+
-+    fp = fopen(_PATH_PROCNET_ATALK_ROUTE, "r");
-+
-+    if (!fp) {
-+        perror("Error opening " _PATH_PROCNET_ATALK_ROUTE);
-+        fprintf(stderr, "DDP (AppleTalk) not configured on this system.\n");
-+        return 1;
-+    }
-+
-+    fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev);
-+    free(dest); free(gw); free(dev); free(flags);
-+
-+    printf("%s\n", hdr);
-+
-+    while (fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev) == 4) {
-+        int iflags = atoi(flags);
-+        flags_decode(iflags, oflags);
-+        printf("%-16s%-16s%-16s%-s\n", dest, gw, dev, oflags);
-+        free(dest); free(gw); free(dev); free(flags);
-+    }
-+
-+    fclose(fp);
-+    
-+    return 0;
-+
- }
- #endif
---- net-tools-1.60.orig/lib/hw.c
-+++ net-tools-1.60/lib/hw.c
-@@ -2,7 +2,7 @@
-  * lib/hw.c   This file contains the top-level part of the hardware
-  *              support functions module.
-  *
-- * Version:     $Id: hw.c,v 1.17 2000/05/20 13:38:10 pb Exp $
-+ * Version:     $Id: hw.c,v 1.18 2001/11/12 02:12:05 ecki Exp $
-  *
-  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
-  *
-@@ -73,6 +73,8 @@
- 
- extern struct hwtype ec_hwtype;
- 
-+extern struct hwtype eui64_hwtype;
-+
- static struct hwtype *hwtypes[] =
- {
- 
-@@ -144,6 +146,9 @@
- #if HAVE_HWX25
-     &x25_hwtype,
- #endif
-+#if HAVE_HWEUI64
-+    &eui64_hwtype,
-+#endif
-     &unspec_hwtype,
-     NULL
- };
-@@ -217,6 +222,9 @@
- #if HAVE_HWEC
-     ec_hwtype.title = _("Econet");
- #endif
-+#if HAVE_HWEUI64
-+    eui64_hwtype.title = _("Generic EUI-64");
-+#endif
-     sVhwinit = 1;
- }
- 
---- net-tools-1.60.orig/lib/inet.c
-+++ net-tools-1.60/lib/inet.c
-@@ -3,7 +3,7 @@
-  *              support functions for the net-tools.
-  *              (NET-3 base distribution).
-  *
-- * Version:    $Id: inet.c,v 1.13 1999/12/11 13:35:56 freitag Exp $
-+ * Version:    $Id: inet.c,v 1.14 2003/10/19 11:57:37 pb Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -144,7 +144,7 @@
-     struct hostent *ent;
-     struct netent *np;
-     struct addr *pn;
--    unsigned long ad, host_ad;
-+    u_int32_t ad, host_ad;
-     int host = 0;
- 
-     /* Grmpf. -FvK */
-@@ -155,7 +155,7 @@
- 	errno = EAFNOSUPPORT;
- 	return (-1);
-     }
--    ad = (unsigned long) sin->sin_addr.s_addr;
-+    ad = sin->sin_addr.s_addr;
- #ifdef DEBUG
-     fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x \n", ad, netmask, numeric);
- #endif
---- net-tools-1.60.orig/lib/inet_sr.c
-+++ net-tools-1.60/lib/inet_sr.c
-@@ -3,6 +3,7 @@
-    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets
-    1999-10-07 - Kurt Garloff		 - for -host and gws: prefer host names
- 						over networks (or even reject)
-+   2003-10-11 - Maik Broemme		 - gcc 3.x warnign fixes (default: break;)
-  */
- 
- #include "config.h"
-@@ -104,7 +105,6 @@
-        isnet = 1; break;
-     case 2:
-        isnet = 0; break;
--    default:
-     }
- 
-     /* Fill in the other fields. */
---- net-tools-1.60.orig/lib/ipx.c
-+++ net-tools-1.60/lib/ipx.c
-@@ -133,6 +133,9 @@
-     char *ep;
-     int nbo;
- 
-+    if (!sai)
-+    	return (-1);
-+    	
-     sai->sipx_family = AF_IPX;
-     sai->sipx_network = htonl(0);
-     sai->sipx_node[0] = sai->sipx_node[1] = sai->sipx_node[2] =
---- net-tools-1.60.orig/lib/interface.c
-+++ net-tools-1.60/lib/interface.c
-@@ -7,7 +7,7 @@
-    8/2000  Andi Kleen make the list operations a bit more efficient.
-    People are crazy enough to use thousands of aliases now.
- 
--   $Id: interface.c,v 1.14 2001/02/10 19:31:15 pb Exp $
-+   $Id: interface.c,v 1.28 2003/05/29 02:09:14 ecki Exp $
-  */
- 
- #include "config.h"
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <ctype.h>
-+#include <string.h>
- 
- #if HAVE_AFIPX
- #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
-@@ -87,14 +88,20 @@
- 
- int ife_short;
- 
-+int if_list_all = 0;	/* do we have requested the complete proc list, yet? */
-+
- static struct interface *int_list, *int_last;
- 
- static int if_readlist_proc(char *);
- 
--static struct interface *add_interface(char *name)
-+static struct interface *if_cache_add(char *name)
- {
-     struct interface *ife, **nextp, *new;
- 
-+    if (!int_list)
-+    	int_last = NULL;
-+
-+    /* the cache is sorted, so if we hit a smaller if, exit */
-     for (ife = int_last; ife; ife = ife->prev) {
- 	    int n = nstrcmp(ife->name, name); 
- 	    if (n == 0) 
-@@ -104,7 +111,7 @@
-     }
-     new(new); 
-     safe_strncpy(new->name, name, IFNAMSIZ); 
--    nextp = ife ? &ife->next : &int_list;
-+    nextp = ife ? &ife->next : &int_list; // keep sorting
-     new->prev = ife;
-     new->next = *nextp; 
-     if (new->next) 
-@@ -117,19 +124,22 @@
- 
- struct interface *lookup_interface(char *name)
- {
--    struct interface *ife = NULL;
--
--    if (if_readlist_proc(name) < 0) 
--	    return NULL; 
--    ife = add_interface(name); 
--    return ife;
-+   /* if we have read all, use it */
-+   if (if_list_all)
-+   	return if_cache_add(name);
-+
-+   /* otherwise we read a limited list */
-+   if (if_readlist_proc(name) < 0)
-+   	return NULL;
-+ 
-+   return if_cache_add(name);
- }
- 
- int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie)
- {
-     struct interface *ife;
- 
--    if (!int_list && (if_readlist() < 0))
-+    if (!if_list_all && (if_readlist() < 0))
- 	return -1;
-     for (ife = int_list; ife; ife = ife->next) {
- 	int err = doit(ife, cookie);
-@@ -139,13 +149,15 @@
-     return 0;
- }
- 
--int free_interface_list(void)
-+int if_cache_free(void)
- {
-     struct interface *ife;
-     while ((ife = int_list) != NULL) {
- 	int_list = ife->next;
- 	free(ife);
-     }
-+    int_last = NULL;
-+    if_list_all = 0;
-     return 0;
- }
- 
-@@ -180,7 +192,7 @@
- 	}
- 	if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) {
- 	    /* assume it overflowed and try again */
--	    numreqs += 10;
-+	    numreqs *= 2;
- 	    continue;
- 	}
- 	break;
-@@ -188,7 +200,7 @@
- 
-     ifr = ifc.ifc_req;
-     for (n = 0; n < ifc.ifc_len; n += sizeof(struct ifreq)) {
--	add_interface(ifr->ifr_name);
-+	if_cache_add(ifr->ifr_name);
- 	ifr++;
-     }
-     err = 0;
-@@ -198,7 +210,7 @@
-     return err;
- }
- 
--static char *get_name(char *name, char *p)
-+char *get_name(char *name, char *p)
- {
-     while (isspace(*p))
- 	p++;
-@@ -206,16 +218,19 @@
- 	if (isspace(*p))
- 	    break;
- 	if (*p == ':') {	/* could be an alias */
--	    char *dot = p, *dotname = name;
--	    *name++ = *p++;
--	    while (isdigit(*p))
--		*name++ = *p++;
--	    if (*p != ':') {	/* it wasn't, backup */
--		p = dot;
--		name = dotname;
-+		char *dot = p++;
-+ 		while (*p && isdigit(*p)) p++;
-+		if (*p == ':') {
-+			/* Yes it is, backup and copy it. */
-+			p = dot;
-+			*name++ = *p++;
-+			while (*p && isdigit(*p)) {
-+				*name++ = *p++;
-+			}
-+		} else {
-+			/* No, it isn't */
-+			p = dot;
- 	    }
--	    if (*p == '\0')
--		return NULL;
- 	    p++;
- 	    break;
- 	}
-@@ -225,7 +240,7 @@
-     return p;
- }
- 
--static int procnetdev_version(char *buf)
-+int procnetdev_version(char *buf)
- {
-     if (strstr(buf, "compressed"))
- 	return 3;
-@@ -234,12 +249,12 @@
-     return 1;
- }
- 
--static int get_dev_fields(char *bp, struct interface *ife)
-+int get_dev_fields(char *bp, struct interface *ife)
- {
-     switch (procnetdev_vsn) {
-     case 3:
- 	sscanf(bp,
--	"%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu",
-+	"%Lu %Lu %lu %lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu %lu",
- 	       &ife->stats.rx_bytes,
- 	       &ife->stats.rx_packets,
- 	       &ife->stats.rx_errors,
-@@ -259,7 +274,7 @@
- 	       &ife->stats.tx_compressed);
- 	break;
-     case 2:
--	sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu",
-+	sscanf(bp, "%Lu %Lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu",
- 	       &ife->stats.rx_bytes,
- 	       &ife->stats.rx_packets,
- 	       &ife->stats.rx_errors,
-@@ -277,7 +292,7 @@
- 	ife->stats.rx_multicast = 0;
- 	break;
-     case 1:
--	sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu",
-+	sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu",
- 	       &ife->stats.rx_packets,
- 	       &ife->stats.rx_errors,
- 	       &ife->stats.rx_dropped,
-@@ -300,22 +315,16 @@
- 
- static int if_readlist_proc(char *target)
- {
--    static int proc_read; 
-     FILE *fh;
-     char buf[512];
-     struct interface *ife;
-     int err;
- 
--    if (proc_read) 
--	    return 0; 
--    if (!target) 
--	    proc_read = 1;
--
-     fh = fopen(_PATH_PROCNET_DEV, "r");
-     if (!fh) {
- 		fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"),
- 			_PATH_PROCNET_DEV, strerror(errno)); 
--		return if_readconf();
-+		return -2;
- 	}	
-     fgets(buf, sizeof buf, fh);	/* eat line */
-     fgets(buf, sizeof buf, fh);
-@@ -350,7 +359,7 @@
-     while (fgets(buf, sizeof buf, fh)) {
- 	char *s, name[IFNAMSIZ];
- 	s = get_name(name, buf);    
--	ife = add_interface(name);
-+	ife = if_cache_add(name);
- 	get_dev_fields(s, ife);
- 	ife->statistics_valid = 1;
- 	if (target && !strcmp(target,name))
-@@ -359,7 +368,6 @@
-     if (ferror(fh)) {
- 	perror(_PATH_PROCNET_DEV);
- 	err = -1;
--	proc_read = 0; 
-     }
- 
- #if 0
-@@ -371,9 +379,16 @@
- 
- int if_readlist(void) 
- { 
--    int err = if_readlist_proc(NULL); 
--    if (!err)
--	    err = if_readconf();
-+    /* caller will/should check not to call this too often 
-+     *   (i.e. only if if_list_all == 0 
-+     */
-+    int err = 0;
-+    
-+    err |= if_readlist_proc(NULL); 
-+    err |= if_readconf();
-+
-+    if_list_all = 1;
-+
-     return err;
- } 
- 
-@@ -579,11 +594,11 @@
- 
- void ife_print_short(struct interface *ptr)
- {
--    printf("%-5.5s ", ptr->name);
--    printf("%5d %3d", ptr->mtu, ptr->metric);
-+    printf("%-9s ", ptr->name);
-+    printf("%5d %-2d ", ptr->mtu, ptr->metric);
-     /* If needed, display the interface statistics. */
-     if (ptr->statistics_valid) {
--	printf("%8llu %6lu %6lu %6lu",
-+	printf("%8llu %6lu %6lu %-6lu ",
- 	       ptr->stats.rx_packets, ptr->stats.rx_errors,
- 	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors);
- 	printf("%8llu %6lu %6lu %6lu ",
-@@ -636,8 +651,8 @@
-     int hf;
-     int can_compress = 0;
-     unsigned long long rx, tx, short_rx, short_tx;
--    char Rext[5]="b";
--    char Text[5]="b";
-+    const char *Rext = "B";
-+    const char *Text = "B";
- 
- #if HAVE_AFIPX
-     static struct aftype *ipxtype = NULL;
-@@ -670,7 +685,7 @@
-     if (hw == NULL)
- 	hw = get_hwntype(-1);
- 
--    printf(_("%-9.9s Link encap:%s  "), ptr->name, hw->title);
-+    printf(_("%-9s Link encap:%s  "), ptr->name, hw->title);
-     /* For some hardware types (eg Ash, ATM) we don't print the 
-        hardware address if it's null.  */
-     if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
-@@ -843,10 +858,38 @@
- 	tx = ptr->stats.tx_bytes;
- 	short_rx = rx * 10;  
- 	short_tx = tx * 10;
--	if (rx > 1048576) { short_rx /= 1048576;  strcpy(Rext, "Mb"); }
--	else if (rx > 1024) { short_rx /= 1024;  strcpy(Rext, "Kb"); }
--	if (tx > 1048576) { short_tx /= 1048576;  strcpy(Text, "Mb"); }
--	else if (tx > 1024) { short_tx /= 1024;  strcpy(Text, "Kb"); }
-+	if (rx > 1125899906842624ull) {
-+	    short_rx /= 1125899906842624ull;
-+	    Rext = "PiB";
-+	} else if (rx > 1099511627776ull) {
-+	    short_rx /= 1099511627776ull;
-+	    Rext = "TiB";
-+	} else if (rx > 1073741824ull) {
-+	    short_rx /= 1073741824ull;
-+	    Rext = "GiB";
-+	} else if (rx > 1048576) {
-+	    short_rx /= 1048576;
-+	    Rext = "MiB";
-+	} else if (rx > 1024) {
-+	    short_rx /= 1024;
-+	    Rext = "KiB";
-+	}
-+	if (tx > 1125899906842624ull) {
-+	    short_tx /= 1125899906842624ull;
-+	    Text = "PiB";
-+	} else 	if (tx > 1099511627776ull) {
-+	    short_tx /= 1099511627776ull;
-+	    Text = "TiB";
-+	} else if (tx > 1073741824ull) {
-+	    short_tx /= 1073741824ull;
-+	    Text = "GiB";
-+	} else if (tx > 1048576) {
-+	    short_tx /= 1048576;
-+	    Text = "MiB";
-+	} else if (tx > 1024) {
-+	    short_tx /= 1024;
-+	    Text = "KiB";
-+	}
- 
- 	printf("          ");
- 	printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),
-@@ -867,7 +910,7 @@
-     }
- 
-     if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma ||
--	 ptr->map.base_addr)) {
-+	 ptr->map.base_addr >= 0x100)) {
- 	printf("          ");
- 	if (ptr->map.irq)
- 	    printf(_("Interrupt:%d "), ptr->map.irq);
---- net-tools-1.60.orig/lib/net-features.h
-+++ net-tools-1.60/lib/net-features.h
-@@ -295,6 +295,13 @@
- "-"
- #endif
- "HDLC/LAPB "
-+
-+#if HAVE_HWEUI64
-+"+"
-+#else
-+"-"
-+#endif
-+"EUI64 "
- ;
- 
- 
---- net-tools-1.60.orig/lib/nstrcmp.c
-+++ net-tools-1.60/lib/nstrcmp.c
-@@ -1,34 +1,157 @@
- /* Copyright 1998 by Andi Kleen. Subject to the GPL. */
--/* $Id: nstrcmp.c,v 1.2 1998/11/15 20:11:38 freitag Exp $ */ 
-+/* rewritten by bernd eckenfels because of complicated alias semantic */
-+/* $Id: nstrcmp.c,v 1.4 2004/06/03 22:49:17 ecki Exp $ */ 
- #include <ctype.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "util.h"
- 
--/* like strcmp(), but knows about numbers */
--int nstrcmp(const char *astr, const char *b)
-+
-+/* return numerical :999 suffix or null. sideeffect: replace ':' with \0 */
-+char* cutalias(char* name)
- {
--    const char *a = astr;
-+	int digit = 0;
-+	int pos;
-+	
-+	for(pos=strlen(name); pos>0; pos--)
-+	{
-+		if (name[pos-1]==':' && digit)
-+		{
-+			name[pos-1]='\0';
-+			return name+pos;
-+		}
-+		if (!isdigit(name[pos-1]))
-+			break;
-+		digit = 1;
-+	}
-+	return NULL;
-+}
- 
--    while (*a == *b) {
--	if (*a == '\0')
--	    return 0;
--	a++;
--	b++;
--    }
--    if (isdigit(*a)) {
--	if (!isdigit(*b))
--	    return -1;
--	while (a > astr) {
--	    a--;
--	    if (!isdigit(*a)) {
--		a++;
--		break;
--	    }
--	    if (!isdigit(*b))
--		return -1;
--	    b--;
-+
-+/* return index of last non digit or -1 if it does not end with digits */
-+int rindex_nondigit(char *name)
-+{
-+	int pos = strlen(name);
-+
-+	for(pos=strlen(name); pos>0; pos--)
-+	{
-+		if (!isdigit(name[pos-1]))
-+			return pos;
- 	}
--	return atoi(a) > atoi(b) ? 1 : -1;
--    }
--    return *a - *b;
-+	return 0;
-+}
-+
-+
-+/* like strcmp(), but knows about numbers and ':' alias suffix */
-+int nstrcmp(const char *ap, const char *bp)
-+{
-+	char *a = (char*)strdup(ap);
-+	char *b = (char*)strdup(bp);
-+	char *an, *bn;
-+	int av = 0, bv = 0;
-+	char *aalias=cutalias(a);
-+	char *balias=cutalias(b);
-+	int aindex=rindex_nondigit(a);
-+	int bindex=rindex_nondigit(b);
-+	int complen=(aindex<bindex)?aindex:bindex;
-+	int res = strncmp(a, b, complen);
-+
-+	if (res != 0)
-+		{ free(a); free(b); return res; }
-+		
-+	if (aindex > bindex)
-+		{ free(a); free(b); return 1; }
-+		
-+	if (aindex < bindex)
-+		{ free(a); free(b); return -1; }
-+		
-+	an = a+aindex;
-+	bn = b+bindex;
-+	
-+	av = atoi(an);
-+	bv = atoi(bn);
-+	
-+	if (av < bv)
-+		{ free(a); free(b); return -1; }
-+		
-+	if (av > bv)
-+		{ free(a); free(b); return 1; }
-+		
-+	av = -1;
-+	if (aalias != NULL)
-+		av = atoi(aalias);
-+	
-+	bv = -1;
-+	if (balias != NULL)
-+		bv = atoi(balias);
-+	
-+	free(a); free(b);
-+	
-+	if (av < bv)
-+		return -1;
-+		
-+	if (av > bv)
-+		return 1;
-+		
-+	return 0;
-+}
-+
-+
-+#ifdef NSTRCMP_TEST
-+
-+int cs(int s)
-+{
-+	if (s < 0) return -1;
-+	if (s > 0) return 1;
-+	return 0;
-+}
-+
-+
-+int dotest(char* a, char* b, int exp)
-+{
-+	int res = nstrcmp(a, b);
-+	int err = (cs(res) != cs(exp));
-+	printf("nstrcmp(\"%s\", \"%s\")=%d %d %s\n", a, b, res, exp, err?"WRONG":"OK");
-+	return err;
- }
-+
-+int main()
-+{
-+	int err = 0;
-+	
-+	err |= dotest("eth1", "eth1", 0);
-+	err |= dotest("eth0:1", "eth0:1", 0);
-+	err |= dotest("lan", "lan", 0);
-+	err |= dotest("100", "100", 0);
-+	err |= dotest("", "", 0);
-+	err |= dotest(":", ":", 0);
-+	err |= dotest("a:b:c", "a:b:c", 0);
-+	err |= dotest("a:", "a:", 0);
-+	err |= dotest(":a", ":a", 0);
-+
-+	err |= dotest("a", "aa", -1);	
-+	err |= dotest("eth0", "eth1", -1);
-+	err |= dotest("eth1", "eth20", -1);
-+	err |= dotest("eth20", "eth100", -1);
-+	err |= dotest("eth1", "eth13", -1);
-+	err |= dotest("eth", "eth2", -1);
-+	err |= dotest("eth0:1", "eth0:2", -1);
-+	err |= dotest("eth1:10", "eth13:10", -1);
-+	err |= dotest("eth1:1", "eth1:13", -1);
-+	err |= dotest("a", "a:", -1);
-+	
-+	err |= dotest("aa", "a", 1);
-+	err |= dotest("eth2", "eth1", 1);
-+	err |= dotest("eth13", "eth1", 1);	
-+	err |= dotest("eth2", "eth", 1);
-+	err |= dotest("eth2:10", "eth2:1", 1);
-+	err |= dotest("eth2:5", "eth2:4", 1);
-+	err |= dotest("eth3:2", "eth2:3", 1);
-+	err |= dotest("eth13:1", "eth1:0", 1);
-+	err |= dotest("a:", "a", 1);
-+	err |= dotest("a1b12", "a1b2", 1);
-+
-+	return err;
-+}
-+
-+#endif
---- net-tools-1.60.orig/lib/pathnames.h
-+++ net-tools-1.60/lib/pathnames.h
-@@ -1,4 +1,3 @@
--
- /*
-  * lib/pathnames.h    This file contains the definitions of the path 
-  *                      names used by the NET-LIB.
-@@ -29,8 +28,10 @@
- #define _PATH_PROCNET_NR_NODES		"/proc/net/nr_nodes"
- #define _PATH_PROCNET_ARP		"/proc/net/arp"
- #define _PATH_PROCNET_AX25		"/proc/net/ax25"
--#define _PATH_PROCNET_IPX		"/proc/net/ipx"
--#define _PATH_PROCNET_IPX_ROUTE		"/proc/net/ipx_route"
-+#define _PATH_PROCNET_IPX_SOCKET1	"/proc/net/ipx/socket"
-+#define _PATH_PROCNET_IPX_SOCKET2	"/proc/net/ipx"
-+#define _PATH_PROCNET_IPX_ROUTE1	"/proc/net/ipx/route"
-+#define _PATH_PROCNET_IPX_ROUTE2	"/proc/net/ipx_route"
- #define _PATH_PROCNET_ATALK		"/proc/net/appletalk"
- #define _PATH_PROCNET_IP_BLK		"/proc/net/ip_block"
- #define _PATH_PROCNET_IP_FWD		"/proc/net/ip_forward"
-@@ -45,6 +46,7 @@
- #define _PATH_PROCNET_X25              "/proc/net/x25"
- #define _PATH_PROCNET_X25_ROUTE                "/proc/net/x25_routes"
- #define _PATH_PROCNET_DEV_MCAST		"/proc/net/dev_mcast"
-+#define _PATH_PROCNET_ATALK_ROUTE	"/proc/net/atalk_route"
- 
- /* pathname for the netlink device */
- #define _PATH_DEV_ROUTE	"/dev/route"
---- net-tools-1.60.orig/lib/tr.c
-+++ net-tools-1.60/lib/tr.c
-@@ -2,7 +2,7 @@
-  * lib/tr.c   This file contains an implementation of the "Tokenring"
-  *              support functions.
-  *
-- * Version:     $Id: tr.c,v 1.8 2000/02/02 08:56:30 freitag Exp $
-+ * Version:     $Id: tr.c,v 1.9 2005/05/16 03:15:12 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -30,8 +30,14 @@
- #include "net-support.h"
- #include "pathnames.h"
- #include "intl.h"
-+#include "util.h"
- 
-+
-+/* actual definition at the end of file */
- extern struct hwtype tr_hwtype;
-+#ifdef ARPHRD_IEEE802_TR
-+extern struct hwtype tr_hwtype1;
-+#endif
- 
- static char *pr_tr(unsigned char *ptr)
- {
-@@ -42,7 +48,7 @@
- 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
- 	);
-     return (buff);
--}
-+      }
- 
- 
- static int in_tr(char *bufp, struct sockaddr *sap)
-@@ -51,7 +57,17 @@
-     char c, *orig;
-     int i, val;
- 
-+#ifdef ARPHRD_IEEE802_TR
-+    if (kernel_version() < KRELEASE(2,3,30)) { 
-+        sap->sa_family = tr_hwtype.type;
-+    } else { 
-+        sap->sa_family = tr_hwtype1.type;
-+    } 	
-+#else
-     sap->sa_family = tr_hwtype.type;
-+    #warning "Limited functionality, no support for ARPHRD_IEEE802_TR (old kernel headers?)"
-+#endif
-+
-     ptr = sap->sa_data;
- 
-     i = 0;
---- net-tools-1.60.orig/lib/util.h
-+++ net-tools-1.60/lib/util.h
-@@ -14,3 +14,6 @@
- 
- char *safe_strncpy(char *dst, const char *src, size_t size); 
- 
-+
-+#define netmin(a,b) ((a)<(b) ? (a) : (b))
-+#define netmax(a,b) ((a)>(b) ? (a) : (b))
---- net-tools-1.60.orig/lib/irda.c
-+++ net-tools-1.60/lib/irda.c
-@@ -1,13 +1,15 @@
- /*********************************************************************
-  *                
-  * Filename:      irda.c
-- * Version:       0.1
-- * Description:   A first attempt to make ifconfig understand IrDA
-+ * Version:       0.2
-+ * Description:   A second attempt to make ifconfig understand IrDA
-  * Status:        Experimental.
-  * Author:        Dag Brattli <dagb@cs.uit.no>
-  * Created at:    Wed Apr 21 09:03:09 1999
-  * Modified at:   Wed Apr 21 09:17:05 1999
-  * Modified by:   Dag Brattli <dagb@cs.uit.no>
-+ * Modified at:   Wed May  1 11:51:44 CEST 2002
-+ * Modified by:   Christoph Bartelmus <christoph@bartelmus.de>
-  * 
-  *     This program is free software; you can redistribute it and/or 
-  *     modify it under the terms of the GNU General Public License as 
-@@ -59,9 +61,9 @@
-  */
- static char *irda_print(unsigned char *ptr)
- {
--    static char buff[8];
-+    static char buff[12];
- 
--    sprintf(&buff[strlen(buff)], "%02x:%02x:%02x:%02x", ptr[3], ptr[2], 
-+    snprintf(buff, 12, "%02x:%02x:%02x:%02x", ptr[3], ptr[2], 
- 	    ptr[1], ptr[0]);
- 
-     return (buff);
---- net-tools-1.60.orig/lib/x25_sr.c
-+++ net-tools-1.60/lib/x25_sr.c
-@@ -67,7 +67,7 @@
-   strcpy(target, *args++);
- 
-   /* Clean out the x25_route_struct structure. */
--  memset((char *) &rt, 0, sizeof(struct x25_route_struct));
-+  memset((char *) &rt, 0, sizeof(rt));
- 
- 
-   if ((sigdigits = x25_aftype.input(0, target, (struct sockaddr *)&sx25)) < 0) {
-@@ -76,8 +76,8 @@
-   }
-   rt.sigdigits=sigdigits;
- 
--  /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
--  memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
-+  /* this works with 2.4 and 2.6 headers struct x25_address vs. typedef */
-+  memcpy(&rt.address, &sx25.sx25_addr, sizeof(sx25.sx25_addr));
- 
-   while (*args) {
- 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
---- net-tools-1.60.orig/lib/eui64.c
-+++ net-tools-1.60/lib/eui64.c
-@@ -0,0 +1,155 @@
-+/*
-+ * lib/eui64.c  This file contains support for generic EUI-64 hw addressing
-+ *
-+ * Version:     $Id: eui64.c,v 1.1 2001/11/12 02:12:05 ecki Exp $
-+ *
-+ * Author:      Daniel Stodden <stodden@in.tum.de>
-+ *              Copyright 2001 Daniel Stodden
-+ *
-+ *              blueprinted from ether.c 
-+ *              Copyright 1993 MicroWalt Corporation
-+ *
-+ *              This program is free software; you can redistribute it
-+ *              and/or  modify it under  the terms of  the GNU General
-+ *              Public  License as  published  by  the  Free  Software
-+ *              Foundation;  either  version 2 of the License, or  (at
-+ *              your option) any later version.
-+ */
-+#include "config.h"
-+
-+#if HAVE_HWEUI64
-+
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <sys/socket.h>
-+#include <net/if_arp.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <string.h>
-+#include <termios.h>
-+#include <unistd.h>
-+#include "net-support.h"
-+#include "pathnames.h"
-+#include "intl.h"
-+
-+/*
-+ * EUI-64 constants
-+ */
-+
-+#define EUI64_ALEN	8
-+
-+#ifndef ARPHRD_EUI64
-+#define ARPHRD_EUI64	27
-+#warning "ARPHRD_EUI64 not defined in <net/if_arp.h>. Using private value 27"
-+#endif
-+
-+struct hwtype eui64_hwtype;
-+
-+/* Display an EUI-64 address in readable format. */
-+static char *pr_eui64( unsigned char *ptr )
-+{
-+	static char buff[64];
-+
-+	snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
-+		 (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), (ptr[3] & 0377), 
-+		 (ptr[4] & 0377), (ptr[5] & 0377), (ptr[6] & 0377), (ptr[7] & 0377)
-+		);
-+	return (buff);
-+}
-+
-+/* Start the PPP encapsulation on the file descriptor. */
-+static int in_eui64( char *bufp, struct sockaddr *sap )
-+{
-+	unsigned char *ptr;
-+	char c, *orig;
-+	int i;
-+	unsigned val;
-+
-+	sap->sa_family = eui64_hwtype.type;
-+	ptr = sap->sa_data;
-+
-+	i = 0;
-+	orig = bufp;
-+	
-+	while ((*bufp != '\0') && (i < EUI64_ALEN)) {
-+		val = 0;
-+		c = *bufp++;
-+		if (isdigit(c))
-+			val = c - '0';
-+		else if (c >= 'a' && c <= 'f')
-+			val = c - 'a' + 10;
-+		else if (c >= 'A' && c <= 'F')
-+			val = c - 'A' + 10;
-+		else {
-+#ifdef DEBUG
-+			fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), 
-+				 orig );
-+#endif
-+			errno = EINVAL;
-+			return (-1);
-+		}
-+
-+		val <<= 4;
-+		c = *bufp;
-+		if (isdigit(c))
-+			val |= c - '0';
-+		else if (c >= 'a' && c <= 'f')
-+			val |= c - 'a' + 10;
-+		else if (c >= 'A' && c <= 'F')
-+			val |= c - 'A' + 10;
-+		else if (c == ':' || c == 0)
-+			val >>= 4;
-+		else {
-+#ifdef DEBUG
-+			fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), 
-+				 orig );
-+#endif
-+			errno = EINVAL;
-+			return (-1);
-+		}
-+
-+		if (c != 0)
-+			bufp++;
-+
-+		*ptr++ = (unsigned char) (val & 0377);
-+		i++;
-+		
-+		/* We might get a semicolon here - not required. */
-+		if (*bufp == ':') {
-+			if (i == EUI64_ALEN) {
-+#ifdef DEBUG
-+				fprintf(stderr, _("in_eui64(%s): trailing : ignored!\n"),
-+					orig)
-+#endif
-+					; /* nothing */
-+			}
-+			bufp++;
-+		}
-+	}
-+
-+	/* That's it.  Any trailing junk? */
-+	if ((i == EUI64_ALEN) && (*bufp != '\0')) {
-+#ifdef DEBUG
-+		fprintf(stderr, _("in_eui64(%s): trailing junk!\n"), orig);
-+		errno = EINVAL;
-+		return (-1);
-+#endif
-+	}
-+#ifdef DEBUG
-+	fprintf(stderr, "in_eui64(%s): %s\n", orig, pr_eui64(sap->sa_data));
-+#endif
-+
-+    return (0);
-+}
-+
-+struct hwtype eui64_hwtype =
-+{
-+	"eui64", NULL, /*"EUI-64 addressing", */ ARPHRD_EUI64, EUI64_ALEN,
-+	pr_eui64, in_eui64, NULL, 0
-+};
-+
-+
-+#endif				/* HAVE_EUI64 */
---- net-tools-1.60.orig/rarp.c
-+++ net-tools-1.60/rarp.c
-@@ -3,7 +3,7 @@
-  *              that maintains the kernel's RARP cache.  It is derived
-  *              from Fred N. van Kempen's arp command.
-  *
-- * Version:	$Id: rarp.c,v 1.6 2001/04/08 17:05:05 pb Exp $
-+ * Version:	$Id: rarp.c,v 1.9 2007/12/02 02:19:52 ecki Exp $
-  *
-  * Usage:       rarp -d hostname                      Delete entry
-  *              rarp -s hostname ethernet_address     Add entry
-@@ -40,6 +40,7 @@
- #include "net-support.h"
- #include "version.h"
- #include "pathnames.h"
-+#include "proc.h"
- 
- static char no_rarp_message[] = N_("This kernel does not support RARP.\n");
- 
-@@ -154,7 +155,7 @@
- 
- static int display_cache(void)
- {
--    FILE *fd = fopen(_PATH_PROCNET_RARP, "r");
-+    FILE *fd = proc_fopen(_PATH_PROCNET_RARP);
-     char buffer[256];
-     if (fd == NULL) {
- 	if (errno == ENOENT)
---- net-tools-1.60.orig/slattach.c
-+++ net-tools-1.60/slattach.c
-@@ -73,7 +73,7 @@
- 
- 
- const char *Release = RELEASE,
--	   *Version = "@(#) slattach 1.21 (1999-11-21)",
-+	   *Version = "$Id: slattach.c,v 1.11 2005/12/04 05:15:36 ecki Exp $",
- 	   *Signature = "net-tools, Fred N. van Kempen et al.";
- 
- 
-@@ -115,7 +115,7 @@
- int		opt_k = 0;		/* "keepalive" value		*/
- #endif
- int		opt_l = 0;		/* "lock it" flag		*/
--int		opt_L = 0;		/* clocal flag			*/
-+int		opt_L = 0;		/* 3-wire mode flag		*/
- int		opt_m = 0;		/* "set RAW mode" flag		*/
- int		opt_n = 0;		/* "set No Mesg" flag		*/
- #ifdef SIOCSOUTFILL
-@@ -342,9 +342,11 @@
-   tty->c_oflag = (0);				/* output flags		*/
-   tty->c_lflag = (0);				/* local flags		*/
-   speed = (tty->c_cflag & CBAUD);		/* save current speed	*/
--  tty->c_cflag = (CRTSCTS | HUPCL | CREAD);	/* UART flags		*/
-+  tty->c_cflag = (HUPCL | CREAD);		/* UART flags		*/
-   if (opt_L) 
- 	tty->c_cflag |= CLOCAL;
-+  else
-+	tty->c_cflag |= CRTSCTS;
-   tty->c_cflag |= speed;			/* restore speed	*/
-   return(0);
- }
---- net-tools-1.60.orig/include/util-ank.h
-+++ net-tools-1.60/include/util-ank.h
-@@ -75,6 +75,6 @@
- extern int do_class(int argc, char **argv);
- extern int do_filter(int argc, char **argv);
- 
--extern const char *format_host(int af, void *addr, __u8 *abuf, int alen);
-+extern const char *format_host(int af, void *addr, char *abuf, int alen);
- 
- #endif /* __UTILS_H__ */
---- net-tools-1.60.orig/include/interface.h
-+++ net-tools-1.60/include/interface.h
-@@ -64,13 +64,17 @@
- extern int if_fetch(struct interface *ife);
- 
- extern int for_all_interfaces(int (*)(struct interface *, void *), void *);
--extern int free_interface_list(void);
-+extern int if_cache_free(void);
- extern struct interface *lookup_interface(char *name);
- extern int if_readlist(void);
- 
- extern int do_if_fetch(struct interface *ife);
- extern int do_if_print(struct interface *ife, void *cookie);
- 
-+extern int    procnetdev_version(char *buf);
-+extern int    get_dev_fields(char *bp, struct interface *ife);
-+extern char * get_name(char *name, char *p);
-+
- extern void ife_print(struct interface *ptr);
- 
- extern int ife_short;
---- net-tools-1.60.orig/include/mii.h
-+++ net-tools-1.60/include/mii.h
-@@ -6,11 +6,14 @@
-  * Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
-  */
- 
--#ifndef _LINUX_MII_H
--#define _LINUX_MII_H
-+#ifndef _NETTOOL_MII_H
-+#define _NETTOOLS_MII_H
-+
-+#include <linux/sockios.h>
- 
- /* network interface ioctl's for MII commands */
- #ifndef SIOCGMIIPHY
-+#warning "SIOCGMIIPHY is not defined by your kernel source"
- #define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */
- #define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */
- #define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */
-@@ -38,6 +41,7 @@
- #define  MII_BMCR_RESTART	0x0200
- #define  MII_BMCR_DUPLEX	0x0100
- #define  MII_BMCR_COLTEST	0x0080
-+#define  MII_BMCR_SPEED1000	0x0040
- 
- /* Basic Mode Status Register */
- #define MII_BMSR		0x01
-@@ -83,4 +87,17 @@
- #define  MII_ANER_PAGE_RX	0x0002
- #define  MII_ANER_LP_AN_ABLE	0x0001
- 
--#endif /* _LINUX_MII_H */
-+#define MII_CTRL1000		0x09
-+#define   MII_BMCR2_1000FULL	0x0200
-+#define   MII_BMCR2_1000HALF	0x0100
-+
-+#define MII_STAT1000		0x0a
-+#define   MII_LPA2_1000LOCALOK  0x2000
-+#define   MII_LPA2_1000REMRXOK	0x1000
-+#define   MII_LPA2_1000FULL	0x0800
-+#define   MII_LPA2_1000HALF	0x0400
-+
-+/* Last register we need for show_basic_mii() */
-+#define MII_BASIC_MAX          (MII_STAT1000+1)
-+
-+#endif /* _NETTOOLS_MII_H */
---- net-tools-1.60.orig/man/en_US/rarp.8
-+++ net-tools-1.60/man/en_US/rarp.8
-@@ -61,8 +61,8 @@
- Create a RARP address mapping entry for host
- .B hostname
- with hardware address set to
--.B hw_addr
--.  The format of the hardware address is dependent on the hardware
-+.BR hw_addr .
-+The format of the hardware address is dependent on the hardware
- class, but for most classes one can assume that the usual presentation
- can be used.  For the Ethernet class, this is 6 bytes in hexadecimal,
- separated by colons.
---- net-tools-1.60.orig/man/en_US/arp.8
-+++ net-tools-1.60/man/en_US/arp.8
-@@ -1,56 +1,111 @@
--.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual"
-+.TH ARP 8 "2007-12-01" "net-tools" "Linux Programmer's Manual"
- .SH NAME
- arp \- manipulate the system ARP cache
- .SH SYNOPSIS
- .B arp 
- .RB [ \-vn ] 
--.RB [ "\-H type" ] 
--.RB [ "-i if" ] 
--.B -a 
--.RB [ hostname ]
-+.RB [ \-H 
-+.IR type ] 
-+.RB [ \-i
-+.IR if ] 
-+.RB [ \-a ] 
-+.RI [ hostname ]
- .PP
- .B arp 
- .RB [ \-v ]
--.RB [ "\-i if" ] 
--.B "\-d hostname"
-+.RB [ \-i
-+.IR if ] 
-+.B \-d 
-+.I hostname
- .RB [ pub ]
- .PP
- .B arp 
- .RB [ \-v ] 
--.RB [ "\-H type" ] 
--.RB [ "\-i if" ] 
--.B -s hostname hw_addr
-+.RB [ \-H
-+.IR type ] 
-+.RB [ \-i
-+.IR if ] 
-+.B \-s
-+.I hostname hw_addr
- .RB [ temp ] 
- .PP
- .B arp 
- .RB [ \-v ] 
--.RB [ "\-H type" ] 
--.RB [ "\-i if" ] 
--.B -s hostname hw_addr
--.RB [ "netmask nm" ] 
-+.RB [ \-H
-+.IR type ] 
-+.RB [ \-i
-+.IR if ] 
-+.B \-s
-+.I hostname hw_addr
-+.RB [ netmask
-+.IR nm ] 
- .B pub
- .PP
- .B arp 
- .RB [ \-v ] 
--.RB [ "\-H type" ] 
--.RB [ "\-i if" ] 
--.B -Ds hostname ifa
--.RB [ "netmask nm" ] 
-+.RB [ \-H
-+.IR type ] 
-+.RB [ \-i
-+.IR if ] 
-+.B \-Ds 
-+.I hostname
-+.I ifname
-+.RB [ netmask
-+.IR nm ] 
- .B pub
- .PP
- .B arp 
- .RB [ \-vnD ]
--.RB [ "\-H type" ] 
--.RB [ "-i if" ]
--.B -f [filename]
-+.RB [ \-H 
-+.IR type ] 
-+.RB [ \-i
-+.IR if ]
-+.B \-f 
-+.RI [ filename ]
- 
- .SH DESCRIPTION
- .B Arp
--manipulates the kernel's ARP cache in various ways.  The primary options
--are clearing an address mapping entry and manually setting up one.  For
--debugging purposes, the
-+manipulates or displays the kernel's IPv4 network neighbour cache. It can add
-+entries to the table, delete one or display the current content.
-+
-+.B ARP
-+stands for Address Resolution Protocol, which is used to find the media
-+access control address of a network neighbour for a given IPv4 Address.
-+.SH MODES
- .B arp
--program also allows a complete dump of the ARP cache.
-+with no mode specifier will print the current content of the table. It is
-+possible to limit the number of entries printed, by specifying an hardware
-+address type, interface name or host address.
-+
-+.B arp -d
-+.I address
-+will delete a ARP table entry. Root or netadmin priveledge is required to do
-+this. The entry is found by IP address. If a hostname is given, it will be
-+resolved before looking up the entry in the ARP table.
-+
-+.B arp -s
-+.I address hw_addr
-+is used to set up a new table entry. The format of the 
-+.I hw_addr
-+parameter is dependent on the hardware class, but for most classes one can
-+assume that the usual presentation can be used.  For the Ethernet class,
-+this is 6 bytes in hexadecimal, separated by colons. When adding proxy arp
-+entries (that is those with the
-+.BR pub lish 
-+flag set a 
-+.B netmask 
-+may be specified to proxy arp for entire subnets. This is not good
-+practice, but is supported by older kernels because it can be
-+useful. If the
-+.B temp
-+flag is not supplied entries will be permanent stored into the ARP
-+cache. To simplyfy setting up entries for one of your own network interfaces, you can use the
-+.B "arp \-Ds"
-+.I address ifname
-+form. In that case the hardware address is taken from the interface with the
-+specified name.
-+
-+.br
- .SH OPTIONS
- .TP
- .B "\-v, \-\-verbose"
-@@ -76,21 +131,13 @@
- and
- .RB "NET/ROM (" netrom ")."
- .TP
--.B "\-a [hostname], \-\-display [hostname]"
--Shows the entries of the specified hosts.  If the
--.B hostname
--parameter is not used,
--.B all
--entries will be displayed.
--.TP
--.B "\-d hostname, \-\-delete hostname"
--Remove any entry for the specified host.  This can be used if the
--indicated host is brought down, for example.
-+.B \-a
-+Use alternate BSD style output format (with no fixed columns).
- .TP
- .B "\-D, \-\-use-device"
--Use the interface
--.BR ifa "'s"
--hardware address.
-+Instead of a hw_addr, the given argument is the name of an interface. 
-+.B arp
-+will use the MAC address of that interface for the table entry. This is usually the best option to set up a proxy ARP entry to yourself.
- .TP
- .B "\-i If, \-\-device If"
- Select an interface. When dumping the ARP cache only entries matching
-@@ -106,33 +153,15 @@
- .B NOTE:
- This has to be different from the interface to which the IP
- datagrams will be routed.
--.TP
--.B "\-s hostname hw_addr, \-\-set hostname"
--Manually create an ARP address mapping entry for host
--.B hostname
--with hardware address set to
--.B hw_addr
--.  The format of the hardware address is dependent on the hardware
--class, but for most classes one can assume that the usual presentation
--can be used.  For the Ethernet class, this is 6 bytes in hexadecimal,
--separated by colons. When adding proxy arp entries (that is those with
--the 
--.BR pub lish 
--flag set a 
--.B netmask 
--may be specified to proxy arp for entire subnets. This is not good
--practice, but is supported by older kernels because it can be
--useful. If the
--.B temp
--flag is not supplied entries will be permanent stored into the ARP
--cache.
--.br
- .B NOTE:
- As of kernel 2.2.0 it is no longer possible to set an ARP entry for an 
- entire subnet. Linux instead does automagic proxy arp when a route
- exists and it is forwarding. See 
- .BR arp (7)
--for details.
-+for details. Also the
-+.B dontpub
-+option which is available for delete and set operations cannot be 
-+used with 2.4 and newer kernels.
- .TP
- .B "\-f filename, \-\-file filename"
- Similar to the
-@@ -167,8 +196,18 @@
- and published entries have the
- .B P
- flag.
-+.SH EXSAMPLES
-+.B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub
-+
-+This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for
-+eth1.
-+
-+.B /usr/sbin/arp -i eth1 -d 10.0.0.1
-+
-+Delete the ARP table entry for 10.0.0.1 on interface eth1. This will match
-+published proxy ARP entries and permanent entries.
- .SH FILES
--.I /proc/net/arp,
-+.I /proc/net/arp
- .br
- .I /etc/networks
- .br
-@@ -178,5 +217,4 @@
- .SH SEE ALSO
- rarp(8), route(8), ifconfig(8), netstat(8)
- .SH AUTHORS
--Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> with a lot of improvements
--from net-tools Maintainer Bernd Eckenfels <net-tools@lina.inka.de>.
-+Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net-tools@lina.inka.de>.
---- net-tools-1.60.orig/man/en_US/ethers.5
-+++ net-tools-1.60/man/en_US/ethers.5
-@@ -1,4 +1,4 @@
--.TH ETHERS 5 "April 26th, 1996" "" "File formats"
-+.TH ETHERS 5 "May 15th, 2005" "" "File formats"
- .SH NAME \"{{{roff}}}\"{{{
- ethers \- Ethernet address to IP number database
- .\"}}}
-@@ -10,8 +10,8 @@
- \fIEthernet-address\fP  \fIIP-number\fP
- .RE
- .sp
--The two items are separated by any number of SPACE and/or TAB char
--acters.   A \fB#\fP at the beginning of a line starts a comment
-+The two items are separated by any number of SPACE and/or TAB characters.
-+A \fB#\fP at the beginning of a line starts a comment
- which extends to the end of the line.  The \fIEthernet-address\fP is
- written as
- .IR x : x : x : x : x : x ,
---- net-tools-1.60.orig/man/en_US/ifconfig.8
-+++ net-tools-1.60/man/en_US/ifconfig.8
-@@ -1,10 +1,10 @@
--.TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual"
-+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
- .SH NAME
- ifconfig \- configure a network interface
- .SH SYNOPSIS
--.B "ifconfig [interface]"
-+.B "ifconfig [-v] [-a] [-s] [interface]"
- .br
--.B "ifconfig interface [aftype] options | address ..."
-+.B "ifconfig [-v] interface [aftype] options | address ..."
- .SH DESCRIPTION
- .B Ifconfig
- is used to configure the kernel-resident network interfaces.  It is
-@@ -41,11 +41,27 @@
- (AMPR Packet radio).
- .SH OPTIONS
- .TP
-+.B -a
-+display all interfaces which are currently available, even if down
-+.TP
-+.B -s
-+display a short list (like netstat -i)
-+.TP
-+.B -v
-+be more verbose for some error conditions
-+.TP
- .B interface
- The name of the interface.  This is usually a driver name followed by
- a unit number, for example
- .B eth0
--for the first Ethernet interface.
-+for the first Ethernet interface. If your kernel supports alias interfaces,
-+you can specify them with 
-+.B eth0:0
-+for the first alias of eth0. You can use them to assign a second address. To
-+delete an alias interface use
-+.BR "ifconfig eth0:0 down" .
-+Note: for every scope (i.e. same net with address/netmask combination) all
-+aliases are deleted, if you delete the first (primary).
- .TP
- .B up
- This flag causes the interface to be activated.  It is implicitly
-@@ -173,11 +189,20 @@
- are shared with all alias addresses on the same device. If you want per-address
- statistics you should add explicit accounting
- rules for the address using the 
--.BR ipchains(8)
-+.BR ipchains (8)
-+or
-+.BR iptables (8)
- command.
- .LP
--Interrupt problems with Ethernet device drivers fail with EAGAIN. See
--.I http://cesdis.gsfc.nasa.gov/linux/misc/irq-conflict.html
-+Since net-tools 1.60-4 ifconfig is printing byte counters and human readable
-+counters with IEC 60027-2 units. So 1 KiB are 2^10 byte. Note, the numbers 
-+are truncated to one decimal (which can by quite a large error if you 
-+consider 0.1 PiB is 112.589.990.684.262 bytes :)
-+.LP
-+Interrupt problems with Ethernet device drivers fail with EAGAIN
-+.I (SIOCSIIFLAGS: Resource temporarily unavailable)
-+it is most likely a interrupt conflict. See
-+.I http://www.scyld.com/expert/irq-conflict.html
- for more information.
- .SH FILES
- .I /proc/net/socket 
-@@ -189,7 +214,9 @@
- While appletalk DDP and IPX addresses will be displayed they cannot be
- altered by this command.
- .SH SEE ALSO
--route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
-+.br
-+http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples
- .SH AUTHORS
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- .br
-@@ -198,3 +225,5 @@
- Phil Blundell, <Philip.Blundell@pobox.com>
- .br
- Andi Kleen
-+.br
-+Bernd Eckenfels, <net-tools@lina.inka.de>
---- net-tools-1.60.orig/man/en_US/netstat.8
-+++ net-tools-1.60/man/en_US/netstat.8
-@@ -8,7 +8,7 @@
- .\" Modified: Tuan Hoang tqhoang@bigfoot.com 
- .\"
- .\"
--.TH NETSTAT 8 "19 December 2000" "net-tools" "Linux Programmer's Manual"
-+.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
- 
- .SH NAME
- netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships
-@@ -23,7 +23,7 @@
- .RB [ \-\-listening | \-l ]
- .RB [ \-\-all | \-a ]
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
- .RB [ \-\-symbolic | \-N ]
- .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
- .RB [ \-\-timers | \-o ]
-@@ -37,31 +37,30 @@
- .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
- .RB [ \-\-verbose | \-v ]
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
- .RB [ \-\-continuous | \-c]
- .P
- .B netstat
- .RB { \-\-interfaces | \-i }
--.RI [ iface ]
- .RB [ \-\-all | \-a ]
- .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
- .RB [ \-\-verbose | \-v ]
- .RB [ \-\-program | \-p ]
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
- .RB [ \-\-continuous | \-c]
- .P
- .B netstat
- .RB { \-\-groups | \-g }
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
- .RB [ \-\-continuous | \-c]
- .P
- .B netstat
- .RB { \-\-masquerade | \-M }
- .RB [ \-\-extend | \-e ]
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
- .RB [ \-\-continuous | \-c]
- .P
- .B netstat
-@@ -78,6 +77,8 @@
- .P
- .IR address_family_options :
- .PP
-+.RB [ -4 ]
-+.RB [ -6 ]
- .RB [ \-\-protocol= { inet , unix , ipx , ax25 , netrom , ddp }[, ...] ]
- .RB [ \-\-unix | \-x ] 
- .RB [ \-\-inet | \-\-ip ]
-@@ -98,12 +99,17 @@
- address families, then the active sockets of all configured address
- families will be printed.
- .SS "\-\-route , \-r"
--Display the kernel routing tables.
-+Display the kernel routing tables. See the description in 
-+.BR route (8) 
-+for details. 
-+.B netstat -r 
-+and 
-+.B route -e 
-+produce the same output.
- .SS "\-\-groups , \-g"
- Display multicast group membership information for IPv4 and IPv6.
--.SS "\-\-interface=\fIiface \fR, \fB\-i"
--Display a table of all network interfaces, or the specified
--.IR iface ) .
-+.SS "\-\-interfaces, \-i"
-+Display a table of all network interfaces.
- .SS "\-\-masquerade , \-M"
- Display a list of masqueraded connections.
- .SS "\-\-statistics , \-s"
-@@ -165,12 +171,11 @@
- .SS "\-a, \-\-all"
- Show both listening and non-listening sockets.  With the
- .B --interfaces
--option, show interfaces that are not marked 
-+option, show interfaces that are not up
- .SS "\-F"
- Print routing information from the FIB.  (This is the default.)
- .SS "\-C"
- Print routing information from the route cache.
--.IR UP .
- .P
- .SH OUTPUT
- .P
-@@ -221,7 +226,7 @@
- The socket is waiting after close to handle packets still in the network.
- .TP
- .I
--CLOSED
-+CLOSE
- The socket is not being used.
- .TP
- .I
-@@ -438,7 +443,7 @@
- .P
- .SH AUTHORS
- The netstat user interface was written by Fred Baumgarten
--<dc6iq@insu1.etec.uni-karlsruhe.de> the man page basically
-+<dc6iq@insu1.etec.uni-karlsruhe.de>, the man page basically
- by Matt Welsh <mdw@tc.cornell.edu>. It was updated by
- Alan Cox <Alan.Cox@linux.org> but could do with a bit more
- work.  It was updated again by Tuan Hoang
---- net-tools-1.60.orig/man/en_US/route.8
-+++ net-tools-1.60/man/en_US/route.8
-@@ -1,4 +1,4 @@
--.TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer's Manual"
-+.TH ROUTE 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
- .SH NAME
- route \- show / manipulate the IP routing table
- .SH SYNOPSIS
-@@ -141,7 +141,7 @@
- set the TCP Maximum Segment Size (MSS) for connections over this route
- to M bytes. 
- The default is the device MTU minus headers, or a lower MTU when path mtu 
--discovery occured. This setting can be used to force smaller TCP packets on the
-+discovery occurred. This setting can be used to force smaller TCP packets on the
- other end when path mtu discovery does not work (usually because of
- misconfigured firewalls that block ICMP Fragmentation Needed)
- .TP 
-@@ -179,17 +179,20 @@
- 
- .SH EXAMPLES
- .TP
--.B route add -net 127.0.0.0
--adds the normal loopback entry, using netmask 255.0.0.0 (class A net,
--determined from the destination address) and associated with the 
--"lo" device (assuming this device was prviously set up correctly with
-+.B route add -net 127.0.0.0 netmask 255.0.0.0 dev lo
-+adds the normal loopback entry, using netmask 255.0.0.0 and associated with the 
-+"lo" device (assuming this device was previously set up correctly with
- .BR ifconfig (8)). 
- 
- .TP 
- .B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
--adds a route to the network 192.56.76.x via 
--"eth0". The Class C netmask modifier is not really necessary here because
--192.* is a Class C IP address. The word "dev" can be omitted here. 
-+adds a route to the local network 192.56.76.x via 
-+"eth0".  The word "dev" can be omitted here. 
-+
-+.TP
-+.B route del default
-+deletes the current default route, which is labeled "default" or 0.0.0.0
-+in the destination field of the current routing table.
- 
- .TP
- .B route add default gw mango-gw
-@@ -289,7 +292,7 @@
- Interface to which packets for this route will be sent.
- .TP
- .B MSS 
--Default maximum segement size for TCP connections over this route.
-+Default maximum segment size for TCP connections over this route.
- .TP
- .B Window  
- Default window size for TCP connections over this route.
-@@ -323,4 +326,4 @@
- Linus Torvalds for pl15. Alan Cox added the mss and window options for
- Linux 1.1.22. irtt support and merged with netstat from Bernd Eckenfels.
- .SH AUTHOR
--Currently maintained by Phil Blundell <Philip.Blundell@pobox.com>.
-+Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>.
---- net-tools-1.60.orig/man/en_US/slattach.8
-+++ net-tools-1.60/man/en_US/slattach.8
-@@ -1,4 +1,4 @@
--.TH SLATTACH 8 "12 Feb 1994" "" ""
-+.TH SLATTACH 8 "10 Oct 2006" "" ""
- .SH NAME
- slattach \- attach a network interface to a serial line
- .SH SYNOPSIS
-@@ -24,6 +24,7 @@
- .B "[-h]"
- Exit when the carrier is lost. This works on both /dev/tty and /dev/cua
- devices by directly monitoring the carrier status every 15 seconds.
-+.TP
- .B "[-v]"
- Enable verbose output.  Useful in shell scripts.
- .TP
-@@ -41,7 +42,7 @@
- .TP
- .B "[-e]"
- Exit right after initializing device, instead of waiting for the
--line to hangup.
-+line to hang up.
- .TP
- .B "[-L]"
- Enable 3 wire operation. The terminal is moved into CLOCAL mode, 
-@@ -50,8 +51,8 @@
- .B "[-p proto]"
- Set a specific kind of protocol to use on the line.  The default
- is set to
--.B "cslip"
--, i.e. compressed SLIP.  Other possible values are
-+.BR "cslip" ,
-+i.e. compressed SLIP.  Other possible values are
- .B "slip"
- (normal SLIP), 
- .B "adaptive"
---- net-tools-1.60.orig/man/en_US/mii-tool.8
-+++ net-tools-1.60/man/en_US/mii-tool.8
-@@ -1,7 +1,7 @@
- .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
- .\" mii-tool.8 1.5 2000/04/25 22:58:19
- .\"
--.TH MII-TOOL 8 "2000/04/25 22:58:19" "net-tools"
-+.TH MII-TOOL 8 "2004/03/28 23:30:00" "net-tools"
- 
- .SH NAME
- mii-tool \- view, manipulate media-independent interface status
-@@ -72,7 +72,24 @@
- commas.  Valid media are \fB100baseT4\fR, \fB100baseTx-FD\fR,
- \fB100baseTx-HD\fR, \fB10baseT-FD\fR, and \fB10baseT-HD\fR.
- 
-+.SH DIAGNOSTICS
-+.TP
-+SIOCGMIIPHY on 'eth?' failed: Invalid argument
-+If the interface is not running (up), kernel will refuse to report its link state.
-+.TP
-+SIOCGMIIPHY on 'eth?' failed: Operation not permitted
-+Most kernels restrict access to root.
-+.TP
-+SIOCGMIIPHY on 'eth?' failed: No such device
-+This error is shown, if the kernel does not know about the named device.
-+.TP
-+SIOCGMIIPHY on 'eth?' failed: Operation not supported 
-+The interface in question does not support MII queries. Most likely, it does not have 
-+MII transceivers, at all.
-+
- .SH AUTHORS
- David Hinds \- dhinds@pcmcia.sourceforge.org
- .br
- Donald Becker \- becker@scyld.com
-+.br
-+Bernd Eckenfels \- ecki@debian.org
---- net-tools-1.60.orig/man/fr_FR/arp.8
-+++ net-tools-1.60/man/fr_FR/arp.8
-@@ -140,8 +140,8 @@
- Similaire à l'option 
- .B \-s
- , mais cette fois les informations d'adresses sont prises dans le fichier
--.B nom_de_fichier
--. Ceci peut être utilisé si les entrées ARP à configurer sont
-+.BR nom_de_fichier .
-+Ceci peut être utilisé si les entrées ARP à configurer sont
- nombreuses.  Le nom du fichier de données est très souvent nommé
- .B /etc/ethers
- , mais ce n'est pas officiel.
-@@ -160,8 +160,8 @@
- .LP
- Chaque entrée complète se trouvant dans le cache ARP est marquée de
- l'indicateur
--.B C
--. Les entrées permanentes sont marquées de l'indicateur
-+.BR C .
-+Les entrées permanentes sont marquées de l'indicateur
- .B M
- et les entrées 'pub' ont l'indicateur
- .B P
---- net-tools-1.60.orig/man/fr_FR/hostname.1
-+++ net-tools-1.60/man/fr_FR/hostname.1
-@@ -84,8 +84,8 @@
- .LP
- .B hostname
- fournit le nom du système tel qu'il est retourné par la fonction
--.BR getdomainname (2)
--. Ceci est connu comme nom de domaine YP/NIS du système.
-+.BR getdomainname (2).
-+Ceci est connu comme nom de domaine YP/NIS du système.
- 
- 
- .LP
-@@ -145,8 +145,8 @@
- .LP
- La façon dont vous pouvez le changer dépend de la configuration
- (habituellement dans 
--.IR /etc/host.conf )
--. Si le fichier 'hosts' est analysé avant d'interroger le DNS ou 
-+.IR /etc/host.conf ).
-+Si le fichier 'hosts' est analysé avant d'interroger le DNS ou 
- NIS) vous pouvez le changer dans le fichier 
- .IR /etc/hosts .
- 
---- net-tools-1.60.orig/man/fr_FR/ifconfig.8
-+++ net-tools-1.60/man/fr_FR/ifconfig.8
-@@ -1,4 +1,4 @@
--.TH IFCONFIG 8 "4 August 1997" "net-tools" "Linux Programmer's Manual"
-+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
- .SH NOM
- ifconfig \- configure une interface réseau
- .SH SYNOPSIS
-@@ -60,14 +60,14 @@
- .TP
- .B "[\-]promisc"
- Valide ou invalide le mode
--.B promiscuous
--.  S'il est validé, tous les paquets circulant sur le réseau
-+.BR promiscuous .
-+S'il est validé, tous les paquets circulant sur le réseau
- seront reçus sur cette interface.
- .TP
- .B "[\-]allmulti"
- Valide ou invalide le fonctionnement de l'interface en mode
--.B all-multicast
--.  S'il est validé, tous les paquets multicast circulant sur le réseau
-+.BR all-multicast .
-+S'il est validé, tous les paquets multicast circulant sur le réseau
- seront reçus sur cette interface.
- .TP
- .B "metric N"
-@@ -196,7 +196,7 @@
- Même si les adresses appletalk DDP et IPX peuvent être affichées,
- elles ne peuvent être modifiées avec cette commande.
- .SH VOIR AUSSI
--route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
- .SH AUTHORS
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- .br
---- net-tools-1.60.orig/man/fr_FR/netstat.8
-+++ net-tools-1.60/man/fr_FR/netstat.8
-@@ -8,7 +8,7 @@
- .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
- .\"
- .\"
--.TH NETSTAT 8 "25 Fév 1999" "net-tools" "Linux Programmer's Manual"
-+.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
- 
- .SH NAME
- netstat \- Affiche les connexions réseau, les tables de routage, les
-@@ -106,7 +106,7 @@
- .BR route (8)
- pour plus de détails.
- 
--.SS "\-i, \-\-interface \fIiface\fI"
-+.SS "\-i, \-\-interfaces \fIiface\fI"
- Si vous utilisez l'option
- .BR -i ", " --interfaces
- , une table de toutes (ou de l'interface
-@@ -118,8 +118,8 @@
- .BR ifconfig (8).
- .B "netstat -ei"
- affiche une table ou une seule entrée d'interface comme la commande 
--.B ifconfig
--. Avec le paramètre
-+.BR ifconfig .
-+Avec le paramètre
- .B -a
- , vous pouvez inclure les interfaces qui ne sont pas configurées (c.a.d qui
- n'ont pas l'indicateur
-@@ -249,7 +249,7 @@
- avant d'entreprendre la fermeture.
- .TP
- .I
--CLOSED
-+CLOSE
- La socket n'est pas utilisée.
- .TP
- .I
-@@ -409,8 +409,7 @@
- Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques
- des interfaces alias. Pour obtenir les compteurs par interface alias, vous
- devez définir des règles spécifiques à l'aide de la commande
--.BR ipchains(8) 
--.  
-+.BR ipchains (8).
- 
- .SH FICHIERS
- .ta
---- net-tools-1.60.orig/man/fr_FR/rarp.8
-+++ net-tools-1.60/man/fr_FR/rarp.8
-@@ -55,8 +55,8 @@
- Crée manuellement une correspondance d'adresses RARP pour l'hôte
- .B nom_d_hôte
- avec l'adresse matérielle
--.B adr_materielle
--. Le format de l'adresse matérielle est dépendant du matériel,
-+.BR adr_materielle .
-+Le format de l'adresse matérielle est dépendant du matériel,
- mais pour la plupart on peut considérer que la présentation classique
- peut être utilisée.  Pour la classe Ethernet, c'est 6 octets en hexadécimal,
- séparés par des double-points.
---- net-tools-1.60.orig/man/fr_FR/route.8
-+++ net-tools-1.60/man/fr_FR/route.8
-@@ -1,4 +1,4 @@
--.TH ROUTE 8 "8 Août 1997" "net-tools" "Linux Programmer's Manual"
-+.TH ROUTE 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
- .SH NAME
- route \- affiche / manipule la table de routage IP
- .SH SYNOPSIS
-@@ -330,6 +330,6 @@
- la gestion des fenêtres et MSS pour Linux 1.1.22. Le support de irtt 
- et la fusion avec netstat ont été réalisés par Bernd Eckenfels.
- .SH AUTEUR
--Maintenu par Phil Blundell <Philip.Blundell@pobox.com>.
-+Maintenu par Phil Blundell <Philip.Blundell@pobox.com> et Bernd Eckenfels <net-tools@lina.inka.de>.
- .SH TRADUCTION
--Jean-Michel VANSTEENE (vanstee@worldnet.fr)
-+Jean-Michel VANSTEENE <vanstee@worldnet.fr>
---- net-tools-1.60.orig/man/pt_BR/ifconfig.8
-+++ net-tools-1.60/man/pt_BR/ifconfig.8
-@@ -1,4 +1,4 @@
--.TH IFCONFIG 8 "10 de fevereiro de 1996" "net-tools" "Manual do Programador Linux"
-+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
- .SH NOME
- ifconfig \- configura uma interface de rede
- .SH SINOPSE
-@@ -169,7 +169,7 @@
- Os endereços appletalk DDP e IPX serão mostrados, mas não podem ser alterados
- com este comando.
- .SH VEJA TAMBÉM
--route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
- .SH AUTORES
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- Alan Cox, <Alan.Cox@linux.org>
---- net-tools-1.60.orig/man/pt_BR/netstat.8
-+++ net-tools-1.60/man/pt_BR/netstat.8
-@@ -8,7 +8,7 @@
- .\" Traduzido para português por Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- .\" Revisado por Jorge Luiz Godoy Filho <jorge@bestway.com.br>
- .\"
--.TH NETSTAT 8 "19 de maio de 1997" "net-tools" "Manual do Programador Linux"
-+.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
- 
- .SH NOME
- netstat \- Mostra conexões de rede, tabelas de roteamento, estatísticas de interface e conexões
-@@ -97,7 +97,7 @@
- .BR route (8)
- para maiores detalhes.
- 
--.SS "\-i, \-\-interface \fIiface\fI"
-+.SS "\-i, \-\-interfaces \fIiface\fI"
- Se você usar a opção
- .BR -i ", " --interfaces
- , uma tabela de todas (ou da
---- net-tools-1.60.orig/man/pt_BR/rarp.8
-+++ net-tools-1.60/man/pt_BR/rarp.8
-@@ -50,8 +50,8 @@
- Cria um mapeamento de endereços RARP para a máquina
- .B máquina
- com endereço de hardware configurado para
--.B endereço_hardware
--.  O formato do endereço de hardware depende da classe do hardware, mas
-+.B endereço_hardware.
-+O formato do endereço de hardware depende da classe do hardware, mas
- para a maioria das classes você pode assumir que a apresentação usual pode
- ser usada.  Para a classe Ethernet, são 6 bytes em hexadecimal, separados
- por dois pontos (:).
---- net-tools-1.60.orig/man/pt_BR/route.8
-+++ net-tools-1.60/man/pt_BR/route.8
-@@ -1,4 +1,4 @@
--.TH ROUTE 8 "27 Jan 1996" "net-tools" "Manual do Programador Linux"
-+.TH ROUTE 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
- .SH NOME
- route \- mostra / manipula a tabela de roteamento IP
- .SH SINOPSE
-@@ -321,7 +321,7 @@
- Linus Torvalds para a versão pl15. Alan Cox adicionou as opções para
- mss e window no kernel 1.1.22. O suporte a irtt (compartilhado com o
- netstat) foi feito por Bernd Eckenfels.
-+.SH AUTHOR
-+Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>.
- .SH TRADUÇÃO
- Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 13/04/1998
--.SH BUGS
--nenhum :)
---- net-tools-1.60.orig/man/de_DE/ifconfig.8
-+++ net-tools-1.60/man/de_DE/ifconfig.8
-@@ -1,4 +1,4 @@
--.TH IFCONFIG 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
- .SH NAME
- ifconfig \- Konfiguration einer Netzwerkskarte
- .SH SYNOPSIS
-@@ -193,7 +193,7 @@
- W\(:ahrend AppleTalk DDP und IPX Adressen angezeigt werden, k\(:onnen sie mit
- diesem Kommando nicht ge\(:andert werden.
- .SH SIEHE AUCH
--route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
- .SH AUTOREN
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- .br
---- net-tools-1.60.orig/man/de_DE/route.8
-+++ net-tools-1.60/man/de_DE/route.8
-@@ -1,4 +1,4 @@
--.TH ROUTE 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+.TH ROUTE 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
- .SH NAME
- route \- Anzeigen der IP-Routen-Tabelle
- .SH SYNOPSIS
-@@ -345,6 +345,6 @@
- irtt beigesteuert und den Code mit dem von Netstat vereinigt.
- .SH AUTOREN
- .B Route
--wird zur Zeit von Phil Blundel (Philip.Blundell@pobox.com) gewartet.
-+wird zur Zeit von Phil Blundel <Philip.Blundell@pobox.com> und Bernd Eckenfels <net-tools@lina.inka.de> gewartet.
- .SH \(:Ubersetzung
- Ralf B\(:achle <ralf@gnu.org>
---- net-tools-1.60.orig/man/de_DE/netstat.8
-+++ net-tools-1.60/man/de_DE/netstat.8
-@@ -9,7 +9,7 @@
- .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
- .\"
- .\"
--.TH NETSTAT 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
- 
- .SH NAME
- netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen
-@@ -44,7 +44,6 @@
- .B netstat
- .RB [ \-veenpac ]
- .RB { \-\-interfaces | \-i }
--.RI [ Schnittstelle ]
- 
- .PP
- 
-@@ -68,6 +67,8 @@
- .SH BESCHREIBUNG
- .B Netstat
- zeigt Informationen des Linux Netzwerkssystems an.
-+.PP
-+.B Bitte beachten Sie, dass der Inhalt der deutschen man-page nicht vollst\(:andig ist, im Moment.
- 
- .SS "(no option)"
- Ohne Optionen zeigt
-@@ -103,18 +104,17 @@
- Wegen Details siehe
- .BR route (8).
- 
--.SS "\-i, \-\-interface \fISchnittstelle\fI"
-+.SS "\-i, \-\-interfaces"
- Wird die
- .BR -i ", " --interfaces
--Option verwendet,  so wird eine Tabelle aller (oder der angegebenen
--.IR Schnittstellen ) 
-+Option verwendet,  so wird eine Tabelle aller Schnittstellen
- ausgedruckt.  Die Ausgabe ist im Format von
- .B "ifconfig -e"
- und wird in
- .BR ifconfig (8)
- beschrieben.
- .B "netstat -ei" 
--druckt eine Tabelle oder einen Eintrag f\(:ur einen einzelnes Interface wie
-+druckt eine Tabelle f\(:ur Interfaces wie
- .BR ifconfig .
- Die
- .B -a
-@@ -182,7 +182,7 @@
- und
- .BR \-\-ddp.
- 
--.SS "\-c, \-\-continous"
-+.SS "\-c, \-\-continuous"
- Mit dieser Option wiederholt
- .B netstat
- im Sekundenabstand die Ausgabe, bis es abgebrochen wird.
---- net-tools-1.60.orig/po/pt_BR.po
-+++ net-tools-1.60/po/pt_BR.po
-@@ -10,275 +10,287 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: net-tools 1.54\n"
--"POT-Creation-Date: 2000-02-14 02:31+0100\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
- "PO-Revision-Date: 1999-03-01 02:38+0100\n"
- "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO8859-9\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:110 ../arp.c:269
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
- msgstr "arp: preciso do nome da máquina\n"
- 
--#: ../arp.c:207 ../arp.c:221
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
- msgstr "Nenhuma entrada ARP para %s\n"
- 
--#: ../arp.c:239
-+#: ../arp.c:248
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr "arp: não foi possível obter o endereço de hardware para `%s': %s.\n"
- 
--#: ../arp.c:243
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr "arp: erro no tipo do protocolo.\n"
- 
--#: ../arp.c:252
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
- msgstr "arp: o dispositivo `%s' tem endereço de hardware %s `%s'.\n"
- 
--#: ../arp.c:282
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
- msgstr "arp: preciso do endereço de hardware\n"
- 
--#: ../arp.c:290
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr "arp: endereço inválido de hardware\n"
- 
--#: ../arp.c:387
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr "arp: não foi possível abrir o arquivo etherfile %s!\n"
- 
--#: ../arp.c:403
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr "arp: erro de formato na linha %u do arquivo etherfile %s!\n"
- 
--#: ../arp.c:416
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr "arp: não foi possível configurar a linha %u do arquivo etherfile %s!\n"
- 
--#: ../arp.c:437
--msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
-+#: ../arp.c:448
-+#, fuzzy, c-format
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
- msgstr "Endereço\t\tTipoHW\tEndereçoHW\t Flags Mascara\t\t Iface\n"
- 
--#: ../arp.c:467
-+#: ../arp.c:476
-+#, fuzzy
-+msgid "<from_interface>"
-+msgstr "%s: interface desconhecida.\n"
-+
-+#: ../arp.c:478
- msgid "(incomplete)"
- msgstr "(incompleto)"
- 
--#: ../arp.c:484
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr "%s (%s) em "
- 
--#: ../arp.c:490
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
- msgstr "<incompleto> "
- 
--#: ../arp.c:496
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
- msgstr "mascara %s "
- 
--#: ../arp.c:513
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr "em %s\n"
- 
--#: ../arp.c:592
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr "Entradas: %d\tIgnorada: %d\tEncontrada: %d\n"
- 
--#: ../arp.c:596
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr "%s (%s) -- nenhuma entrada\n"
- 
--#: ../arp.c:598
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
- msgstr "arp: em %d entradas não foi encontrado.\n"
- 
--#: ../arp.c:613
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
- "cache\n"
- msgstr ""
- "Uso:\n"
--"  arp [-vn]  [<HW>] [-i <if>] [-a] [<máquina>]             <-Mostra cache "
--"ARP\n"
-+"  arp [-vn]  [<HW>] [-i <if>] [-a] [<máquina>]             <-Mostra cache ARP\n"
- 
--#: ../arp.c:614
-+#: ../arp.c:627
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
--msgstr ""
--"  arp [-v]          [-i <if>] -d  <máquina>  [pub][nopub]  <-Remove entrada "
--"ARP\n"
-+msgstr "  arp [-v]          [-i <if>] -d  <máquina>  [pub][nopub]  <-Remove entrada ARP\n"
- 
--#: ../arp.c:615
-+#: ../arp.c:628
-+#, fuzzy, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
- msgstr ""
- "  arp [-vnD] [<HW>] [-i <if>] -f  [<arquivo>]         <-Inclui entrada de "
- "arquivo\n"
- 
--#: ../arp.c:616
-+#: ../arp.c:629
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
--msgstr ""
--"  arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [temp][nopub] <-Inc. "
--"Entrada\n"
--
--#: ../arp.c:617
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <máquina> <end_hw>  [netmask <nm>] pub  "
--"<-''-\n"
-+msgstr "  arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [temp][nopub] <-Inc. Entrada\n"
- 
--#: ../arp.c:618
-+#: ../arp.c:630
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
--msgstr ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <máquina>  <if> [netmask <nm>] pub      "
--"<-''-\n"
-+msgstr "  arp [-v]   [<HW>] [-i <if>] -Ds <máquina>  <if> [netmask <nm>] pub      <-''-\n"
- 
--#: ../arp.c:620
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
--msgstr ""
--"        -a               mostra (todas as) máquinas no estilo alternativo "
--"(BSD)\n"
-+msgstr "        -a               mostra (todas as) máquinas no estilo alternativo (BSD)\n"
- 
--#: ../arp.c:621
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr "        -s, --set                define uma nova entrada ARP\n"
- 
--#: ../arp.c:622
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr "        -d, --delete             remove a entrada especificada\n"
- 
--#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr "        -v, --verbose           listagem detalhada\n"
- 
--#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
--msgid "        -n, --numeric            dont resolve names\n"
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, fuzzy, c-format
-+msgid "        -n, --numeric            don't resolve names\n"
- msgstr "        -n, --numeric           não resolve nomes\n"
- 
--#: ../arp.c:625
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
- msgstr ""
- "        -i, --device             especifica a interface de rede (ex: eth0)\n"
- 
--#: ../arp.c:626
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
- msgstr "        -D, --use-device         leia <hwaddr> de um dispositivo\n"
- 
--#: ../arp.c:627
-+#: ../arp.c:639
-+#, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr "        -A, -p, --protocol       especifica a família de protocolos\n"
- 
--#: ../arp.c:628
-+#: ../arp.c:640
-+#, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
--"        -f, --file             leia novas entradas de arquivo ou de "
--"/etc/ethers\n"
-+"        -f, --file             leia novas entradas de arquivo ou de /etc/"
-+"ethers\n"
- "\n"
- 
--#: ../arp.c:630 ../rarp.c:181
-+#: ../arp.c:642 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
--msgstr ""
--" <HW>=Use '-H <hw>' para especificar o tipo de endereço de hw. Default: %s\n"
-+msgstr " <HW>=Use '-H <hw>' para especificar o tipo de endereço de hw. Default: %s\n"
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr "  Lista dos tipos de hardware possíveis (que suportam ARP):\n"
- 
--#: ../arp.c:664
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr "%s: tipo de hardware não suportado!\n"
- 
--#: ../arp.c:668
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr "%s: família de endereços não suportada!\n"
- 
--#: ../arp.c:703
-+#: ../arp.c:716
-+#, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr "arp: -N ainda não suportada.\n"
- 
--#: ../arp.c:713
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr "arp: %s: família de endereços desconhecida.\n"
- 
--#: ../arp.c:722
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr "arp: %s: tipo de hardware desconhecido.\n"
- 
--#: ../arp.c:741
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
- msgstr "arp: %s: kernel somente suporta ínet'.\n"
- 
--#: ../arp.c:746
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr "arp: %s: tipo de hardware sem suporte a ARP.\n"
- 
--#: ../hostname.c:69
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
- msgstr "Configurando nome do nó como `%s'\n"
- 
--#: ../hostname.c:74
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr "%s: você deve ser root para mudar o nome do nó\n"
- 
--#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr "%s: nome muito longo\n"
- 
--#: ../hostname.c:89
-+#: ../hostname.c:91
- #, c-format
- msgid "Setting hostname to `%s'\n"
- msgstr "Configurando nome da máquina para `%s'\n"
- 
--#: ../hostname.c:94
-+#: ../hostname.c:96
- #, c-format
- msgid "%s: you must be root to change the host name\n"
- msgstr "%s: você deve ser root para mudar o nome da máquina\n"
- 
--#: ../hostname.c:108
-+#: ../hostname.c:109
- #, c-format
- msgid "Setting domainname to `%s'\n"
- msgstr "Configurando nome do domínio para `%s'\n"
- 
--#: ../hostname.c:113
-+#: ../hostname.c:114
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
- msgstr "%s: você deve ser root para mudar o nome do domínio\n"
-@@ -303,37 +315,38 @@
- msgid "Result: h_addr_list=`%s'\n"
- msgstr "Resultado: h_addr_list=`%s'\n"
- 
--#: ../hostname.c:209
-+#: ../hostname.c:208
- #, c-format
- msgid "%s: can't open `%s'\n"
- msgstr "%s: não foi possível abrir `%s'\n"
- 
--#: ../hostname.c:223
-+#: ../hostname.c:222
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
--msgstr ""
--"Uso: hostname [-v] {máquina|-F arquivo}       configura nome da máquina (de "
--"arquivo)\n"
-+msgstr "Uso: hostname [-v] {máquina|-F arquivo}       configura nome da máquina (de arquivo)\n"
- 
--#: ../hostname.c:224
-+#: ../hostname.c:223
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
- "       domainname [-v] {domínio_nis|-F file} configura nome do domínio NIS\n"
- "                                             (a partir de arquivo)\n"
- 
--#: ../hostname.c:226
-+#: ../hostname.c:225
-+#, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
--msgstr ""
--"Uso: hostname [-v] {máquina|-F arquivo}   configura o nome do nó DECnet (de "
--"arquivo)\n"
-+msgstr "Uso: hostname [-v] {máquina|-F arquivo}   configura o nome do nó DECnet (de arquivo)\n"
- 
--#: ../hostname.c:228
-+#: ../hostname.c:227
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  mostra nome formatado\n"
- 
--#: ../hostname.c:229
-+#: ../hostname.c:228
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
-@@ -341,7 +354,8 @@
- "     hostname [-v]                            mostra nome da máquina\n"
- "\n"
- 
--#: ../hostname.c:230
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
-@@ -349,7 +363,8 @@
- "     hostname -V|--version|-h|--help          mostra informações e termina\n"
- "\n"
- 
--#: ../hostname.c:231
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
-@@ -357,35 +372,43 @@
- "    dnsdomainname=máquina -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- 
--#: ../hostname.c:232
-+#: ../hostname.c:231
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr "    -s, --short           nome curto da máquina\n"
- 
--#: ../hostname.c:233
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr "    -a, --alias           aliases para a máquina\n"
- 
--#: ../hostname.c:234
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr "    -i, --ip-address      endereços da máquina\n"
- 
--#: ../hostname.c:235
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr "    -f, --fqdn, --long    nome longo da máquina (FQDN)\n"
- 
--#: ../hostname.c:236
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
- msgstr "    -d, --domain          nome do domínio DNS\n"
- 
--#: ../hostname.c:237
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
- msgstr "    -y, --yp, --nis       nome do domínio NIS/YP\n"
- 
--#: ../hostname.c:239
-+#: ../hostname.c:238
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
- msgstr "    -n, --node            nome do nó DECnet\n"
- 
--#: ../hostname.c:241
-+#: ../hostname.c:240
-+#, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
-@@ -393,7 +416,8 @@
- "    -F, --file            leia o nome da máquina ou domínio NIS do arquivo\n"
- "\n"
- 
--#: ../hostname.c:243
-+#: ../hostname.c:242
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -413,15 +437,16 @@
- msgstr "%s: Você não pode mudar o nome do domínio DNS com este comando\n"
- 
- #: ../hostname.c:339
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
- msgstr ""
- "\n"
--"A menos que esteja usando bind ou NIS para resolução de nomes você pode "
--"mudar\n"
-+"A menos que esteja usando bind ou NIS para resolução de nomes você pode mudar\n"
- 
- #: ../hostname.c:340
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr "o nome do domínio DNS (que é parte do FQDN) no arquivo /etc/hosts.\n"
- 
-@@ -440,552 +465,453 @@
- msgid "getnodename()=`%s'\n"
- msgstr "getnodename()=`%s'\n"
- 
--#: ../ifconfig.c:159
--#, c-format
--msgid "%-9.9s Link encap:%s  "
--msgstr "%-9.9s  Encapsulamento do Link: %s  "
-+#: ../ifconfig.c:107
-+#, fuzzy, c-format
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr "Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV Opções\n"
- 
--#: ../ifconfig.c:164
--#, c-format
--msgid "HWaddr %s  "
--msgstr "Endereço de HW %s  "
-+#: ../ifconfig.c:129 ../ifconfig.c:161
-+#, fuzzy, c-format
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr ""
-+"%s: erro obtendo informações da interface: %s\n"
-+"\n"
- 
--#: ../ifconfig.c:167
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
- #, c-format
--msgid "Media:%s"
--msgstr "Mídia:%s"
-+msgid "No support for INET on this system.\n"
-+msgstr "Este sistema não tem suporte a INET.\n"
- 
--#: ../ifconfig.c:169
--msgid "(auto)"
--msgstr "(auto)"
-+#: ../ifconfig.c:193
-+#, fuzzy, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr ""
-+"%s: erro obtendo informações da interface: %s\n"
-+"\n"
- 
--#: ../ifconfig.c:176
--#, c-format
--msgid "          %s addr:%s "
--msgstr "          %s end.: %s "
-+#: ../ifconfig.c:202
-+#, fuzzy, c-format
-+msgid ""
-+"Usage:\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+msgstr ""
-+"Uso:\n"
-+"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endereço>]\n"
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:204
- #, c-format
--msgid " P-t-P:%s "
--msgstr " P-a-P:%s "
-+msgid "  [add <address>[/<prefixlen>]]\n"
-+msgstr "  [add <endereço>[/<tam_prefixo>]]\n"
- 
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:205
- #, c-format
--msgid " Bcast:%s "
--msgstr " Bcast:%s "
-+msgid "  [del <address>[/<prefixlen>]]\n"
-+msgstr "  [del <endereço>[/<tam_prefixo>]]\n"
- 
--#: ../ifconfig.c:184
-+#: ../ifconfig.c:206
- #, c-format
--msgid " Mask:%s\n"
--msgstr " Masc:%s\n"
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<endereço>]]  [[-]pointopoint [<endereço>]]\n"
- 
--#: ../ifconfig.c:201
-+#: ../ifconfig.c:207
- #, c-format
--msgid "          inet6 addr: %s/%d"
--msgstr "          endereço inet6: %s/%d"
--
--#: ../ifconfig.c:203
--msgid " Scope:"
--msgstr " Escopo:"
--
--#: ../ifconfig.c:206
--msgid "Global"
--msgstr "Global"
-+msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+msgstr "  [netmask <endereço>]  [dstaddr <endereço>]  [tunnel <endereço>]\n"
- 
--#: ../ifconfig.c:209
--msgid "Link"
--msgstr "Link"
-+#: ../ifconfig.c:210
-+#, c-format
-+msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
- #: ../ifconfig.c:212
--msgid "Site"
--msgstr "Site"
--
--#: ../ifconfig.c:215
--msgid "Compat"
--msgstr "Compat"
--
--#: ../ifconfig.c:218
--msgid "Host"
--msgstr "Máquina"
--
--#: ../ifconfig.c:221
--msgid "Unknown"
--msgstr "Desconhecido"
--
--#: ../ifconfig.c:236
- #, c-format
--msgid "          IPX/Ethernet II addr:%s\n"
--msgstr "      Endereço IPX/Ethernet II:%s\n"
-+msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+msgstr "  [hw <HW> <endereço>]  [metric <NN>]  [mtu <NN>]\n"
- 
--#: ../ifconfig.c:239
-+#: ../ifconfig.c:213
- #, c-format
--msgid "          IPX/Ethernet SNAP addr:%s\n"
--msgstr "      Endereço IPX/Ethernet SNAP:%s\n"
-+msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
--#: ../ifconfig.c:242
-+#: ../ifconfig.c:214
- #, c-format
--msgid "          IPX/Ethernet 802.2 addr:%s\n"
--msgstr "      Endereço IPX/Ethernet 802.2:%s\n"
-+msgid "  [multicast]  [[-]promisc]\n"
-+msgstr "  [multicast]  [[-]promisc]\n"
- 
--#: ../ifconfig.c:245
-+#: ../ifconfig.c:215
- #, c-format
--msgid "          IPX/Ethernet 802.3 addr:%s\n"
--msgstr "      Endereço IPX/Ethernet 802.3:%s\n"
-+msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tipo>]\n"
- 
--#: ../ifconfig.c:255
-+#: ../ifconfig.c:217
- #, c-format
--msgid "          EtherTalk Phase 2 addr:%s\n"
--msgstr "          Endereço EtherTalk fase 2:%s\n"
-+msgid "  [txqueuelen <NN>]\n"
-+msgstr "  [txqueuelen <NN>]\n"
- 
--#: ../ifconfig.c:264
-+#: ../ifconfig.c:220
- #, c-format
--msgid "          econet addr:%s\n"
--msgstr "          Endereço econet:%s\n"
--
--#: ../ifconfig.c:270
--msgid "[NO FLAGS] "
--msgstr "[NENHUMA FLAG] "
--
--#: ../ifconfig.c:272
--msgid "UP "
--msgstr "UP "
--
--#: ../ifconfig.c:274
--msgid "BROADCAST "
--msgstr "BROADCAST"
--
--#: ../ifconfig.c:276
--msgid "DEBUG "
--msgstr "DEBUG "
--
--#: ../ifconfig.c:278
--msgid "LOOPBACK "
--msgstr "LOOPBACK"
--
--#: ../ifconfig.c:280
--msgid "POINTOPOINT "
--msgstr "POINTOPOINT "
--
--#: ../ifconfig.c:282
--msgid "NOTRAILERS "
--msgstr "NOTRAILERS "
--
--#: ../ifconfig.c:284
--msgid "RUNNING "
--msgstr "RUNNING "
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
- 
--#: ../ifconfig.c:286
--msgid "NOARP "
--msgstr "NOARP "
-+#: ../ifconfig.c:222
-+#, c-format
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr ""
-+"  [up|down] ...\n"
-+"\n"
- 
--#: ../ifconfig.c:288
--msgid "PROMISC "
--msgstr "PROMISC "
-+#: ../ifconfig.c:224
-+#, c-format
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "  <HW>=Tipo de Hardware.\n"
- 
--#: ../ifconfig.c:290
--msgid "ALLMULTI "
--msgstr "ALLMULTI "
-+#: ../ifconfig.c:225
-+#, c-format
-+msgid "  List of possible hardware types:\n"
-+msgstr "  Lista dos tipos possíveis de hardware:\n"
- 
--#: ../ifconfig.c:292
--msgid "SLAVE "
--msgstr "SLAVE "
-+#. 1 = ARPable
-+#: ../ifconfig.c:227
-+#, c-format
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "  <AF>=Família de endereços. Default: %s\n"
- 
--#: ../ifconfig.c:294
--msgid "MASTER "
--msgstr "MASTER "
-+#: ../ifconfig.c:228
-+#, c-format
-+msgid "  List of possible address families:\n"
-+msgstr "  Lista de famílias de endereços possíveis:\n"
- 
--#: ../ifconfig.c:296
--msgid "MULTICAST "
--msgstr "MULTICAST "
-+#: ../ifconfig.c:303
-+#, c-format
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:299
--msgid "DYNAMIC "
--msgstr "DYNAMIC "
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:302
-+#: ../ifconfig.c:380
- #, c-format
--msgid " MTU:%d  Metric:%d"
--msgstr " MTU:%d  Métrica:%d"
-+msgid "Unknown media type.\n"
-+msgstr "Tipo desconhecido de mídia.\n"
- 
--#: ../ifconfig.c:306
-+#: ../ifconfig.c:417
- #, c-format
--msgid "  Outfill:%d  Keepalive:%d"
--msgstr "  Outfill:%d  Keepalive:%d"
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
- 
--#: ../ifconfig.c:320
-+#: ../ifconfig.c:429
- #, c-format
--msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
--msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposições:%lu frame:%lu\n"
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:325
-+#: ../ifconfig.c:441
- #, c-format
--msgid "             compressed:%lu\n"
--msgstr "             compactados:%lu\n"
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:329
-+#: ../ifconfig.c:465
- #, c-format
--msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
- msgstr ""
--"Pacotes TX:%lu erros:%lu descartados:%lu sobreposições:%lu portadora:%lu\n"
- 
--#: ../ifconfig.c:333
-+#: ../ifconfig.c:523
- #, c-format
--msgid "          collisions:%lu "
--msgstr "          colisões:%lu "
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:335
-+#: ../ifconfig.c:652
- #, c-format
--msgid "compressed:%lu "
--msgstr "compactados:%lu "
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:337
-+#: ../ifconfig.c:684
- #, c-format
--msgid "txqueuelen:%d "
--msgstr "txqueuelen:%d "
--
--#: ../ifconfig.c:345
--#, c-format
--msgid "Interrupt:%d "
--msgstr "IRQ:%d "
--
--#. Only print devices using it for
--#. I/O maps
--#: ../ifconfig.c:348
--#, c-format
--msgid "Base address:0x%x "
--msgstr "Endereço de E/S:0x%x "
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:350
-+#: ../ifconfig.c:693
- #, c-format
--msgid "Memory:%lx-%lx "
--msgstr "Memória:%lx-%lx "
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: endereço %s inválido.\n"
- 
--#: ../ifconfig.c:353
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
- #, c-format
--msgid "DMA chan:%x "
--msgstr "Canal DMA:%x "
-+msgid "No support for INET6 on this system.\n"
-+msgstr "Este sistema não tem suporte a INET6.\n"
- 
--#: ../ifconfig.c:384 ../ifconfig.c:405
-+#: ../ifconfig.c:780 ../ifconfig.c:871
- #, c-format
--msgid "%s: unknown interface: %s\n"
--msgstr "%s: interface desconhecida: %s\n"
--
--#: ../ifconfig.c:421
--msgid ""
--"Usage:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
--msgstr ""
--"Uso:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endereço>]\n"
--
--#: ../ifconfig.c:425
--msgid "  [add <address>[/<prefixlen>]]\n"
--msgstr "  [add <endereço>[/<tam_prefixo>]]\n"
--
--#: ../ifconfig.c:427
--msgid "  [del <address>[/<prefixlen>]]\n"
--msgstr "  [del <endereço>[/<tam_prefixo>]]\n"
--
--#: ../ifconfig.c:432
--msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
--msgstr "  [[-]broadcast [<endereço>]]  [[-]pointopoint [<endereço>]]\n"
--
--#: ../ifconfig.c:433
--msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
--msgstr "  [netmask <endereço>]  [dstaddr <endereço>]  [tunnel <endereço>]\n"
--
--#: ../ifconfig.c:436
--msgid "  [outfill <NN>] [keepalive <NN>]\n"
--msgstr "  [outfill <NN>] [keepalive <NN>]\n"
--
--#: ../ifconfig.c:438
--msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
--msgstr "  [hw <HW> <endereço>]  [metric <NN>]  [mtu <NN>]\n"
--
--#: ../ifconfig.c:439
--msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--
--#: ../ifconfig.c:440
--msgid "  [multicast]  [[-]promisc]\n"
--msgstr "  [multicast]  [[-]promisc]\n"
--
--#: ../ifconfig.c:441
--msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
--msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tipo>]\n"
--
--#: ../ifconfig.c:443
--msgid "  [txqueuelen <NN>]\n"
--msgstr "  [txqueuelen <NN>]\n"
--
--#: ../ifconfig.c:446
--msgid "  [[-]dynamic]\n"
--msgstr "  [[-]dynamic]\n"
--
--#: ../ifconfig.c:448
--msgid ""
--"  [up|down] ...\n"
--"\n"
-+msgid "Interface %s not initialized\n"
- msgstr ""
--"  [up|down] ...\n"
--"\n"
--
--#: ../ifconfig.c:450
--msgid "  <HW>=Hardware Type.\n"
--msgstr "  <HW>=Tipo de Hardware.\n"
--
--#: ../ifconfig.c:451
--msgid "  List of possible hardware types:\n"
--msgstr "  Lista dos tipos possíveis de hardware:\n"
--
--#. 1 = ARPable
--#: ../ifconfig.c:453
--#, c-format
--msgid "  <AF>=Address family. Default: %s\n"
--msgstr "  <AF>=Família de endereços. Default: %s\n"
--
--#: ../ifconfig.c:454
--msgid "  List of possible address families:\n"
--msgstr "  Lista de famílias de endereços possíveis:\n"
--
--#: ../ifconfig.c:593
--msgid "Unknown media type.\n"
--msgstr "Tipo desconhecido de mídia.\n"
- 
--#: ../ifconfig.c:881
--#, c-format
--msgid "%s: invalid %s address.\n"
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, fuzzy, c-format
-+msgid "Bad address.\n"
- msgstr "%s: endereço %s inválido.\n"
- 
--#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
--msgid "No support for INET6 on this system.\n"
--msgstr "Este sistema não tem suporte a INET6.\n"
--
--#: ../ifconfig.c:983
-+#: ../ifconfig.c:885
-+#, c-format
- msgid "Address deletion not supported on this system.\n"
- msgstr "Remoção de endereço não suportada neste sistema.\n"
- 
--#: ../ifconfig.c:1066
--msgid "No support for INET on this system.\n"
--msgstr "Este sistema não tem suporte a INET.\n"
-+#: ../ifconfig.c:957
-+#, fuzzy, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "Não sei como configurar endereços para a família %d.\n"
- 
--#: ../ifconfig.c:1076
-+#: ../ifconfig.c:983
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr "Este sistema não tem suporte a ECONET.\n"
- 
--#: ../ifconfig.c:1084
-+#: ../ifconfig.c:991
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr "Não sei como configurar endereços para a família %d.\n"
- 
--#: ../netstat.c:383
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
--msgstr ""
--"(Não foi possível ler informações para \"-p\": geteuid()=%d mas você deve "
--"ser root.)\n"
-+msgstr "(Não foi possível ler informações para \"-p\": geteuid()=%d mas você deve ser root.)\n"
- 
--#: ../netstat.c:387
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
- msgstr ""
--"(Nem todos os processos puderam ser identificados, informações sobre "
--"processos\n"
-+"(Nem todos os processos puderam ser identificados, informações sobre processos\n"
- " de outrem não serão mostrados, você deve ser root para vê-los todos.)\n"
- 
--#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr "OUVINDO"
- 
--#: ../netstat.c:395
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr "CONN ENVIADO"
- 
--#: ../netstat.c:396 ../netstat.c:1168
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr "DISC ENVIADO"
- 
--#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr "ESTABELECIDA"
- 
--#: ../netstat.c:419
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr "Ative sockets NET/ROM\n"
- 
--#: ../netstat.c:420
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
--msgstr ""
--"Usuário    Destino    Origem  Dispositivo Estado      Vr/Vs  Send-Q  Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
-+msgstr "Usuário    Destino    Origem  Dispositivo Estado      Vr/Vs  Send-Q  Recv-Q\n"
- 
--#: ../netstat.c:430 ../netstat.c:1208
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr "Problemas lendo dados de %s\n"
- 
--#: ../netstat.c:465
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr "SYN_ENVIADO"
- 
--#: ../netstat.c:466
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr "SYN_RECEBIDO"
- 
--#: ../netstat.c:467
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr "ESPERA_FIN1"
- 
--#: ../netstat.c:468
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr "ESPERA_FIN2"
- 
--#: ../netstat.c:469
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr "TIME_WAIT"
- 
--#: ../netstat.c:470
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr "FECHAR"
- 
--#: ../netstat.c:471
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr "ESPERANDO_FECHAR"
- 
--#: ../netstat.c:472
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr "ÚLTIMO_ACK"
- 
--#: ../netstat.c:473
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr "OUÇA"
- 
--#: ../netstat.c:474
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr "FECHANDO"
- 
--#: ../netstat.c:544
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr "atenção, recebi linha igmp6 inválida %d.\n"
- 
--#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
--#: ../netstat.c:935 ../netstat.c:940
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr "netstat: família de protocolos %d não suportada!\n"
- 
--#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr "atenção, recebi linha igmp inválida %d.\n"
- 
--#: ../netstat.c:666
-+#: ../netstat.c:677
-+#, fuzzy, c-format
-+msgid "Active X.25 sockets\n"
-+msgstr "Ativar sockets AX.25\n"
-+
-+#. IMHO, Vr/Vs is not very usefull --SF
-+#: ../netstat.c:679
-+#, fuzzy, c-format
-+msgid ""
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
-+msgstr "Destino    Origem Dispositivo Estado       Vr/Vs  Send-Q  Recv-Q\n"
-+
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr "atenção, recebi linha tcp inválida.\n"
- 
--#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr "desligado (0.00/%ld/%ld)"
- 
--#: ../netstat.c:708
-+#: ../netstat.c:804
- #, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr "em (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:713
-+#: ../netstat.c:809
- #, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr "keepalive (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:718
-+#: ../netstat.c:814
- #, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr "timewait (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr "desconh.-%d (%2.2f/%ld)"
- 
--#: ../netstat.c:799
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr "atenção, recebi linha udp inválida.\n"
- 
--#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr "DESCONHECIDA"
- 
--#: ../netstat.c:860 ../netstat.c:980
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr "ligado %d (%2.2f/%ld)"
- 
--#: ../netstat.c:949
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr "atenção, recebi linha raw inválida.\n"
- 
--#: ../netstat.c:1028
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr "atenção, recebi linha unix inválida.\n"
- 
--#: ../netstat.c:1055
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr "STREAM"
- 
--#: ../netstat.c:1059
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr "DGRAM"
- 
--#: ../netstat.c:1063
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr "RAW"
- 
--#: ../netstat.c:1067
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr "RDM"
- 
--#: ../netstat.c:1071
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
- msgstr "SEQPACKET"
- 
--#: ../netstat.c:1080
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr "LIVRE"
- 
--#: ../netstat.c:1096
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr "CONECTANDO"
- 
--#: ../netstat.c:1100
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr "CONECTADO"
- 
--#: ../netstat.c:1104
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr "DESCONECTANDO"
- 
--#: ../netstat.c:1135
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
- msgstr "Domain sockets UNIX ativos "
- 
--#: ../netstat.c:1137 ../netstat.c:1666
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr "(servidores e estabelecidas)"
- 
--#: ../netstat.c:1140 ../netstat.c:1669
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr "(sem os servidores)"
- 
--#: ../netstat.c:1142 ../netstat.c:1671
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr "(sem os servidores)"
- 
--#: ../netstat.c:1145
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
-@@ -993,114 +919,118 @@
- "\n"
- "Proto CntRef Flags       Tipo       Estado        I-Node Rota"
- 
--#: ../netstat.c:1147
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr " Caminho\n"
- 
--#: ../netstat.c:1167
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr "SABM ENVIADO"
- 
--#: ../netstat.c:1170
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr "RECUPERAÇÃO"
- 
--#: ../netstat.c:1184
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr "Ativar sockets AX.25\n"
- 
--#: ../netstat.c:1185
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr "Destino    Origem Dispositivo Estado       Vr/Vs  Send-Q  Recv-Q\n"
- 
--#: ../netstat.c:1228
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr "problemas lendo dados de %s\n"
- 
--#: ../netstat.c:1279
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
- "State"
- msgstr ""
- "Sockets IPX ativos\n"
--"Proto Recv-Q Send-Q Endereço Local             Endereço Remoto           "
--"Estado"
-+"Proto Recv-Q Send-Q Endereço Local             Endereço Remoto           Estado"
- 
--#: ../netstat.c:1281
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr " Usuário"
- 
--#: ../netstat.c:1315
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr "ESTAB"
- 
--#: ../netstat.c:1323
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr "DESC."
- 
--#: ../netstat.c:1367
--msgid "     - no statistics available -"
--msgstr "     - estatísticas não disponíveis -"
--
--#: ../netstat.c:1370
--msgid "[NO FLAGS]"
--msgstr "[SEM FLAGS]"
--
--#: ../netstat.c:1400
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
- msgstr "Tabela de Interfaces do Kernel\n"
- 
--#: ../netstat.c:1401
-+#: ../netstat.c:1465
-+#, fuzzy, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
--msgstr ""
--"Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV "
--"Opções\n"
-+msgstr "Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV Opções\n"
- 
--#: ../netstat.c:1404
-+#: ../netstat.c:1469
- msgid "missing interface information"
- msgstr "falta informação da interface"
- 
--#: ../netstat.c:1425
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
- "uso: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"
- 
--#: ../netstat.c:1426
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr "     netstat [-vnNcaeo] [<Socket>]\n"
- 
--#: ../netstat.c:1427
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- msgstr "     netstat [-vnNcaeo] [<Socket>]\n"
- 
--#: ../netstat.c:1429
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr "        -r, --route             mostra tabela de roteamento\n"
- 
--#: ../netstat.c:1430
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr "        -i, --interfaces        mostra tabela de interfaces\n"
- 
--#: ../netstat.c:1431
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr ""
- "        -o, --timers            mostra temporizadores\n"
- "\n"
- 
--#: ../netstat.c:1432
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr "        -i, --interfaces        mostra tabela de interfaces\n"
- 
--#: ../netstat.c:1434
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
-@@ -1108,19 +1038,38 @@
- "        -M, --masquerade        mostra conexões mascaradas\n"
- "\n"
- 
--#: ../netstat.c:1438 ../route.c:87
-+#: ../netstat.c:1505
-+#, fuzzy, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
-+msgstr "        -n, --numeric           não resolve nomes\n"
-+
-+#: ../netstat.c:1506
-+#, fuzzy, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
-+msgstr "        -n, --numeric           não resolve nomes\n"
-+
-+#: ../netstat.c:1507
-+#, fuzzy, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
-+msgstr "        -n, --numeric           não resolve nomes\n"
-+
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr "        -n, --numeric           não resolve nomes\n"
- 
--#: ../netstat.c:1439 ../route.c:88
-+#: ../netstat.c:1509 ../route.c:88
-+#, c-format
- msgid "        -e, --extend             display other/more information\n"
- msgstr "        -e, --extend             mostra outras/mais informações\n"
- 
--#: ../netstat.c:1440
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr "        -r, --route             mostra tabela de roteamento\n"
- 
--#: ../netstat.c:1441
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
-@@ -1128,30 +1077,33 @@
- "        -c, --continuous        listagem contínua\n"
- "\n"
- 
--#: ../netstat.c:1442
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr "        -L, --netlink           mostra mensagens netlink do kernel\n"
- 
--#: ../netstat.c:1443
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr "        -a, --all, --listening  mostra tudo\n"
- 
--#: ../netstat.c:1444
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr ""
- "        -o, --timers            mostra temporizadores\n"
- "\n"
- 
--#: ../netstat.c:1445 ../route.c:89
-+#: ../netstat.c:1515 ../route.c:89
-+#, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
--msgstr ""
--"        -F, --fib             mostra a Base de Informações de Repasse "
--"(default)\n"
-+msgstr "        -F, --fib             mostra a Base de Informações de Repasse (default)\n"
- 
--#: ../netstat.c:1446 ../route.c:90
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
-@@ -1159,136 +1111,145 @@
- "        -C, --cache              mostra cache de roteamento no lugar da FIB\n"
- "\n"
- 
--#: ../netstat.c:1448
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- 
--#: ../netstat.c:1449 ../route.c:92
--#, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-+#: ../netstat.c:1519
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr "  <AF>=Use '-A <af>' ou [--<af>' Default: %s\n"
- 
--#: ../netstat.c:1450 ../route.c:93
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
--msgstr ""
--"  Lista das famílias de endereços possíveis (que suportam roteamento):\n"
-+msgstr "  Lista das famílias de endereços possíveis (que suportam roteamento):\n"
- 
--#: ../netstat.c:1663
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr "Conexões Internet Ativas "
- 
--#: ../netstat.c:1673
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- "\n"
--"Proto Recv-Q Send-Q Endereço Local          Endereço Remoto         Estado   "
--"  "
-+"Proto Recv-Q Send-Q Endereço Local          Endereço Remoto         Estado     "
- 
--#: ../netstat.c:1675
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr " Usuário   "
- 
--#: ../netstat.c:1678
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr " Temporizador"
- 
--#: ../netstat.c:1708
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
- msgstr "IPv4 Group Memberships\n"
- 
--#: ../netstat.c:1709
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr "Interface       CntRef Grupo\n"
- 
--#: ../rarp.c:43
-+#: ../rarp.c:44
- msgid "This kernel does not support RARP.\n"
- msgstr "Este kernel não tem suporte a RARP.\n"
- 
--#: ../rarp.c:82
-+#: ../rarp.c:83
- #, c-format
- msgid "no RARP entry for %s.\n"
- msgstr "Sem entrada RARP para %s.\n"
- 
--#: ../rarp.c:95
-+#: ../rarp.c:96
- #, c-format
- msgid "%s: bad hardware address\n"
- msgstr "%s: endereço de hardware inválido\n"
- 
--#: ../rarp.c:127
-+#: ../rarp.c:128
- #, c-format
- msgid "rarp: cannot open file %s:%s.\n"
- msgstr "rarp: não foi possível abrir o arquivo %s:%s.\n"
- 
--#: ../rarp.c:139
-+#: ../rarp.c:140
- #, c-format
- msgid "rarp: format error at %s:%u\n"
- msgstr "rarp: erro de formato em %s:%u\n"
- 
--#: ../rarp.c:143 ../rarp.c:287
-+#: ../rarp.c:144 ../rarp.c:289
- #, c-format
- msgid "rarp: %s: unknown host\n"
- msgstr "rarp: %s: máquina desconhecida\n"
- 
--#: ../rarp.c:146
-+#: ../rarp.c:147
- #, c-format
- msgid "rarp: cannot set entry from %s:%u\n"
- msgstr "rarp: não é possível incluir uma entrada para %s:%u\n"
- 
--#: ../rarp.c:175
-+#: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
- msgstr ""
- "Uso: rarp -a                                   lista entradas no cache\n"
- 
--#: ../rarp.c:176
-+#: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
--msgstr ""
--"     rarp -d máquina                           remove entrada do cache\n"
-+msgstr "     rarp -d máquina                           remove entrada do cache\n"
- 
--#: ../rarp.c:177
-+#: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
--msgstr ""
--"     rarp [-t tipo-hw] -s máquina endereço-hw  adiciona entrada ao cache\n"
-+msgstr "     rarp [-t tipo-hw] -s máquina endereço-hw  adiciona entrada ao cache\n"
- 
--#: ../rarp.c:178
-+#: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
- msgstr ""
- "       rarp -f                               adiciona entradas a partir do\n"
- "                                             arquivo ethers.\n"
- 
--#: ../rarp.c:179
-+#: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
--msgstr ""
--"     rarp -V                                   mostra versão do programa\n"
-+msgstr "     rarp -V                                   mostra versão do programa\n"
- 
--#: ../rarp.c:236
-+#: ../rarp.c:238
- #, c-format
- msgid "%s: illegal option mix.\n"
- msgstr "%s: mistura ilegal de opções.\n"
- 
--#: ../rarp.c:267
-+#: ../rarp.c:269
- #, c-format
- msgid "rarp: %s: unknown hardware type.\n"
- msgstr "rarp: %s: tipo desconhecido de hardware.\n"
- 
--#: ../route.c:79
-+#: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
--"Uso: route [-nNvee] [-FC] [famílias_de_endereços]  Lista as tabelas de "
--"rotea-\n"
-+"Uso: route [-nNvee] [-FC] [famílias_de_endereços]  Lista as tabelas de rotea-\n"
- "                                                   mento do kernel\n"
- 
--#: ../route.c:80
-+#: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
-@@ -1298,35 +1259,42 @@
- "                                                   mento da família.\n"
- "\n"
- 
--#: ../route.c:82
-+#: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
- msgstr ""
--"       route {-h|--help} [família_de_endereços]    Sintaxe para a AF "
--"(Família\n"
--"                                                   de endereços) "
--"espeficicada.\n"
-+"       route {-h|--help} [família_de_endereços]    Sintaxe para a AF (Família\n"
-+"                                                   de endereços) espeficicada.\n"
- 
--#: ../route.c:83
-+#: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
- "\n"
- msgstr ""
--"       route {-V|--version}                        Mostra a versão do "
--"comando\n"
-+"       route {-V|--version}                        Mostra a versão do comando\n"
- "                                                   e sai.\n"
- 
-+#: ../route.c:92
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>=Use '-A <af>' ou [--<af>' Default: %s\n"
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr "Uso: ifconfig [-a] [-i] [-v] interface\n"
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr "                [[família] endereço]\n"
- 
- #: ../plipconfig.c:68
-+#, c-format
- msgid "       plipconfig -V | --version\n"
- msgstr "       plipconfig -V | --version\n"
- 
-@@ -1335,25 +1303,29 @@
- msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr "%s\tnibble %lu  trigger %lu\n"
- 
--#: ../iptunnel.c:79
-+#: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr "Uso: iptunnel { add | change | del | show } [ NOME ]\n"
- 
--#: ../iptunnel.c:80
-+#: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
--msgstr ""
--"          [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n"
-+msgstr "          [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n"
- 
--#: ../iptunnel.c:81
-+#: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- 
--#: ../iptunnel.c:82
-+#: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
- msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev DISP_FÍSICO ]\n"
- 
--#: ../iptunnel.c:83
-+#: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
-@@ -1361,451 +1333,734 @@
- "       iptunnel -V | --version\n"
- "\n"
- 
--#: ../iptunnel.c:84
-+#: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr "Onde: NAME := STRING\n"
- 
--#: ../iptunnel.c:85
-+#: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr "       END := { ENDEREÇO_IP | any }\n"
- 
--#: ../iptunnel.c:86
-+#: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr "       TOS  := { NÚMERO | inherit }\n"
- 
--#: ../iptunnel.c:87
-+#: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr "       TTL  := { 1..255 | inherit }\n"
- 
--#: ../iptunnel.c:88
-+#: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr "       KEY  := { QUATRO_NÚMEROS_SEPARADOS_POR_PONTOS | NÚMERO }\n"
- 
--#: ../iptunnel.c:326
-+#: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr "Chaves não são permitidas com ipip e sit.\n"
- 
--#: ../iptunnel.c:346
-+#: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr "Um túnel de broadcast precisa de um endereço de origem.\n"
- 
--#: ../iptunnel.c:361
-+#: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr "ttl != 0 e noptmudisc são incompatíveis\n"
- 
--#: ../iptunnel.c:373
-+#: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr "não foi possível determinar o modo do túnel (ip, gre ou sit)\n"
- 
--#: ../iptunnel.c:411
-+#: ../iptunnel.c:417
- #, c-format
- msgid "%s: %s/ip  remote %s  local %s "
- msgstr "%s: %s/ip  remoto %s  local %s "
- 
--#: ../iptunnel.c:415
-+#: ../iptunnel.c:421
- msgid "unknown"
- msgstr "Desconhecido"
- 
--#: ../iptunnel.c:447
-+#: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr "  Descarte pacotes fora de seqüência.\n"
- 
--#: ../iptunnel.c:449
-+#: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr "  É necessário checksum nos pacotes recebidos.\n"
- 
--#: ../iptunnel.c:451
-+#: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr "  Seqüencie pacotes na saída.\n"
- 
--#: ../iptunnel.c:453
-+#: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr "  Calcule o checksum para pacotes de saída.\n"
- 
--#: ../iptunnel.c:481
-+#: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
- msgstr "Formato errado de /proc/net/dev. Desculpe.\n"
- 
--#: ../iptunnel.c:494
-+#: ../iptunnel.c:500
- #, c-format
- msgid "Failed to get type of [%s]\n"
- msgstr "Não foi possível obter o tipo de [%s]\n"
- 
--#: ../iptunnel.c:510
-+#: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr "RX: Pacotes    Bytes        Erros  CsunErrs ForaSeq  Mcasts\n"
- 
--#: ../iptunnel.c:513
-+#: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr "TX: Pacotes    Bytes        Erros  DeadLoop SemRota  SemBufs\n"
- 
--#: ../statistics.c:45
-+#: ../statistics.c:47
- msgid "ICMP input histogram:"
- msgstr "Histograma de entrada ICMP:"
- 
--#: ../statistics.c:46
-+#: ../statistics.c:48
- msgid "ICMP output histogram:"
- msgstr "Histograma de saída ICMP"
- 
--#: ../statistics.c:63
-+#: ../statistics.c:65
- #, c-format
- msgid "Forwarding is %s"
- msgstr "Repassagem está %s"
- 
--#: ../statistics.c:64
--#, c-format
--msgid "Default TTL is %d"
-+#: ../statistics.c:66
-+#, fuzzy, c-format
-+msgid "Default TTL is %u"
- msgstr "Default TTL é %d"
- 
--#: ../statistics.c:65
--#, c-format
--msgid "%d total packets received"
-+#: ../statistics.c:67
-+#, fuzzy, c-format
-+msgid "%u total packets received"
- msgstr "%d total de pacotes recebidos"
- 
--#: ../statistics.c:66
--#, c-format
--msgid "%d with invalid headers"
-+#: ../statistics.c:68
-+#, fuzzy, c-format
-+msgid "%u with invalid headers"
- msgstr "%d com cabeçalhos inválidos"
- 
--#: ../statistics.c:67
--#, c-format
--msgid "%d with invalid addresses"
-+#: ../statistics.c:69
-+#, fuzzy, c-format
-+msgid "%u with invalid addresses"
- msgstr "%d com endereços inválidos"
- 
--#: ../statistics.c:68
--#, c-format
--msgid "%d forwarded"
-+#: ../statistics.c:70
-+#, fuzzy, c-format
-+msgid "%u forwarded"
- msgstr "%d repassados"
- 
--#: ../statistics.c:69
--#, c-format
--msgid "%d with unknown protocol"
-+#: ../statistics.c:71
-+#, fuzzy, c-format
-+msgid "%u with unknown protocol"
- msgstr "%d com protocolo desconhecido"
- 
--#: ../statistics.c:70
--#, c-format
--msgid "%d incoming packets discarded"
-+#: ../statistics.c:72
-+#, fuzzy, c-format
-+msgid "%u incoming packets discarded"
- msgstr "%d pacotes entrantes descartados"
- 
--#: ../statistics.c:71
--#, c-format
--msgid "%d incoming packets delivered"
-+#: ../statistics.c:73
-+#, fuzzy, c-format
-+msgid "%u incoming packets delivered"
- msgstr "%d pacotes entrantes despachados"
- 
--#: ../statistics.c:72
--#, c-format
--msgid "%d requests sent out"
-+#: ../statistics.c:74
-+#, fuzzy, c-format
-+msgid "%u requests sent out"
- msgstr "%d requisições enviadas"
- 
- #. ?
--#: ../statistics.c:73
--#, c-format
--msgid "%d outgoing packets dropped"
-+#: ../statistics.c:75
-+#, fuzzy, c-format
-+msgid "%u outgoing packets dropped"
- msgstr "%d pacotes saintes descartados"
- 
--#: ../statistics.c:74
--#, c-format
--msgid "%d dropped because of missing route"
-+#: ../statistics.c:76
-+#, fuzzy, c-format
-+msgid "%u dropped because of missing route"
- msgstr "%d descartados devido a falta de rota"
- 
--#: ../statistics.c:75
--#, c-format
--msgid "%d fragments dropped after timeout"
-+#: ../statistics.c:77
-+#, fuzzy, c-format
-+msgid "%u fragments dropped after timeout"
- msgstr "%d fragmentos descartados após estouro de tempo"
- 
--#: ../statistics.c:76
--#, c-format
--msgid "%d reassemblies required"
-+#: ../statistics.c:78
-+#, fuzzy, c-format
-+msgid "%u reassemblies required"
- msgstr "%d remontagens requeridas"
- 
- #. ?
--#: ../statistics.c:77
--#, c-format
--msgid "%d packets reassembled ok"
-+#: ../statistics.c:79
-+#, fuzzy, c-format
-+msgid "%u packets reassembled ok"
- msgstr "%d pacotes remontados sem problemas"
- 
--#: ../statistics.c:78
--#, c-format
--msgid "%d packet reassembles failed"
-+#: ../statistics.c:80
-+#, fuzzy, c-format
-+msgid "%u packet reassembles failed"
- msgstr "%d remontagens de pacotes falharam"
- 
--#: ../statistics.c:79
--#, c-format
--msgid "%d fragments received ok"
-+#: ../statistics.c:81
-+#, fuzzy, c-format
-+msgid "%u fragments received ok"
- msgstr "%d fragmentos recebidos sem problemas"
- 
--#: ../statistics.c:80
--#, c-format
--msgid "%d fragments failed"
-+#: ../statistics.c:82
-+#, fuzzy, c-format
-+msgid "%u fragments failed"
- msgstr "%d fragmentos falharam"
- 
--#: ../statistics.c:81
--#, c-format
--msgid "%d fragments created"
-+#: ../statistics.c:83
-+#, fuzzy, c-format
-+msgid "%u fragments created"
- msgstr "%d fragmentos criados"
- 
--#: ../statistics.c:86
--#, c-format
--msgid "%d ICMP messages received"
-+#: ../statistics.c:88
-+#, fuzzy, c-format
-+msgid "%u ICMP messages received"
- msgstr "%d mensagens ICMP recebidas"
- 
--#: ../statistics.c:87
--#, c-format
--msgid "%d input ICMP message failed."
-+#: ../statistics.c:89
-+#, fuzzy, c-format
-+msgid "%u input ICMP message failed."
- msgstr "%d mensagens ICMP entrantes falharam."
- 
--#: ../statistics.c:88 ../statistics.c:101
--#, c-format
--msgid "destination unreachable: %d"
-+#: ../statistics.c:90 ../statistics.c:103
-+#, fuzzy, c-format
-+msgid "destination unreachable: %u"
- msgstr "destino não alcançável: %d"
- 
--#: ../statistics.c:89
--#, c-format
--msgid "timeout in transit: %d"
-+#: ../statistics.c:91
-+#, fuzzy, c-format
-+msgid "timeout in transit: %u"
- msgstr "estouro de tempo em trânsito: %d"
- 
--#: ../statistics.c:90 ../statistics.c:103
--#, c-format
--msgid "wrong parameters: %d"
-+#: ../statistics.c:92 ../statistics.c:105
-+#, fuzzy, c-format
-+msgid "wrong parameters: %u"
- msgstr "parâmetros errados: %d"
- 
- #. ?
--#: ../statistics.c:91
--#, c-format
--msgid "source quenchs: %d"
-+#: ../statistics.c:93
-+#, fuzzy, c-format
-+msgid "source quenches: %u"
- msgstr "source quenchs: %d"
- 
--#: ../statistics.c:92
--#, c-format
--msgid "redirects: %d"
-+#: ../statistics.c:94
-+#, fuzzy, c-format
-+msgid "redirects: %u"
- msgstr "redireções: %d"
- 
--#: ../statistics.c:93
--#, c-format
--msgid "echo requests: %d"
-+#: ../statistics.c:95
-+#, fuzzy, c-format
-+msgid "echo requests: %u"
- msgstr "requisições de eco: %d"
- 
--#: ../statistics.c:94 ../statistics.c:107
--#, c-format
--msgid "echo replies: %d"
-+#: ../statistics.c:96 ../statistics.c:109
-+#, fuzzy, c-format
-+msgid "echo replies: %u"
- msgstr "respostas de eco: %d"
- 
--#: ../statistics.c:95
--#, c-format
--msgid "timestamp request: %d"
-+#: ../statistics.c:97
-+#, fuzzy, c-format
-+msgid "timestamp request: %u"
- msgstr "requisições de timestamp: %d"
- 
--#: ../statistics.c:96
--#, c-format
--msgid "timestamp reply: %d"
-+#: ../statistics.c:98
-+#, fuzzy, c-format
-+msgid "timestamp reply: %u"
- msgstr "respostas a timestamps: %d"
- 
--#: ../statistics.c:97
--#, c-format
--msgid "address mask request: %d"
-+#: ../statistics.c:99
-+#, fuzzy, c-format
-+msgid "address mask request: %u"
- msgstr "requisições de mascara de endereço: %d"
- 
- #. ?
--#: ../statistics.c:98
--msgid "address mask replies"
--msgstr "resposta a mascara de endereço"
-+#: ../statistics.c:100 ../statistics.c:113
-+#, fuzzy, c-format
-+msgid "address mask replies: %u"
-+msgstr "respostas a máscara de endereço: %d"
- 
- #. ?
--#: ../statistics.c:99
--#, c-format
--msgid "%d ICMP messages sent"
-+#: ../statistics.c:101
-+#, fuzzy, c-format
-+msgid "%u ICMP messages sent"
- msgstr "%d mensagens ICMP enviadas"
- 
--#: ../statistics.c:100
--#, c-format
--msgid "%d ICMP messages failed"
-+#: ../statistics.c:102
-+#, fuzzy, c-format
-+msgid "%u ICMP messages failed"
- msgstr "%d mensagens ICMP falharam"
- 
--#: ../statistics.c:102
--#, c-format
--msgid "time exceeded: %d"
-+#: ../statistics.c:104
-+#, fuzzy, c-format
-+msgid "time exceeded: %u"
- msgstr "tempo excedido: %d"
- 
- #. ?
--#: ../statistics.c:104
--#, c-format
--msgid "source quench: %d"
-+#: ../statistics.c:106
-+#, fuzzy, c-format
-+msgid "source quench: %u"
- msgstr "source quench: %d"
- 
--#: ../statistics.c:105
--#, c-format
--msgid "redirect: %d"
-+#: ../statistics.c:107
-+#, fuzzy, c-format
-+msgid "redirect: %u"
- msgstr "redireções: %d"
- 
--#: ../statistics.c:106
--#, c-format
--msgid "echo request: %d"
-+#: ../statistics.c:108
-+#, fuzzy, c-format
-+msgid "echo request: %u"
- msgstr "requisições de eco: %d"
- 
--#: ../statistics.c:108
--#, c-format
--msgid "timestamp requests: %d"
-+#: ../statistics.c:110
-+#, fuzzy, c-format
-+msgid "timestamp requests: %u"
- msgstr "requisições de timestamp: %d"
- 
--#: ../statistics.c:109
--#, c-format
--msgid "timestamp replies: %d"
-+#: ../statistics.c:111
-+#, fuzzy, c-format
-+msgid "timestamp replies: %u"
- msgstr "respostas a timestamp: %d"
- 
--#: ../statistics.c:110
--#, c-format
--msgid "address mask requests: %d"
-+#: ../statistics.c:112
-+#, fuzzy, c-format
-+msgid "address mask requests: %u"
- msgstr "requisições de máscara de endereço: %d"
- 
--#: ../statistics.c:111
--#, c-format
--msgid "address mask replies: %d"
--msgstr "respostas a máscara de endereço: %d"
--
--#: ../statistics.c:116
-+#: ../statistics.c:118
- #, c-format
- msgid "RTO algorithm is %s"
- msgstr "Algorítmo RTO é %s"
- 
--#: ../statistics.c:120
--#, c-format
--msgid "%d active connections openings"
-+#: ../statistics.c:122
-+#, fuzzy, c-format
-+msgid "%u active connections openings"
- msgstr "%d tentativas de conexão falharam"
- 
--#: ../statistics.c:121
--#, c-format
--msgid "%d passive connection openings"
-+#: ../statistics.c:123
-+#, fuzzy, c-format
-+msgid "%u passive connection openings"
- msgstr "%d opens passivos"
- 
--#: ../statistics.c:122
--#, c-format
--msgid "%d failed connection attempts"
-+#: ../statistics.c:124
-+#, fuzzy, c-format
-+msgid "%u failed connection attempts"
- msgstr "%d tentativas de conexão falharam"
- 
--#: ../statistics.c:123
--#, c-format
--msgid "%d connection resets received"
-+#: ../statistics.c:125
-+#, fuzzy, c-format
-+msgid "%u connection resets received"
- msgstr "%d resets de conexão recebidas"
- 
--#: ../statistics.c:124
--#, c-format
--msgid "%d connections established"
-+#: ../statistics.c:126
-+#, fuzzy, c-format
-+msgid "%u connections established"
- msgstr "%d conexões estabelecidas"
- 
--#: ../statistics.c:125
--#, c-format
--msgid "%d segments received"
-+#: ../statistics.c:127
-+#, fuzzy, c-format
-+msgid "%u segments received"
- msgstr "%d segmentos recebidos"
- 
--#: ../statistics.c:126
--#, c-format
--msgid "%d segments send out"
-+#: ../statistics.c:128
-+#, fuzzy, c-format
-+msgid "%u segments send out"
- msgstr "%d segmentos enviados"
- 
--#: ../statistics.c:127
--#, c-format
--msgid "%d segments retransmited"
-+#: ../statistics.c:129
-+#, fuzzy, c-format
-+msgid "%u segments retransmited"
- msgstr "%d segmentos retransmitidos"
- 
--#: ../statistics.c:128
--#, c-format
--msgid "%d bad segments received."
-+#: ../statistics.c:130
-+#, fuzzy, c-format
-+msgid "%u bad segments received."
- msgstr "%d segmentos ruins recebidos."
- 
--#: ../statistics.c:129
--#, c-format
--msgid "%d resets sent"
-+#: ../statistics.c:131
-+#, fuzzy, c-format
-+msgid "%u resets sent"
- msgstr "%d resets enviados"
- 
--#: ../statistics.c:134
--#, c-format
--msgid "%d packets received"
-+#: ../statistics.c:136
-+#, fuzzy, c-format
-+msgid "%u packets received"
- msgstr "%d pacotes recebidos"
- 
--#: ../statistics.c:135
--#, c-format
--msgid "%d packets to unknown port received."
-+#: ../statistics.c:137
-+#, fuzzy, c-format
-+msgid "%u packets to unknown port received."
- msgstr "%d pacotes para portas desconhecidas recebidos."
- 
--#: ../statistics.c:136
--#, c-format
--msgid "%d packet receive errors"
-+#: ../statistics.c:138
-+#, fuzzy, c-format
-+msgid "%u packet receive errors"
- msgstr "%d erros de recepção de pacotes"
- 
--#: ../statistics.c:137
--#, c-format
--msgid "%d packets sent"
-+#: ../statistics.c:139
-+#, fuzzy, c-format
-+msgid "%u packets sent"
- msgstr "%d pacotes enviados"
- 
--#: ../statistics.c:142
-+#: ../statistics.c:144
-+#, fuzzy, c-format
-+msgid "%u SYN cookies sent"
-+msgstr "%d pacotes enviados"
-+
-+#: ../statistics.c:145
-+#, fuzzy, c-format
-+msgid "%u SYN cookies received"
-+msgstr "%d pacotes recebidos"
-+
-+#: ../statistics.c:146
-+#, fuzzy, c-format
-+msgid "%u invalid SYN cookies received"
-+msgstr "%d pacotes recebidos"
-+
-+#: ../statistics.c:148
-+#, fuzzy, c-format
-+msgid "%u resets received for embryonic SYN_RECV sockets"
-+msgstr "%d resets recebidos para sockets embriônicos SYN_RECV"
-+
-+#: ../statistics.c:150
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue because of socket buffer overrun"
-+msgstr "%d pacotes retirados da fila de recepção devido a sobreposição de buffers de sockets"
-+
-+#. obsolete: 2.2.0 doesn't do that anymore
-+#: ../statistics.c:153
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue"
-+msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)"
-+
-+#: ../statistics.c:154
-+#, fuzzy, c-format
-+msgid ""
-+"%u packets dropped from out-of-order queue because of socket buffer overrun"
-+msgstr "%d pacotes descartados da fila de fora de ordem devido a sobreposição de buffers de sockets"
-+
-+#: ../statistics.c:156
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because they were out-of-window"
-+msgstr "%d pacotes ICMP descartados porque estavam fora da janela"
-+
-+#: ../statistics.c:158
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because socket was locked"
-+msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado"
-+
-+#: ../statistics.c:160
-+#, c-format
-+msgid "%u TCP sockets finished time wait in fast timer"
-+msgstr ""
-+
-+#: ../statistics.c:161
-+#, c-format
-+msgid "%u time wait sockets recycled by time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:162
-+#, c-format
-+msgid "%u TCP sockets finished time wait in slow timer"
-+msgstr ""
-+
-+#: ../statistics.c:163
-+#, c-format
-+msgid "%u passive connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:165
-+#, c-format
-+msgid "%u active connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:167
- #, c-format
--msgid "%d SYN cookies sent"
-+msgid "%u packets rejects in established connections because of timestamp"
-+msgstr ""
-+
-+#: ../statistics.c:169
-+#, fuzzy, c-format
-+msgid "%u delayed acks sent"
- msgstr "%d pacotes enviados"
- 
--#: ../statistics.c:143
-+#: ../statistics.c:170
- #, c-format
--msgid "%d SYN cookies received"
--msgstr "%d pacotes recebidos"
-+msgid "%u delayed acks further delayed because of locked socket"
-+msgstr ""
- 
--#: ../statistics.c:144
-+#: ../statistics.c:172
- #, c-format
--msgid "%d invalid SYN cookies received"
--msgstr "%d pacotes recebidos"
-+msgid "Quick ack mode was activated %u times"
-+msgstr ""
- 
--#: ../statistics.c:146
-+#: ../statistics.c:173
- #, c-format
--msgid "%d resets received for embryonic SYN_RECV sockets"
--msgstr "%d resets recebidos para sockets embriônicos SYN_RECV"
-+msgid "%u times the listen queue of a socket overflowed"
-+msgstr ""
- 
--#: ../statistics.c:148
-+#: ../statistics.c:175
- #, c-format
--msgid "%d packets pruned from receive queue because of socket buffer overrun"
-+msgid "%u SYNs to LISTEN sockets ignored"
- msgstr ""
--"%d pacotes retirados da fila de recepção devido a sobreposição de buffers de "
--"sockets"
- 
--#. obsolete: 2.2.0 doesn't do that anymore
--#: ../statistics.c:151
-+#: ../statistics.c:176
-+#, c-format
-+msgid "%u packets directly queued to recvmsg prequeue."
-+msgstr ""
-+
-+#: ../statistics.c:178
- #, c-format
--msgid "%d packets pruned from out-of-order queue"
-+msgid "%u of bytes directly received from backlog"
-+msgstr ""
-+
-+#: ../statistics.c:180
-+#, c-format
-+msgid "%u of bytes directly received from prequeue"
-+msgstr ""
-+
-+#: ../statistics.c:182
-+#, fuzzy, c-format
-+msgid "%u packets dropped from prequeue"
- msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)"
- 
--#: ../statistics.c:152
-+#: ../statistics.c:183
-+#, fuzzy, c-format
-+msgid "%u packet headers predicted"
-+msgstr "%d pacotes recebidos"
-+
-+#: ../statistics.c:184
- #, c-format
--msgid ""
--"%d packets dropped from out-of-order queue because of socket buffer overrun"
-+msgid "%u packets header predicted and directly queued to user"
- msgstr ""
--"%d pacotes descartados da fila de fora de ordem devido a sobreposição de "
--"buffers de sockets"
- 
--#: ../statistics.c:154
-+#: ../statistics.c:186
- #, c-format
--msgid "%d ICMP packets dropped because they were out-of-window"
--msgstr "%d pacotes ICMP descartados porque estavam fora da janela"
-+msgid "Ran %u times out of system memory during packet sending"
-+msgstr ""
- 
--#: ../statistics.c:156
-+#: ../statistics.c:188
-+#, fuzzy, c-format
-+msgid "%u acknowledgments not containing data received"
-+msgstr "%d pacotes para portas desconhecidas recebidos."
-+
-+#: ../statistics.c:189
- #, c-format
--msgid "%d ICMP packets dropped because socket was locked"
--msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado"
-+msgid "%u predicted acknowledgments"
-+msgstr ""
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr ""
-+
-+#: ../statistics.c:192
-+#, fuzzy, c-format
-+msgid "%u bad SACKs received"
-+msgstr "%d segmentos ruins recebidos."
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr ""
-+
-+#: ../statistics.c:194
-+#, c-format
-+msgid "Detected reordering %u times using SACK"
-+msgstr ""
-+
-+#: ../statistics.c:195
-+#, c-format
-+msgid "Detected reordering %u times using time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:196
-+#, c-format
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:197
-+#, c-format
-+msgid "%u congestion windows fully recovered"
-+msgstr ""
-+
-+#: ../statistics.c:198
-+#, c-format
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr ""
-+
-+#: ../statistics.c:199
-+#, c-format
-+msgid "%u congestion window recovered using DSACK"
-+msgstr ""
-+
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr ""
-+
-+#: ../statistics.c:201
-+#, fuzzy, c-format
-+msgid "%u retransmits lost"
-+msgstr "%d resets enviados"
-+
-+#: ../statistics.c:202
-+#, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr ""
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr ""
-+
-+#: ../statistics.c:205
-+#, fuzzy, c-format
-+msgid "%u fast retransmits"
-+msgstr "%d segmentos retransmitidos"
-+
-+#: ../statistics.c:206
-+#, c-format
-+msgid "%u forward retransmits"
-+msgstr ""
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr ""
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr ""
-+
-+#: ../statistics.c:209
-+#, fuzzy, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr "%d segmentos retransmitidos"
-+
-+#: ../statistics.c:210
-+#, fuzzy, c-format
-+msgid "%u sack retransmits failed"
-+msgstr "%d remontagens de pacotes falharam"
-+
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr ""
-+
-+#: ../statistics.c:212
-+#, fuzzy, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr "%d pacotes retirados da fila de recepção devido a sobreposição de buffers de sockets"
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr ""
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr ""
-+
-+#: ../statistics.c:215
-+#, fuzzy, c-format
-+msgid "%u DSACKs received"
-+msgstr "%d pacotes recebidos"
-+
-+#: ../statistics.c:216
-+#, fuzzy, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "%d total de pacotes recebidos"
-+
-+#: ../statistics.c:217
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "%d resets de conexão recebidas"
-+
-+#: ../statistics.c:218
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr "%d resets de conexão recebidas"
-+
-+#: ../statistics.c:219
-+#, fuzzy, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr "%d resets de conexão recebidas"
-+
-+#: ../statistics.c:220
-+#, c-format
-+msgid "%u connections aborted due to memory pressure"
-+msgstr ""
-+
-+#: ../statistics.c:221
-+#, fuzzy, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr "%d resets de conexão recebidas"
- 
- #: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr ""
-+
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr ""
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr ""
-+
-+#: ../statistics.c:292
- msgid "enabled"
- msgstr "habilitado"
- 
--#: ../statistics.c:222
-+#: ../statistics.c:292
- msgid "disabled"
- msgstr "desabilitado"
- 
--#: ../statistics.c:272
--#, c-format
--msgid "unknown title %s\n"
--msgstr "título %s desconhecido\n"
--
--#: ../statistics.c:298
-+#: ../statistics.c:375
- msgid "error parsing /proc/net/snmp"
- msgstr "erro lendo /proc/net/snmp"
- 
--#: ../statistics.c:311
-+#: ../statistics.c:388
- msgid "cannot open /proc/net/snmp"
- msgstr "não foi possível abrir /proc/net/snmp"
- 
-@@ -1819,89 +2074,95 @@
- msgid "Cannot change line discipline to `%s'.\n"
- msgstr "Não foi possível mudar a disciplina da linha para `%s'.\n"
- 
--#: ../lib/af.c:145 ../lib/hw.c:148
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr "Não Especificado"
- 
--#: ../lib/af.c:147
-+#: ../lib/af.c:155
- msgid "UNIX Domain"
- msgstr "UNIX Domain"
- 
--#: ../lib/af.c:150
-+#: ../lib/af.c:158
- msgid "DARPA Internet"
- msgstr "DARPA Internet"
- 
--#: ../lib/af.c:153
-+#: ../lib/af.c:161
- msgid "IPv6"
- msgstr "IPv6"
- 
--#: ../lib/af.c:156 ../lib/hw.c:169
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr "AX.25 AMPR"
- 
--#: ../lib/af.c:159 ../lib/hw.c:175
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr "NET/ROM AMPR"
- 
--#: ../lib/af.c:162
-+#: ../lib/af.c:170
- msgid "Novell IPX"
- msgstr "Novell IPX"
- 
--#: ../lib/af.c:165
-+#: ../lib/af.c:173
- msgid "Appletalk DDP"
- msgstr "Appletalk DDP"
- 
--#: ../lib/af.c:168 ../lib/hw.c:207
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr "Econet"
- 
--#: ../lib/af.c:171 ../lib/hw.c:172
-+#: ../lib/af.c:179
-+msgid "CCITT X.25"
-+msgstr ""
-+
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr "AMPR ROSE"
- 
--#: ../lib/af.c:174 ../lib/hw.c:160
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr "Ash"
- 
--#: ../lib/af.c:232
-+#: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr "Por favor não especifique mais que uma família de endereços.\n"
- 
--#: ../lib/af.c:293
-+#: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr "Excesso no número de famílias de endereços.\n"
- 
--#: ../lib/af.c:304
-+#: ../lib/af.c:315
- #, c-format
- msgid "Unknown address family `%s'.\n"
- msgstr "Família de endereços `%s' desconhecida.\n"
- 
--#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
--#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
--#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
--#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
--msgid "[NONE SET]"
--msgstr "[Nenhum configurado]"
--
--#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
- #, c-format
- msgid "in_arcnet(%s): invalid arcnet address!\n"
- msgstr "in_arcnet(%s): endereço arcnet inválido!\n"
- 
--#: ../lib/arcnet.c:108
-+#: ../lib/arcnet.c:97
- #, c-format
- msgid "in_arcnet(%s): trailing : ignored!\n"
- msgstr "in_arcnet(%s): trailing : ignorado!\n"
- 
--#: ../lib/arcnet.c:120
-+#: ../lib/arcnet.c:109
- #, c-format
- msgid "in_arcnet(%s): trailing junk!\n"
- msgstr "in_arcnet(%s): lixo no trailing!\n"
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
- msgstr "Endereço Ash mal formado"
- 
-+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-+msgid "[NONE SET]"
-+msgstr "[Nenhum configurado]"
-+
- #: ../lib/ax25.c:97 ../lib/netrom.c:100
- msgid "Invalid callsign"
- msgstr "Callsign inválido"
-@@ -1911,22 +2172,21 @@
- msgstr "Callsign muito longo"
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr "O AX.25 não foi configurado neste sistema.\n"
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr "Tabela de roteamento AX.25 do kernel\n"
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr "Destino      Iface    Uso\n"
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr "Tabela de roteamento para `ddp' ainda não suportada.\n"
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1942,253 +2202,268 @@
- msgid "in_ether(%s): trailing junk!\n"
- msgstr "in_ether(%s): lixo no trailing!\n"
- 
--#: ../lib/fddi.c:95 ../lib/fddi.c:110
-+#: ../lib/fddi.c:84 ../lib/fddi.c:99
- #, c-format
- msgid "in_fddi(%s): invalid fddi address!\n"
- msgstr "in_fddi(%S): endereço fddi inválido!\n"
- 
--#: ../lib/fddi.c:122
-+#: ../lib/fddi.c:111
- #, c-format
- msgid "in_fddi(%s): trailing : ignored!\n"
- msgstr "in_fddi(%s): trailing : ignorado!\n"
- 
--#: ../lib/fddi.c:134
-+#: ../lib/fddi.c:123
- #, c-format
- msgid "in_fddi(%s): trailing junk!\n"
- msgstr "in_fddi(%s): lixo no trailing!\n"
- 
--#: ../lib/getroute.c:97 ../lib/setroute.c:76
-+#: ../lib/getroute.c:101 ../lib/setroute.c:80
- #, c-format
- msgid "Address family `%s' not supported.\n"
- msgstr "Família de endereços `%s' não suportada.\n"
- 
--#: ../lib/getroute.c:103 ../lib/setroute.c:80
-+#: ../lib/getroute.c:107 ../lib/setroute.c:84
- #, c-format
- msgid "No routing for address family `%s'.\n"
- msgstr "Nenhum roteamento para a família `%s'\n"
- 
--#: ../lib/hippi.c:96 ../lib/hippi.c:111
-+#: ../lib/hippi.c:84 ../lib/hippi.c:99
- #, c-format
- msgid "in_hippi(%s): invalid hippi address!\n"
- msgstr "in_fddi(%S): endereço fddi inválido!\n"
- 
--#: ../lib/hippi.c:123
-+#: ../lib/hippi.c:111
- #, c-format
- msgid "in_hippi(%s): trailing : ignored!\n"
- msgstr "in_fddi(%s): trailing : ignorado!\n"
- 
--#: ../lib/hippi.c:134
-+#: ../lib/hippi.c:122
- #, c-format
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr "in_fddi(%s): lixo no trailing!\n"
- 
--#: ../lib/hw.c:147
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr "Loopback Local"
- 
--#: ../lib/hw.c:150
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr "SLIP"
- 
--#: ../lib/hw.c:151
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr "SLIP VJ"
- 
--#: ../lib/hw.c:152
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr "SLIP 6 bits"
- 
--#: ../lib/hw.c:153
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr "SLIP VJ 6 bits"
- 
--#: ../lib/hw.c:154
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr "SLIP Adaptativo"
- 
--#: ../lib/hw.c:157
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr "Ethernet"
- 
--#: ../lib/hw.c:163
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr "FDDI - Fibra Ótica"
- 
--#: ../lib/hw.c:166
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr "HIPPI"
- 
--#: ../lib/hw.c:178
-+#: ../lib/hw.c:191
-+msgid "generic X.25"
-+msgstr ""
-+
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr "Túnel IPIP"
- 
--#: ../lib/hw.c:181
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
- msgstr "Protocolo Ponto-a-Ponto"
- 
--#: ../lib/hw.c:184
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr "(Cisco)-HDLC"
- 
--#: ../lib/hw.c:185
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:188
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr "ARCnet"
- 
--#: ../lib/hw.c:191
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr "Frame Relay DLCI"
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr "FRAD - Dispositivo de Acesso a Frame Relay"
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr "IPv6 sobre IPv4"
- 
--#: ../lib/hw.c:198
-+#: ../lib/hw.c:214
- msgid "IrLAP"
- msgstr "IrLAP"
- 
--#: ../lib/hw.c:201
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr "16/4 Mbps Token Ring"
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:219
- msgid "16/4 Mbps Token Ring (New)"
- msgstr "16/4 Mbps Token Ring (Novo)"
- 
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
- #: ../lib/inet.c:153 ../lib/inet6.c:79
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
- msgstr "rresolve: família de endereços %d não suportada!\n"
- 
--#: ../lib/inet6_gr.c:79
-+#: ../lib/inet6.c:131
-+#, fuzzy
-+msgid "[UNKNOWN]"
-+msgstr "DESCONHECIDA"
-+
-+#: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr "NET/ROM não configurado neste sistema.\n"
- 
--#: ../lib/inet6_gr.c:82
-+#: ../lib/inet6_gr.c:74
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
- msgstr "Tabela de Roteamento IPv6 do Kernel\n"
- 
--#: ../lib/inet6_gr.c:84
-+#: ../lib/inet6_gr.c:76
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
--msgstr ""
--"Destino                                     Próximo \"Hop\"                  "
--"        Opções Métrica Ref   Uso Iface\n"
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
-+msgstr "Destino                                     Próximo \"Hop\"                          Opções Métrica Ref   Uso Iface\n"
- 
--#: ../lib/inet6_gr.c:158
-+#: ../lib/inet6_gr.c:150
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr "Cache de Vizinhos IPv6 do Kernel\n"
- 
--#: ../lib/inet6_gr.c:161
-+#: ../lib/inet6_gr.c:153
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
--msgstr ""
--"Vizinho                                     Endereço HW       Iface   Opções "
--"Estado Ref\n"
-+msgstr "Vizinho                                     Endereço HW       Iface   Opções Estado Ref\n"
- 
--#: ../lib/inet6_gr.c:165
-+#: ../lib/inet6_gr.c:157
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
- msgstr ""
--"Vizinho                                     Endereço HW       Iface   Opções "
--"Estado Ref\n"
-+"Vizinho                                     Endereço HW       Iface   Opções Estado Ref\n"
- "       Parado(seg) Remover(seg)\n"
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr "Uso: inet6_route [-vF] del Destino\n"
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr "       inet6_route [-vF] add Destino [gw Gw] [metric M] [[dev] If]\n"
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr "       inet6_route [-FC] flush      NÃO suportado\n"
- 
--#: ../lib/inet6_sr.c:182
-+#: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
- msgstr "Limpeza da tabela de roteamento `inet6' não é suportada\n"
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr "NET/ROM não configurado neste sistema.\n"
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
- msgstr "Tabela de Roteamento IP do Kernel\n"
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
--msgstr ""
--"Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso "
--"Iface\n"
-+msgstr "Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso Iface\n"
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
--msgstr ""
--"Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt "
--"Iface\n"
-+msgstr "Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt Iface\n"
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
--msgstr ""
--"Destino         Roteador        MáscaraGen     Opções Métrica Ref   Uso "
--"Iface    MSS   Janela irtt\n"
-+msgstr "Destino         Roteador        MáscaraGen     Opções Métrica Ref   Uso Iface    MSS   Janela irtt\n"
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
- msgstr "Tabela de Roteamento IP do Kernel\n"
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
--msgstr ""
--"Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso "
--"Iface\n"
-+msgstr "Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso Iface\n"
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
--msgstr ""
--"Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt "
--"Iface\n"
-+msgstr "Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt Iface\n"
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
--msgstr ""
--"Destino         Roteador        Origem         Opções Métrica Ref   Uso "
--"Iface    MSS   Janela irtt   HH  Arp\n"
-+msgstr "Destino         Roteador        Origem         Opções Métrica Ref   Uso Iface    MSS   Janela irtt   HH  Arp\n"
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
--msgstr ""
--"Destino         Roteador        Origem         Opções Métrica Ref   Uso "
--"Iface    MSS   Janela irtt   HH  Arp\n"
-+msgstr "Destino         Roteador        Origem         Opções Métrica Ref   Uso Iface    MSS   Janela irtt   HH  Arp\n"
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
-@@ -2196,31 +2471,36 @@
- "Uso: inet_route [-vF] del {-host|-net} Destino[/prefixo] [gw Gw] [metric M] "
- "[[dev] If]\n"
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
- msgstr ""
- "       inet_route [-vF] add {-host|-net} Destino[/prefixo] [gw Gw] [metric "
- "M]\n"
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
- msgstr ""
- "       inet_route [-vF] add {-host|-net} Destino[/prefixo] [metric M] "
- "reject\n"
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr "       inet_route [-FC] flush      NÃO suportado\n"
- 
-@@ -2230,14 +2510,17 @@
- msgstr "route: %s: não é possível usar uma REDE como roteador!\n"
- 
- #: ../lib/inet_sr.c:174
-+#, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr "route: MSS inválido.\n"
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr "route: janela inválida.\n"
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr "route: rtt inicial inválido.\n"
- 
-@@ -2252,75 +2535,92 @@
- msgstr "route: netmask %s inválida\n"
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr "route: a netmask não casa com o endereço de rede\n"
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
- msgstr "Não é suportado limpar a tabela de roteamento `inet'\n"
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
- msgstr "Não é suportado modificar o cache de roteamento `inet'\n"
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr "O AX.25 não foi configurado neste sistema.\n"
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
- msgstr "Tabela de roteamento IPX do kernel\n"
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
- msgstr "Destino                   Rede Roteadora            Nó Roteador\n"
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
- msgstr "NET/ROM: isto precisa ser escrito\n"
- 
--#: ../lib/masq_info.c:197
-+#: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr "Entradas de IP mascarado\n"
- 
--#: ../lib/masq_info.c:200
-+#: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr "prot   expira origem               destino             portas\n"
- 
--#: ../lib/masq_info.c:203
-+#: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
--"prot   expira    initseq delta prevd origem               destino            "
--" portas\n"
-+"prot   expira    initseq delta prevd origem               "
-+"destino             portas\n"
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr "NET/ROM não configurado neste sistema.\n"
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
- msgstr "Tabela de roteamento NET/ROM do kernel\n"
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr "Destino      Mnemônico Qualidade Vizinho   Iface\n"
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
- msgstr "uso de netrom\n"
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
- msgstr "NET/ROM: isto precisa ser escrito\n"
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr "Você não pode iniciar o PPP com este programa.\n"
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
- msgstr "Desculpe, use o pppd!\n"
- 
-@@ -2329,51 +2629,314 @@
- msgstr "Endereço do nó deve ter dez dígitos"
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr "ROSE não configurada neste sistema.\n"
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
- msgstr "Tabela de roteamento ROSE do kernel\n"
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr "in_tr(%s): endereço token ring inválido!\n"
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr "in_tr(%s): trailing : ignorado!\n"
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr "in_tr(%s): lixo no trailing!\n"
- 
--#: ../lib/interface.c:124
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
- msgstr "atenção: nenhum socket inet disponível: %s\n"
- 
--#: ../lib/interface.c:270
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr "Atenção: não foi possível abrir %s (%s). Saída limitada.\n"
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:504
-+#: ../lib/interface.c:571
- msgid "Device not found"
- msgstr "%s: dispositivo não encontrado"
- 
--#: ../lib/interface.c:508
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
-+msgstr "%s: erro obtendo informações da interface: %s\n"
-+
-+#: ../lib/interface.c:608
-+msgid "     - no statistics available -"
-+msgstr "     - estatísticas não disponíveis -"
-+
-+#: ../lib/interface.c:612
-+#, c-format
-+msgid "[NO FLAGS]"
-+msgstr "[SEM FLAGS]"
-+
-+#: ../lib/interface.c:688
-+#, c-format
-+msgid "%-9.9s Link encap:%s  "
-+msgstr "%-9.9s  Encapsulamento do Link: %s  "
-+
-+#: ../lib/interface.c:693
-+#, c-format
-+msgid "HWaddr %s  "
-+msgstr "Endereço de HW %s  "
-+
-+#: ../lib/interface.c:696
-+#, c-format
-+msgid "Media:%s"
-+msgstr "Mídia:%s"
-+
-+#: ../lib/interface.c:698
-+#, c-format
-+msgid "(auto)"
-+msgstr "(auto)"
-+
-+#: ../lib/interface.c:705
-+#, c-format
-+msgid "          %s addr:%s "
-+msgstr "          %s end.: %s "
-+
-+#: ../lib/interface.c:708
-+#, c-format
-+msgid " P-t-P:%s "
-+msgstr " P-a-P:%s "
-+
-+#: ../lib/interface.c:711
-+#, c-format
-+msgid " Bcast:%s "
-+msgstr " Bcast:%s "
-+
-+#: ../lib/interface.c:713
-+#, c-format
-+msgid " Mask:%s\n"
-+msgstr " Masc:%s\n"
-+
-+#: ../lib/interface.c:730
-+#, c-format
-+msgid "          inet6 addr: %s/%d"
-+msgstr "          endereço inet6: %s/%d"
-+
-+#: ../lib/interface.c:732
-+#, c-format
-+msgid " Scope:"
-+msgstr " Escopo:"
-+
-+#: ../lib/interface.c:735
-+#, c-format
-+msgid "Global"
-+msgstr "Global"
-+
-+#: ../lib/interface.c:738
-+#, c-format
-+msgid "Link"
-+msgstr "Link"
-+
-+#: ../lib/interface.c:741
-+#, c-format
-+msgid "Site"
-+msgstr "Site"
-+
-+#: ../lib/interface.c:744
-+#, c-format
-+msgid "Compat"
-+msgstr "Compat"
-+
-+#: ../lib/interface.c:747
-+#, c-format
-+msgid "Host"
-+msgstr "Máquina"
-+
-+#: ../lib/interface.c:750
-+#, c-format
-+msgid "Unknown"
-+msgstr "Desconhecido"
-+
-+#: ../lib/interface.c:765
-+#, c-format
-+msgid "          IPX/Ethernet II addr:%s\n"
-+msgstr "      Endereço IPX/Ethernet II:%s\n"
-+
-+#: ../lib/interface.c:768
-+#, c-format
-+msgid "          IPX/Ethernet SNAP addr:%s\n"
-+msgstr "      Endereço IPX/Ethernet SNAP:%s\n"
-+
-+#: ../lib/interface.c:771
-+#, c-format
-+msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+msgstr "      Endereço IPX/Ethernet 802.2:%s\n"
-+
-+#: ../lib/interface.c:774
-+#, c-format
-+msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+msgstr "      Endereço IPX/Ethernet 802.3:%s\n"
-+
-+#: ../lib/interface.c:784
-+#, c-format
-+msgid "          EtherTalk Phase 2 addr:%s\n"
-+msgstr "          Endereço EtherTalk fase 2:%s\n"
-+
-+#: ../lib/interface.c:793
-+#, c-format
-+msgid "          econet addr:%s\n"
-+msgstr "          Endereço econet:%s\n"
-+
-+#: ../lib/interface.c:800
-+#, c-format
-+msgid "[NO FLAGS] "
-+msgstr "[NENHUMA FLAG] "
-+
-+#: ../lib/interface.c:802
-+#, c-format
-+msgid "UP "
-+msgstr "UP "
-+
-+#: ../lib/interface.c:804
-+#, c-format
-+msgid "BROADCAST "
-+msgstr "BROADCAST"
-+
-+#: ../lib/interface.c:806
-+#, c-format
-+msgid "DEBUG "
-+msgstr "DEBUG "
-+
-+#: ../lib/interface.c:808
-+#, c-format
-+msgid "LOOPBACK "
-+msgstr "LOOPBACK"
-+
-+#: ../lib/interface.c:810
-+#, c-format
-+msgid "POINTOPOINT "
-+msgstr "POINTOPOINT "
-+
-+#: ../lib/interface.c:812
-+#, c-format
-+msgid "NOTRAILERS "
-+msgstr "NOTRAILERS "
-+
-+#: ../lib/interface.c:814
-+#, c-format
-+msgid "RUNNING "
-+msgstr "RUNNING "
-+
-+#: ../lib/interface.c:816
-+#, c-format
-+msgid "NOARP "
-+msgstr "NOARP "
-+
-+#: ../lib/interface.c:818
-+#, c-format
-+msgid "PROMISC "
-+msgstr "PROMISC "
-+
-+#: ../lib/interface.c:820
-+#, c-format
-+msgid "ALLMULTI "
-+msgstr "ALLMULTI "
-+
-+#: ../lib/interface.c:822
-+#, c-format
-+msgid "SLAVE "
-+msgstr "SLAVE "
-+
-+#: ../lib/interface.c:824
-+#, c-format
-+msgid "MASTER "
-+msgstr "MASTER "
-+
-+#: ../lib/interface.c:826
-+#, c-format
-+msgid "MULTICAST "
-+msgstr "MULTICAST "
-+
-+#: ../lib/interface.c:829
-+#, c-format
-+msgid "DYNAMIC "
-+msgstr "DYNAMIC "
-+
-+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-+#: ../lib/interface.c:832
-+#, c-format
-+msgid " MTU:%d  Metric:%d"
-+msgstr " MTU:%d  Métrica:%d"
-+
-+#: ../lib/interface.c:836
-+#, c-format
-+msgid "  Outfill:%d  Keepalive:%d"
-+msgstr "  Outfill:%d  Keepalive:%d"
-+
-+#: ../lib/interface.c:850
-+#, fuzzy, c-format
-+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposições:%lu frame:%lu\n"
-+
-+#: ../lib/interface.c:855
-+#, c-format
-+msgid "             compressed:%lu\n"
-+msgstr "             compactados:%lu\n"
-+
-+#: ../lib/interface.c:895
-+#, fuzzy, c-format
-+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgstr "Pacotes TX:%lu erros:%lu descartados:%lu sobreposições:%lu portadora:%lu\n"
-+
-+#: ../lib/interface.c:899
-+#, c-format
-+msgid "          collisions:%lu "
-+msgstr "          colisões:%lu "
-+
-+#: ../lib/interface.c:901
-+#, c-format
-+msgid "compressed:%lu "
-+msgstr "compactados:%lu "
-+
-+#: ../lib/interface.c:903
-+#, c-format
-+msgid "txqueuelen:%d "
-+msgstr "txqueuelen:%d "
-+
-+#: ../lib/interface.c:905
-+#, c-format
-+msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
- msgstr ""
--"%s: erro obtendo informações da interface: %s\n"
--"\n"
- 
--#: ../lib/sockets.c:59
-+#: ../lib/interface.c:916
-+#, c-format
-+msgid "Interrupt:%d "
-+msgstr "IRQ:%d "
-+
-+#. Only print devices using it for
-+#. I/O maps
-+#: ../lib/interface.c:919
-+#, c-format
-+msgid "Base address:0x%x "
-+msgstr "Endereço de E/S:0x%x "
-+
-+#: ../lib/interface.c:921
-+#, c-format
-+msgid "Memory:%lx-%lx "
-+msgstr "Memória:%lx-%lx "
-+
-+#: ../lib/interface.c:924
-+#, c-format
-+msgid "DMA chan:%x "
-+msgstr "Canal DMA:%x "
-+
-+#: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr "Nenhuma família de endereços que possa ser usada foi encontrada.\n"
- 
-@@ -2397,29 +2960,32 @@
- msgid "ip: argument is wrong: %s\n"
- msgstr "ip: argumento errado: %s\n"
- 
--#: ../ipmaddr.c:56
-+#: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr "Uso: ipmaddr [ add | del ] ENDMULTI dev STRING\n"
- 
--#: ../ipmaddr.c:57
-+#: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- 
--#: ../ipmaddr.c:58
-+#: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr "       ipmaddr -V | -version\n"
- 
--#: ../ipmaddr.c:258
-+#: ../ipmaddr.c:263
- #, c-format
- msgid "family %d "
- msgstr "família %d "
- 
--#: ../ipmaddr.c:267
-+#: ../ipmaddr.c:272
- #, c-format
- msgid " users %d"
- msgstr " usuários %d"
- 
--#: ../ipmaddr.c:353
-+#: ../ipmaddr.c:358
- msgid "Cannot create socket"
- msgstr "Não foi possível criar o socket"
- 
-@@ -2434,6 +3000,7 @@
- msgstr "slattach: tty_lock: (%s): %s\n"
- 
- #: ../slattach.c:192
-+#, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr "slattach: não foi possível escrever o arquivo PID\n"
- 
-@@ -2452,39 +3019,69 @@
- msgid "slattach: tty_hangup(RAISE): %s\n"
- msgstr "slattach: tty_hangup(RAISE): %s\n"
- 
--#: ../slattach.c:486
-+#: ../slattach.c:468
-+#, fuzzy, c-format
-+msgid "slattach: tty name too long\n"
-+msgstr "%s: nome muito longo\n"
-+
-+#: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr "slattach: tty_open: não foi possível obter o estado corrente!\n"
- 
--#: ../slattach.c:493
-+#: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
--msgstr ""
--"slattach: tty_open: não foi possível obter a disciplina de linha corrente!\n"
-+msgstr "slattach: tty_open: não foi possível obter a disciplina de linha corrente!\n"
- 
--#: ../slattach.c:501
-+#: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr "slattach: tty_open: não foi possível configurar o modo RAW!\n"
- 
--#: ../slattach.c:508
-+#: ../slattach.c:520
- #, c-format
- msgid "slattach: tty_open: cannot set %s bps!\n"
- msgstr "slattach: tty_open: não foi possível configurar %s bps!\n"
- 
--#: ../slattach.c:518
-+#: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr "slattach: tty_open: não foi possível configurar modo 8N1!\n"
- 
--#: ../slattach.c:686
-+#: ../slattach.c:672
-+#, c-format
-+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+msgstr ""
-+
-+#: ../slattach.c:704
- #, c-format
- msgid "%s started"
- msgstr "%s inicializado"
- 
--#: ../slattach.c:687
-+#: ../slattach.c:705
- #, c-format
- msgid " on %s"
- msgstr " em %s"
- 
--#: ../slattach.c:688
-+#: ../slattach.c:706
- #, c-format
- msgid " interface %s\n"
- msgstr "%s: interface desconhecida.\n"
-+
-+#~ msgid ""
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+#~ "<-''-\n"
-+#~ msgstr "  arp [-v]   [<HW>] [-i <if>] -s  <máquina> <end_hw>  [netmask <nm>] pub  <-''-\n"
-+
-+#~ msgid "%s: unknown interface: %s\n"
-+#~ msgstr "%s: interface desconhecida: %s\n"
-+
-+#~ msgid "address mask replies"
-+#~ msgstr "resposta a mascara de endereço"
-+
-+#~ msgid "unknown title %s\n"
-+#~ msgstr "título %s desconhecido\n"
-+
-+#~ msgid "Routing table for `ddp' not yet supported.\n"
-+#~ msgstr "Tabela de roteamento para `ddp' ainda não suportada.\n"
---- net-tools-1.60.orig/po/Makefile
-+++ net-tools-1.60/po/Makefile
-@@ -3,13 +3,13 @@
- INSTALL_DATA= ${INSTALL} -m 644
- INSTALLNLSDIR=${BASEDIR}/usr/share/locale
- 
--TUPDATE = tupdate
-+TUPDATE = msgmerge
- 
- NLSPACKAGE = net-tools
- 
- -include ../config.make
- ifeq ($(I18N),1)
--CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo
-+CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo ja.mo
- else
- CATALOGS =
- endif
-@@ -49,7 +49,7 @@
- 		lang=`echo $$cat | sed 's/.mo//'`; \
- 		mv $$lang.po $$lang.old.po; \
- 		echo "$$lang:"; \
--		if $(TUPDATE) $(NLSPACKAGE).pot $$lang.old.po > $$lang.po; then \
-+		if $(TUPDATE) $$lang.old.po $(NLSPACKAGE).pot > $$lang.po; then \
- 		rm -f $$lang.old.po; \
- 	else \
- 	 	echo "tupdate for $$cat failed!"; \
---- net-tools-1.60.orig/po/et_EE.po
-+++ net-tools-1.60/po/et_EE.po
-@@ -6,7 +6,8 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: net-tools 1.58\n"
--"POT-Creation-Date: 2001-02-15 21:28+0200\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
- "PO-Revision-Date: 2001-02-15 18:00+0300\n"
- "Last-Translator: Meelis Roos <mroos@linux.ee>\n"
- "Language-Team: Estonian <linux-ee@eenet.ee>\n"
-@@ -14,53 +15,58 @@
- "Content-Type: text/plain; charset=iso-8859-15\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:110 ../arp.c:269
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
- msgstr "arp: puudub hosti nimi\n"
- 
--#: ../arp.c:207 ../arp.c:221
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
- msgstr "%s jaoks pole ARP kirjet\n"
- 
--#: ../arp.c:239
-+#: ../arp.c:248
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr "arp: ei saa riistvaralist aadressi `%s' jaoks: %s\n"
- 
--#: ../arp.c:243
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr "arp: vale protokolli tüüp\n"
- 
--#: ../arp.c:252
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
- msgstr "arp: seadmel `%s' on riistvaraline aadress %s `%s'\n"
- 
--#: ../arp.c:282
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
- msgstr "arp: puudub riistvaraline aadress\n"
- 
--#: ../arp.c:290
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr "arp: vigane riistvaraline aadress\n"
- 
--#: ../arp.c:387
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr "arp: ei saa avada faili %s\n"
- 
--#: ../arp.c:403
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr "arp: formaadiviga real %u failis %s\n"
- 
--#: ../arp.c:416
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr "arp: ei saa kehtestada ARP kirjet real %u failis %s\n"
- 
--#: ../arp.c:437
-+#: ../arp.c:448
-+#, c-format
- msgid ""
- "Address                  HWtype  HWaddress           Flags Mask            "
- "Iface\n"
-@@ -68,45 +74,52 @@
- "Aadress                  HWtüüp  HWaadress           Lipud Mask            "
- "Liides\n"
- 
--#: ../arp.c:467
-+#: ../arp.c:476
-+#, fuzzy
-+msgid "<from_interface>"
-+msgstr " liides %s\n"
-+
-+#: ../arp.c:478
- msgid "(incomplete)"
- msgstr "(mittetäielik)"
- 
--#: ../arp.c:484
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr "%s (%s) aadressil "
- 
--#: ../arp.c:490
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
- msgstr "<mittetäielik>"
- 
--#: ../arp.c:496
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
- msgstr "võrgumask %s "
- 
--#: ../arp.c:513
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr "liides %s\n"
- 
--#: ../arp.c:592
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr "ARP kirjeid kokku: %s\tignoreerisin: %d\tleidsin: %d\n"
- 
--#: ../arp.c:596
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr "%s (%s) -- pole kirjet\n"
- 
--#: ../arp.c:598
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
- msgstr "arp: ei leidnud %d kirje hulgast sobivat\n"
- 
--#: ../arp.c:613
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-@@ -116,47 +129,45 @@
- "ARP cache vaatamine:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hosti nimi>]\n"
- 
--#: ../arp.c:614
-+#: ../arp.c:627
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
- msgstr ""
- "ARP kirje kustutamine:\n"
- "  arp [-v]          [-i <if>] -d  <hosti nimi> [pub] [nopub]\n"
- 
--#: ../arp.c:615
-+#: ../arp.c:628
-+#, fuzzy, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
- msgstr ""
- "ARP kirjete lisamine failist:\n"
- "  arp [-vnD] [<HW>] [-i <if>] -f  [<failinimi>]\n"
- 
--#: ../arp.c:616
-+#: ../arp.c:629
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
- msgstr ""
- "ARP kirje lisamine:\n"
- "  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [temp] [nopub]\n"
- 
--#: ../arp.c:617
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [netmask <nm>] pub\n"
--
--#: ../arp.c:618
-+#: ../arp.c:630
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
- msgstr ""
- "  arp [-v]   [<HW>] [-i <if>] -Ds <hosti nimi> <if> [netmask <nm>] pub\n"
- "\n"
- 
--#: ../arp.c:620
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
-@@ -164,122 +175,132 @@
- "        -a                       näita kõiki hoste alternatiivsel (BSD) "
- "kujul\n"
- 
--#: ../arp.c:621
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr "        -s, --set                uue ARP kirje seadmine\n"
- 
--#: ../arp.c:622
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr "        -d, --delete             määratud kirje kustutamine\n"
- 
--#: ../arp.c:623 ../netstat.c:1485 ../route.c:85
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr "        -v, --verbose            jutukas väljund\n"
- 
--#: ../arp.c:624
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, c-format
- msgid "        -n, --numeric            don't resolve names\n"
- msgstr "        -n, --numeric            mitte lahendada nimesid\n"
- 
--#: ../arp.c:625
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
- msgstr ""
- "        -i, --device             võrguliidese täpsustamine (näiteks eth0)\n"
- 
--#: ../arp.c:626
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
- msgstr "        -D, --use-device         lugeda <hwaddr> vastavalt liideselt\n"
- 
--#: ../arp.c:627
-+#: ../arp.c:639
-+#, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr "        -A, -p, --protocol       protokollipere määramine\n"
- 
--#: ../arp.c:628
-+#: ../arp.c:640
-+#, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
--"        -f, --file               lugeda kirjed antud failist või "
--"/etc/ethers'st\n"
-+"        -f, --file               lugeda kirjed antud failist või /etc/"
-+"ethers'st\n"
- "\n"
- 
--#: ../arp.c:630 ../rarp.c:181
-+#: ../arp.c:642 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
- msgstr ""
- "  <HW>=kasutage '-H <hw>' riistvaralise aadressi määramiseks.\n"
- "       Vaikimisi: %s\n"
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr "  Võimalike ARP-i toetavate riistvara tüüpide nimekiri:\n"
- 
--#: ../arp.c:664 ../arp.c:749
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr "arp: riistvara tüüpi %s ei toetata\n"
- 
--#: ../arp.c:668
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr "arp: aadressiperekonda %s ei toetata\n"
- 
--#: ../arp.c:703
-+#: ../arp.c:716
-+#, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr "arp: -N toetust pole veel\n"
- 
--#: ../arp.c:713
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr "arp: tundmatu aadressiperekond %s\n"
- 
--#: ../arp.c:722
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr "arp: tundmatu riistvara tüüp %s\n"
- 
--#: ../arp.c:741
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
- msgstr "arp: tuumas on ainult 'inet' aadressiperekonna toetus\n"
- 
--#: ../arp.c:754
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr "arp: riistvara tüübil %s pole ARP toetust\n"
- 
--#: ../hostname.c:69
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
- msgstr "Sean sõlme nimeks `%s'\n"
- 
--#: ../hostname.c:74
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr "%s: ainult root saab sõlme nime muuta\n"
- 
--#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr "%s: nimi on liiga pikk\n"
- 
--#: ../hostname.c:89
-+#: ../hostname.c:91
- #, c-format
- msgid "Setting hostname to `%s'\n"
- msgstr "Sean hosti nimeks `%s'\n"
- 
--#: ../hostname.c:94
-+#: ../hostname.c:96
- #, c-format
- msgid "%s: you must be root to change the host name\n"
- msgstr "%s: ainult root saab hosti nime muuta\n"
- 
--#: ../hostname.c:108
-+#: ../hostname.c:109
- #, c-format
- msgid "Setting domainname to `%s'\n"
- msgstr "Sean domeeni nimeks `%s'\n"
- 
--#: ../hostname.c:113
-+#: ../hostname.c:114
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
- msgstr "%s: ainult root saab domeeni nime muuta\n"
-@@ -304,25 +325,28 @@
- msgid "Result: h_addr_list=`%s'\n"
- msgstr "Tulemus: h_addr_list=`%s'\n"
- 
--#: ../hostname.c:209
-+#: ../hostname.c:208
- #, c-format
- msgid "%s: can't open `%s'\n"
- msgstr "%s: ei saa avada faili `%s'\n"
- 
--#: ../hostname.c:223
-+#: ../hostname.c:222
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
- msgstr ""
- "Kasutamine:\n"
- "  hostname [-v] {hosti nimi|-F fail}         hosti nime seadmine (ka "
- "failist)\n"
- 
--#: ../hostname.c:224
-+#: ../hostname.c:223
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
- "  domainname [-v] {nisdomeen|-F fail}        NIS domeeni nime seadmine\n"
- 
--#: ../hostname.c:226
-+#: ../hostname.c:225
-+#, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
-@@ -330,18 +354,21 @@
- "  nodename [-v] {nodename|-F fail}           DECneti võrgusõlme nime "
- "seadmine\n"
- 
--#: ../hostname.c:228
-+#: ../hostname.c:227
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr ""
- "  hostname [-v] [-d|-f|-s|-a|-i|-y|-n]       nime näitamine antud formaadis\n"
- 
--#: ../hostname.c:229
-+#: ../hostname.c:228
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
- msgstr "  hostname [-v]                              hosti nime näitamine\n"
- 
--#: ../hostname.c:230
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
-@@ -350,7 +377,8 @@
- "  hostname -h|--help                         seesama abiinfo\n"
- "\n"
- 
--#: ../hostname.c:231
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
-@@ -358,36 +386,44 @@
- "  dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- 
--#: ../hostname.c:232
-+#: ../hostname.c:231
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr "    -s, --short           lühike hosti nimi\n"
- 
--#: ../hostname.c:233
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr "     -a, --alias          alias-nimed\n"
- 
--#: ../hostname.c:234
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr "    -i, --ip-address      hosti IP aadressid\n"
- 
--#: ../hostname.c:235
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr ""
- "    -f, --fqdn, --long    pikk hosti nimi (FQDN - täielik süsteeminimi)\n"
- 
--#: ../hostname.c:236
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
- msgstr "    -d, --domain          DNS domeeni nimi\n"
- 
--#: ../hostname.c:237
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
- msgstr "    -y, --yp, --nis       NIS/YP domeeni nimi\n"
- 
--#: ../hostname.c:239
-+#: ../hostname.c:238
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
- msgstr "    -n, --node            DECneti võrgusõlme nimi\n"
- 
--#: ../hostname.c:241
-+#: ../hostname.c:240
-+#, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
-@@ -395,7 +431,8 @@
- "    -F, --file            lugeda hosti või NIS domeeni nimi failist\n"
- "\n"
- 
--#: ../hostname.c:243
-+#: ../hostname.c:242
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -415,6 +452,7 @@
- msgstr "%s: selle käsuga ei saa muuta DNS domeeni nime\n"
- 
- #: ../hostname.c:339
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
-@@ -423,6 +461,7 @@
- "Kui Te EI kasuta bind'i ega NIS'i nimede lahendamiseks, saate DNS domeeni\n"
- 
- #: ../hostname.c:340
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr "(mis on täieliku nime osa) nime muuta failist /etc/hosts.\n"
- 
-@@ -441,76 +480,97 @@
- msgid "getnodename()=`%s'\n"
- msgstr "getnodename()=`%s'\n"
- 
--#: ../ifconfig.c:110
-+#: ../ifconfig.c:107
-+#, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
--"Liides  MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Liides  MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
- "Lip\n"
- 
--#: ../ifconfig.c:132 ../ifconfig.c:164
--#, c-format
--msgid "%s: unknown interface: %s\n"
--msgstr "ifconfig: tundmatu liides %s: %s\n"
-+#: ../ifconfig.c:129 ../ifconfig.c:161
-+#, fuzzy, c-format
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr "%s: viga liidese info küsimisel: %s\n"
- 
--#: ../ifconfig.c:156 ../ifconfig.c:740 ../ifconfig.c:831 ../ifconfig.c:937
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
-+#, c-format
- msgid "No support for INET on this system.\n"
- msgstr "Antud süsteem ei toeta INET aadressiperekonda\n"
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:193
-+#, fuzzy, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr "%s: viga liidese info küsimisel: %s\n"
-+
-+#: ../ifconfig.c:202
-+#, fuzzy, c-format
- msgid ""
- "Usage:\n"
--"  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
- msgstr ""
- "Kasutamine:\n"
- "  ifconfig [-a] [-i] [-v] [-s] <liides> [[<AF>] <aadress>]\n"
- 
--#: ../ifconfig.c:181
-+#: ../ifconfig.c:204
-+#, c-format
- msgid "  [add <address>[/<prefixlen>]]\n"
- msgstr "  [add <aadress>[/<prefiksi pikkus>]]\n"
- 
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:205
-+#, c-format
- msgid "  [del <address>[/<prefixlen>]]\n"
- msgstr "  [del <aadress>[/<prefiksi pikkus>]]\n"
- 
--#: ../ifconfig.c:183
-+#: ../ifconfig.c:206
-+#, c-format
- msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
- msgstr "  [[-]broadcast [<aadress>]]  [[-]pointopoint [<aadress>]]\n"
- 
--#: ../ifconfig.c:184
-+#: ../ifconfig.c:207
-+#, c-format
- msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
- msgstr "  [netmask <aadress>]  [dstaddr <aadress>]  [tunnel <aadress>]\n"
- 
--#: ../ifconfig.c:187
-+#: ../ifconfig.c:210
-+#, c-format
- msgid "  [outfill <NN>] [keepalive <NN>]\n"
- msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
--#: ../ifconfig.c:189
-+#: ../ifconfig.c:212
-+#, c-format
- msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
- msgstr "  [hw <HW> <aadress>]  [metric <NN>]  [mtu <NN>]\n"
- 
--#: ../ifconfig.c:190
-+#: ../ifconfig.c:213
-+#, c-format
- msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
--#: ../ifconfig.c:191
-+#: ../ifconfig.c:214
-+#, c-format
- msgid "  [multicast]  [[-]promisc]\n"
- msgstr "  [multicast]  [[-]promisc]\n"
- 
--#: ../ifconfig.c:192
-+#: ../ifconfig.c:215
-+#, c-format
- msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
- msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tüüp>]\n"
- 
--#: ../ifconfig.c:194
-+#: ../ifconfig.c:217
-+#, c-format
- msgid "  [txqueuelen <NN>]\n"
- msgstr "  [txqueuelen <NN>]\n"
- 
--#: ../ifconfig.c:197
-+#: ../ifconfig.c:220
-+#, c-format
- msgid "  [[-]dynamic]\n"
- msgstr "  [[-]dynamic]\n"
- 
--#: ../ifconfig.c:199
-+#: ../ifconfig.c:222
-+#, c-format
- msgid ""
- "  [up|down] ...\n"
- "\n"
-@@ -518,73 +578,134 @@
- "  [up|down] ...\n"
- "\n"
- 
--#: ../ifconfig.c:201
-+#: ../ifconfig.c:224
-+#, c-format
- msgid "  <HW>=Hardware Type.\n"
- msgstr "  <HW>=riistvara tüüp\n"
- 
--#: ../ifconfig.c:202
-+#: ../ifconfig.c:225
-+#, c-format
- msgid "  List of possible hardware types:\n"
- msgstr "  Võimalike riistvara tüüpide nimekiri:\n"
- 
- #. 1 = ARPable
--#: ../ifconfig.c:204
-+#: ../ifconfig.c:227
- #, c-format
- msgid "  <AF>=Address family. Default: %s\n"
- msgstr "  <AF>=aadressiperekond, vaikimisi %s\n"
- 
--#: ../ifconfig.c:205
-+#: ../ifconfig.c:228
-+#, c-format
- msgid "  List of possible address families:\n"
- msgstr "  Võimalike aadressiperekondade nimekiri:\n"
- 
--#: ../ifconfig.c:361
-+#: ../ifconfig.c:303
-+#, c-format
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:380
-+#, c-format
- msgid "Unknown media type.\n"
- msgstr "Tundmatu meedia tüüp\n"
- 
--#: ../ifconfig.c:653
-+#: ../ifconfig.c:417
-+#, c-format
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:429
-+#, c-format
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:441
-+#, c-format
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:465
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:523
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:652
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:684
- #, c-format
- msgid "hw address type `%s' has no handler to set address. failed.\n"
- msgstr ""
- "riistvara aadressi tüübil `%s' pole käsitlejat aadressi seadmiseks - ebaõnn\n"
- 
--#: ../ifconfig.c:662
-+#: ../ifconfig.c:693
- #, c-format
- msgid "%s: invalid %s address.\n"
- msgstr "%s: vigane %s aadress\n"
- 
--#: ../ifconfig.c:706 ../ifconfig.c:796 ../ifconfig.c:882
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-+#, c-format
- msgid "No support for INET6 on this system.\n"
- msgstr "Antud süsteem ei toeta INET6 aadressiperekonda\n"
- 
--#: ../ifconfig.c:749 ../ifconfig.c:840
-+#: ../ifconfig.c:780 ../ifconfig.c:871
- #, c-format
- msgid "Interface %s not initialized\n"
- msgstr "Liides %s pole initsialiseeritud\n"
- 
--#: ../ifconfig.c:761 ../ifconfig.c:851
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, c-format
- msgid "Bad address.\n"
- msgstr "Vigane aadress\n"
- 
--#: ../ifconfig.c:854
-+#: ../ifconfig.c:885
-+#, c-format
- msgid "Address deletion not supported on this system.\n"
- msgstr "Antud süsteem ei toeta aadresside kustutamist\n"
- 
--#: ../ifconfig.c:947
-+#: ../ifconfig.c:957
-+#, fuzzy, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n"
-+
-+#: ../ifconfig.c:983
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr "Antud süsteem ei toeta ECONET aadressiperekonda\n"
- 
--#: ../ifconfig.c:955
-+#: ../ifconfig.c:991
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n"
- 
--#: ../netstat.c:429
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
- msgstr ""
- "(\"-p\" jaoks ei saanud infot lugeda: geteuid()=%d, aga vaja oleks root'u)\n"
- 
--#: ../netstat.c:433
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
-@@ -592,210 +713,223 @@
- "(Mõnesid protsesse ei saanud identifitseerida, teiste kasutajate\n"
- "info lugemiseks peab olema root)\n"
- 
--#: ../netstat.c:440 ../netstat.c:1171 ../netstat.c:1248
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr "LISTENING"
- 
--#: ../netstat.c:441
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr "CONN SENT"
- 
--#: ../netstat.c:442 ../netstat.c:1250
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr "DISC SENT"
- 
--#: ../netstat.c:443 ../netstat.c:510 ../netstat.c:889 ../netstat.c:1251
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr "ESTABLISHED"
- 
--#: ../netstat.c:465
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr "Aktiivsed NET/ROM soklid\n"
- 
--#: ../netstat.c:466
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
- msgstr ""
- "Kasutaja   Sihtpunkt  Lähtepunkt Liides  Olek         Vr/Vs    SaatJrk "
- "VvJrk\n"
- 
--#: ../netstat.c:476 ../netstat.c:1290
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr "Probleem andmete lugemisel failist %s\n"
- 
--#: ../netstat.c:511
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr "SYN_SENT"
- 
--#: ../netstat.c:512
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr "SYN_RECV"
- 
--#: ../netstat.c:513
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr "FIN_WAIT1"
- 
--#: ../netstat.c:514
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr "FIN_WAIT2"
- 
--#: ../netstat.c:515
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr "TIME_WAIT"
- 
--#: ../netstat.c:516
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr "CLOSE"
- 
--#: ../netstat.c:517
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr "CLOSE_WAIT"
- 
--#: ../netstat.c:518
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr "LAST_ACK"
- 
--#: ../netstat.c:519
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr "LISTEN"
- 
--#: ../netstat.c:520
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr "CLOSING"
- 
--#: ../netstat.c:587
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr "Hoiatus - sain imeliku igmp6 rea (nr. %d)\n"
- 
--#: ../netstat.c:592 ../netstat.c:630 ../netstat.c:751 ../netstat.c:883
--#: ../netstat.c:1014 ../netstat.c:1019
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr "netstat: aadressiperekonda %d ei toetata\n"
- 
--#: ../netstat.c:605 ../netstat.c:610 ../netstat.c:618 ../netstat.c:625
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr "Hoiatus - sain imeliku igmp rea (nr. %d)\n"
- 
--#: ../netstat.c:668
-+#: ../netstat.c:677
-+#, c-format
- msgid "Active X.25 sockets\n"
- msgstr "Aktiivsed X.25 soklid\n"
- 
- #. IMHO, Vr/Vs is not very usefull --SF
--#: ../netstat.c:670
-+#: ../netstat.c:679
-+#, c-format
- msgid ""
--"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  "
--"Recv-Q\n"
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
- msgstr ""
- "Sihtpunkt    Lähtepunkt      Liides  LCI  Olek         Vr/Vs  SaatJrk VvJrk\n"
- 
--#: ../netstat.c:747
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr "Hoiatus - sain imeliku tcp rea\n"
- 
--#: ../netstat.c:788 ../netstat.c:938 ../netstat.c:1057
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr "eikäi ((0.00/%ld/%d)"
- 
--#: ../netstat.c:792
-+#: ../netstat.c:804
- #, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr "käib (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:797
-+#: ../netstat.c:809
- #, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr "keepalive (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:802
-+#: ../netstat.c:814
- #, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr "timewait (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:807 ../netstat.c:947 ../netstat.c:1067
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr "eitea-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:879
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr "Hoiatus - sain imeliku udp rea\n"
- 
--#: ../netstat.c:897 ../netstat.c:1157 ../netstat.c:1190
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr "TUNDMATU"
- 
--#: ../netstat.c:943 ../netstat.c:1062
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr "käib-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:1028
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr "Hoiatus - sain imeliku raw rea\n"
- 
--#: ../netstat.c:1110
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr "Hoiatus - sain imeliku unix rea\n"
- 
--#: ../netstat.c:1137
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr "STREAM"
- 
--#: ../netstat.c:1141
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr "DGRAM"
- 
--#: ../netstat.c:1145
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr "RAW"
- 
--#: ../netstat.c:1149
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr "RDM"
- 
--#: ../netstat.c:1153
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
- msgstr "SEQPACKET"
- 
--#: ../netstat.c:1162
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr "VABA"
- 
--#: ../netstat.c:1178
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr "ÜHENDUMAS"
- 
--#: ../netstat.c:1182
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr "ÜHENDATUD"
- 
--#: ../netstat.c:1186
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr "LAHTIÜHENDUMAS"
- 
--#: ../netstat.c:1217
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
- msgstr "Aktiivsed UNIX domeeni soklid "
- 
--#: ../netstat.c:1219 ../netstat.c:1729
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr "(serverid ja ühendatud)"
- 
--#: ../netstat.c:1222 ../netstat.c:1732
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr "(ainult serverid)"
- 
--#: ../netstat.c:1224 ../netstat.c:1734
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr "(ilma serveriteta)"
- 
--#: ../netstat.c:1227
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
-@@ -803,32 +937,36 @@
- "\n"
- "Proto Mitu   Lipud       Tüüp       Olek         I-kirje "
- 
--#: ../netstat.c:1229
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr "Tee\n"
- 
--#: ../netstat.c:1249
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr "SABM SENT"
- 
--#: ../netstat.c:1252
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr "RECOVERY"
- 
--#: ../netstat.c:1266
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr "Aktiivsed AX.25 soklid\n"
- 
--#: ../netstat.c:1267
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr "Sihtpunkt  Lähtepunkt Liides  Olek         Vr/Vs    SaatJrk VvJrk\n"
- 
--#: ../netstat.c:1310
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr "Probleem andmete lugemisel failist %s\n"
- 
--#: ../netstat.c:1361
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-@@ -838,47 +976,53 @@
- "Proto VvJrk  SaatJrk Kohalik aadress           Väline aadress             "
- "Olek "
- 
--#: ../netstat.c:1363
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr " Kasutaja"
- 
--#: ../netstat.c:1397
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr "ESTAB"
- 
--#: ../netstat.c:1405
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr "UNK."
- 
--#: ../netstat.c:1443
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
- msgstr "Tuuma liideste tabel\n"
- 
--#: ../netstat.c:1447
-+#: ../netstat.c:1465
-+#, fuzzy, c-format
- msgid ""
--"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
--"Liides  MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Liides  MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Lip\n"
- 
--#: ../netstat.c:1451
-+#: ../netstat.c:1469
- msgid "missing interface information"
- msgstr "Puudulik informatsioon liideste kohta"
- 
--#: ../netstat.c:1474
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
- "Kasutamine: netstat [-veenNcCF] [<Af>] -r\n"
- "            netstat {-V|--version|-h|--help}\n"
- 
--#: ../netstat.c:1475
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr "            netstat [-vnNcaeol] [<Sokkel> ...]\n"
- 
--#: ../netstat.c:1476
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
-@@ -886,25 +1030,30 @@
- "            netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- 
--#: ../netstat.c:1478
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr "        -r, --route              ruutingutabeli näitamine\n"
- 
--#: ../netstat.c:1479
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr "        -i, --interfaces         liideste tabeli näitamine\n"
- 
--#: ../netstat.c:1480
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr "        -g, --groups             multiedastuse gruppide näitamine\n"
- 
--#: ../netstat.c:1481
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr ""
- "        -s, --statistics         võrgu statistika näitamine (SNMP stiilis)\n"
- 
--#: ../netstat.c:1483
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
-@@ -912,36 +1061,39 @@
- "        -M, --masquerade         maskeeritavate ühenduste näitamine\n"
- "\n"
- 
--#: ../netstat.c:1486 ../route.c:86
--msgid "        -n, --numeric            dont resolve names\n"
--msgstr "        -n, --numeric            mitte lahendada numbreid nimedeks\n"
--
--#: ../netstat.c:1487
--msgid "        --numeric-hosts          dont resolve host names\n"
-+#: ../netstat.c:1505
-+#, fuzzy, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
- msgstr "        --numeric-hosts          mitte lahendada hostinimesid\n"
- 
--#: ../netstat.c:1488
--msgid "        --numeric-ports          dont resolve port names\n"
-+#: ../netstat.c:1506
-+#, fuzzy, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
- msgstr "        --numeric-ports          mitte lahendada pordinimesid\n"
- 
--#: ../netstat.c:1489
--msgid "        --numeric-users          dont resolve user names\n"
-+#: ../netstat.c:1507
-+#, fuzzy, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
- msgstr "        --numeric-users          mitte lahendada kasutajanimesid\n"
- 
--#: ../netstat.c:1490
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr "        -N, --symbolic           lahendada riistvara aadressid\n"
- 
--#: ../netstat.c:1491 ../route.c:87
-+#: ../netstat.c:1509 ../route.c:88
-+#, c-format
- msgid "        -e, --extend             display other/more information\n"
- msgstr "        -e, --extend             muu info/lisainfo näitamine\n"
- 
--#: ../netstat.c:1492
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr ""
- "        -p, --programs           soklite kohta PID/protsessi nime näitamine\n"
- 
--#: ../netstat.c:1493
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
-@@ -949,22 +1101,26 @@
- "        -c, --continuous         pidevalt uuenev nimekiri\n"
- "\n"
- 
--#: ../netstat.c:1494
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr "        -l, --listening          kuulavate serversoklite näitamine\n"
- 
--#: ../netstat.c:1495
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr ""
- "        -a, --all, --listening   kõigi soklite näitamine (vaikimisi "
- "ühendatud)\n"
- 
--#: ../netstat.c:1496
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr "        -o, --timers             taimerite näitamine\n"
- 
--#: ../netstat.c:1497 ../route.c:88
-+#: ../netstat.c:1515 ../route.c:89
-+#, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
-@@ -972,7 +1128,8 @@
- "        -F, --fib                üldiste ruutingutabelite näitamine "
- "(vaikimisi)\n"
- 
--#: ../netstat.c:1498 ../route.c:89
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
-@@ -981,108 +1138,121 @@
- "näitamine\n"
- "\n"
- 
--#: ../netstat.c:1500
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
--"  <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- 
--#: ../netstat.c:1501 ../route.c:91
--#, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-+#: ../netstat.c:1519
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr "  <AF>=kasutage '-A <af>' või '--<af>' vaikimisi: %s\n"
- 
--#: ../netstat.c:1502 ../route.c:92
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
- msgstr "  Võimalike ruutingu toetavate aadressiperekondade nimekiri:\n"
- 
--#: ../netstat.c:1726
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr "Aktiivsed internetiühendused "
- 
--#: ../netstat.c:1736
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- "\n"
--"Proto  VvJrk SaatJrk Kohalik aadress        Väline aadress          Olek     "
--"  "
-+"Proto  VvJrk SaatJrk Kohalik aadress        Väline aadress          "
-+"Olek       "
- 
--#: ../netstat.c:1738
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr " Kasutaja   I-kirje   "
- 
--#: ../netstat.c:1741
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr " Taimer"
- 
--#: ../netstat.c:1771
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
- msgstr "IPv4 grupikuuluvused\n"
- 
--#: ../netstat.c:1772
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr "Liides          Mitu   Grupp\n"
- 
--#: ../rarp.c:43
-+#: ../rarp.c:44
- msgid "This kernel does not support RARP.\n"
- msgstr "rarp: tuum ei toeta RARP'i\n"
- 
--#: ../rarp.c:82
-+#: ../rarp.c:83
- #, c-format
- msgid "no RARP entry for %s.\n"
- msgstr "rarp: %s jaoks pole RARP kirjet\n"
- 
--#: ../rarp.c:95
-+#: ../rarp.c:96
- #, c-format
- msgid "%s: bad hardware address\n"
- msgstr "rarp: vigane riistvaraline aadress %s\n"
- 
--#: ../rarp.c:127
-+#: ../rarp.c:128
- #, c-format
- msgid "rarp: cannot open file %s:%s.\n"
- msgstr "rarp: ei saa avada faili %s:%s\n"
- 
--#: ../rarp.c:139
-+#: ../rarp.c:140
- #, c-format
- msgid "rarp: format error at %s:%u\n"
- msgstr "rarp: vorminguviga failis %s real %u\n"
- 
--#: ../rarp.c:143 ../rarp.c:287
-+#: ../rarp.c:144 ../rarp.c:289
- #, c-format
- msgid "rarp: %s: unknown host\n"
- msgstr "rarp: tundmatu host %s\n"
- 
--#: ../rarp.c:146
-+#: ../rarp.c:147
- #, c-format
- msgid "rarp: cannot set entry from %s:%u\n"
- msgstr "rarp: ei saa kehtestada kirjet failist %s realt %u\n"
- 
--#: ../rarp.c:175
-+#: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
- msgstr ""
- "Kasutamine:\n"
- "  rarp -a                              puhvris olevate kirjete vaatamine\n"
- 
--#: ../rarp.c:176
-+#: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
- msgstr "  rarp -d <hosti nimi>                 kirje kustutamine puhvrist\n"
- 
--#: ../rarp.c:177
-+#: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
- msgstr "  rarp [<HW>] -s <hosti nimi> <hwaddr> kirje lisamine puhvrisse\n"
- 
--#: ../rarp.c:178
-+#: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
- msgstr ""
- "  rarp -f                              kirjete lisamine failist /etc/ethers\n"
- 
--#: ../rarp.c:179
-+#: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
-@@ -1090,24 +1260,26 @@
- "  rarp -V                              programmi versiooni näitamine\n"
- "\n"
- 
--#: ../rarp.c:236
-+#: ../rarp.c:238
- #, c-format
- msgid "%s: illegal option mix.\n"
- msgstr "%s: lubamatu võtmete kombinatsioon\n"
- 
--#: ../rarp.c:267
-+#: ../rarp.c:269
- #, c-format
- msgid "rarp: %s: unknown hardware type.\n"
- msgstr "rarp: tundmatu riistvara tüüp %s\n"
- 
--#: ../route.c:79
-+#: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
- "Kasutamine:\n"
- "    route [-nNvee] [-FC] [<AF>]           Tuuma ruutingutabeli näitamine\n"
- 
--#: ../route.c:80
-+#: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
-@@ -1115,7 +1287,8 @@
- "    route [-v] [-FC] {add|del|flush} ...  Tuuma ruutingutabeli muutmine\n"
- "\n"
- 
--#: ../route.c:82
-+#: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
-@@ -1123,7 +1296,8 @@
- "    route {-h|--help} [<AF>]              Detailne süntaks perekonna AF "
- "jaoks\n"
- 
--#: ../route.c:83
-+#: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
-@@ -1132,15 +1306,23 @@
- "    route {-V|--version}                  Versiooni ja oskuste näitamine\n"
- "\n"
- 
-+#: ../route.c:92
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>=kasutage '-A <af>' või '--<af>' vaikimisi: %s\n"
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr "Kasutamine:  plipconfig [-a] [-i] [-v] liides\n"
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr "                        [nibble NN] [trigger NN]\n"
- 
- #: ../plipconfig.c:68
-+#, c-format
- msgid "       plipconfig -V | --version\n"
- msgstr "             plipconfig -V | --version\n"
- 
-@@ -1149,25 +1331,30 @@
- msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr "%s\tnibble %lu  trigger %lu\n"
- 
--#: ../iptunnel.c:84
-+#: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr "Kasutamine: iptunnel { add | change | del | show } [ NIMI ]\n"
- 
--#: ../iptunnel.c:85
-+#: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr ""
- "             [ mode { ipip | gre | sit } ] [ remote AADR ] [ local AADR ]\n"
- 
--#: ../iptunnel.c:86
-+#: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr "             [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- 
--#: ../iptunnel.c:87
-+#: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
- msgstr "             [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev LIIDES ]\n"
- 
--#: ../iptunnel.c:88
-+#: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
-@@ -1175,83 +1362,99 @@
- "             iptunnel -V | --version\n"
- "\n"
- 
--#: ../iptunnel.c:89
-+#: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr "Kus:   NIMI := STRING\n"
- 
--#: ../iptunnel.c:90
-+#: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr "       AADR := { IP_AADRESS | any }\n"
- 
--#: ../iptunnel.c:91
-+#: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr "       TOS  := { ARV | inherit }\n"
- 
--#: ../iptunnel.c:92
-+#: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr "       TTL  := { 1..255 | inherit }\n"
- 
--#: ../iptunnel.c:93
-+#: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr ""
- "       KEY  := { PUNKTIDEGA_ARVUNELIK | ARV }\n"
- "       LIIDES := FÜÜSILISE_LIIDESE_NIMI\n"
- 
--#: ../iptunnel.c:331
-+#: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr "ipip ja sit juures ei ole võtmed lubatud\n"
- 
--#: ../iptunnel.c:351
-+#: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr "Leviedastusega tunnel vajab lähteaadressi\n"
- 
--#: ../iptunnel.c:366
-+#: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr "ttl != 0 ning noptmudisc ei sobi kokku\n"
- 
--#: ../iptunnel.c:378
-+#: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr "Ei suuda määrata tunneli moodi (ipip, gre või sit)\n"
- 
--#: ../iptunnel.c:416
-+#: ../iptunnel.c:417
- #, c-format
- msgid "%s: %s/ip  remote %s  local %s "
- msgstr "%s: %s/ip teises otsas %s  siin %s "
- 
--#: ../iptunnel.c:420
-+#: ../iptunnel.c:421
- msgid "unknown"
- msgstr "tundmatu"
- 
--#: ../iptunnel.c:452
-+#: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr "  Järjekorravälised paketid visatakse minema\n"
- 
--#: ../iptunnel.c:454
-+#: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr "  Vastuvõetavates pakettides on kontrollsumma kohustuslik\n"
- 
--#: ../iptunnel.c:456
-+#: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr "  Väljuvad paketid varustatakse järjekorranumbritega\n"
- 
--#: ../iptunnel.c:458
-+#: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr "  Väljuvad paketid varustatakse kontrollsummaga\n"
- 
--#: ../iptunnel.c:486
-+#: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
- msgstr "/proc/net/dev on vales formaadis. Vale tuuma versioon?\n"
- 
--#: ../iptunnel.c:499
-+#: ../iptunnel.c:500
- #, c-format
- msgid "Failed to get type of [%s]\n"
- msgstr "Ei suutnud kindlaks teha liidese %s tüüpi\n"
- 
--#: ../iptunnel.c:515
-+#: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr "RX: Pakette    Baite        Vigu   KSumVigu JrkVigu  Levipakette\n"
- 
--#: ../iptunnel.c:518
-+#: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr "TX: Pakette    Baite        Vigu   DeadLoop EiRuudi  MäluOtsas\n"
- 
-@@ -1658,13 +1861,13 @@
- msgstr "%u paketti pandi otse recvmsg eeljärjekorda"
- 
- #: ../statistics.c:178
--#, c-format
--msgid "%u packets directly received from backlog"
-+#, fuzzy, c-format
-+msgid "%u of bytes directly received from backlog"
- msgstr "%u paketti võeti vastu otse backlog-ist"
- 
- #: ../statistics.c:180
--#, c-format
--msgid "%u packets directly received from prequeue"
-+#, fuzzy, c-format
-+msgid "%u of bytes directly received from prequeue"
- msgstr "%u paketti võeti vastu otse eeljärjekorrast"
- 
- #: ../statistics.c:182
-@@ -1673,8 +1876,8 @@
- msgstr "%u paketti kustutati eeljärjekorrast"
- 
- #: ../statistics.c:183
--#, c-format
--msgid "%u packets header predicted"
-+#, fuzzy, c-format
-+msgid "%u packet headers predicted"
- msgstr "%u paketti päise õige ennustusega"
- 
- #: ../statistics.c:184
-@@ -1687,19 +1890,210 @@
- msgid "Ran %u times out of system memory during packet sending"
- msgstr "Pakettide saatmisel sai %u korda süsteemne mälu otsa"
- 
--#: ../statistics.c:253
-+#: ../statistics.c:188
-+#, fuzzy, c-format
-+msgid "%u acknowledgments not containing data received"
-+msgstr "%u sisenevat paketti tundmatule pordile"
-+
-+#: ../statistics.c:189
-+#, c-format
-+msgid "%u predicted acknowledgments"
-+msgstr ""
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr ""
-+
-+#: ../statistics.c:192
-+#, fuzzy, c-format
-+msgid "%u bad SACKs received"
-+msgstr "%u vigast segmenti võeti vastu"
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr ""
-+
-+#: ../statistics.c:194
-+#, c-format
-+msgid "Detected reordering %u times using SACK"
-+msgstr ""
-+
-+#: ../statistics.c:195
-+#, c-format
-+msgid "Detected reordering %u times using time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:196
-+#, c-format
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:197
-+#, fuzzy, c-format
-+msgid "%u congestion windows fully recovered"
-+msgstr "%u ühenduse katkestust saabus"
-+
-+#: ../statistics.c:198
-+#, c-format
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr ""
-+
-+#: ../statistics.c:199
-+#, c-format
-+msgid "%u congestion window recovered using DSACK"
-+msgstr ""
-+
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr ""
-+
-+#: ../statistics.c:201
-+#, fuzzy, c-format
-+msgid "%u retransmits lost"
-+msgstr "%u katkestust saadeti"
-+
-+#: ../statistics.c:202
-+#, fuzzy, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr "%u segmenti saadeti uuesti"
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr ""
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr ""
-+
-+#: ../statistics.c:205
-+#, fuzzy, c-format
-+msgid "%u fast retransmits"
-+msgstr "%u segmenti saadeti uuesti"
-+
-+#: ../statistics.c:206
-+#, fuzzy, c-format
-+msgid "%u forward retransmits"
-+msgstr "%u edastati"
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr ""
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr ""
-+
-+#: ../statistics.c:209
-+#, fuzzy, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr "%u segmenti saadeti uuesti"
-+
-+#: ../statistics.c:210
-+#, fuzzy, c-format
-+msgid "%u sack retransmits failed"
-+msgstr "%u pakettide kokkupanekut ebaõnnestus"
-+
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr ""
-+
-+#: ../statistics.c:212
-+#, fuzzy, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr ""
-+"%u paketti kustutati vastuvõtu järjekorrast sokli puhvri ületäitumise tõttu"
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr ""
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr ""
-+
-+#: ../statistics.c:215
-+#, fuzzy, c-format
-+msgid "%u DSACKs received"
-+msgstr "%u paketti võeti vastu"
-+
-+#: ../statistics.c:216
-+#, fuzzy, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "kokku võeti vastu %u paketti"
-+
-+#: ../statistics.c:217
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "%u ühenduse katkestust saabus"
-+
-+#: ../statistics.c:218
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr "%u ühenduse katkestust saabus"
-+
-+#: ../statistics.c:219
-+#, fuzzy, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr "%u ühenduse katkestust saabus"
-+
-+#: ../statistics.c:220
-+#, c-format
-+msgid "%u connections aborted due to memory pressure"
-+msgstr ""
-+
-+#: ../statistics.c:221
-+#, fuzzy, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr "%u aktiivsest ühendusest keelduti ajatempli tõttu"
-+
-+#: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr ""
-+
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr ""
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr ""
-+
-+#: ../statistics.c:292
- msgid "enabled"
- msgstr "lubatud"
- 
--#: ../statistics.c:253
-+#: ../statistics.c:292
- msgid "disabled"
- msgstr "keelatud"
- 
--#: ../statistics.c:336
-+#: ../statistics.c:375
- msgid "error parsing /proc/net/snmp"
- msgstr "Viga /proc/net/snmp analüüsimisel"
- 
--#: ../statistics.c:349
-+#: ../statistics.c:388
- msgid "cannot open /proc/net/snmp"
- msgstr "Ei saa avada faili /proc/net/snmp"
- 
-@@ -1713,7 +2107,7 @@
- msgid "Cannot change line discipline to `%s'.\n"
- msgstr "Ei suuda seada `%s' liiniprotokolliks\n"
- 
--#: ../lib/af.c:153 ../lib/hw.c:156
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr "UNSPEC"
- 
-@@ -1729,11 +2123,11 @@
- msgid "IPv6"
- msgstr "IPv6"
- 
--#: ../lib/af.c:164 ../lib/hw.c:177
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr "AMPR AX.25"
- 
--#: ../lib/af.c:167 ../lib/hw.c:183
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr "AMPR NET/ROM"
- 
-@@ -1745,7 +2139,7 @@
- msgid "Appletalk DDP"
- msgstr "Appletalk DDP"
- 
--#: ../lib/af.c:176 ../lib/hw.c:218
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr "Econet"
- 
-@@ -1753,19 +2147,21 @@
- msgid "CCITT X.25"
- msgstr "CCITT X.25"
- 
--#: ../lib/af.c:182 ../lib/hw.c:180
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr "AMPR ROSE"
- 
--#: ../lib/af.c:185 ../lib/hw.c:168
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr "Ash"
- 
- #: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr "Meil on kombeks üks aadressiperekond korraga\n"
- 
- #: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr "Liiga palju aadressiperekonna argumente\n"
- 
-@@ -1790,6 +2186,7 @@
- msgstr "in_arcnet(%s): sodi lõpus\n"
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
- msgstr "Vigane Ash aadress"
- 
-@@ -1808,22 +2205,21 @@
- msgstr "Liiga pikk kutsung"
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr "AX.25 pole antud süsteemis konfigureeritud\n"
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr "Tuuma AX.25 ruutingutabel\n"
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr "Sihtpunkt    Liides   Kasutus\n"
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n"
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1879,90 +2275,94 @@
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr "in_hippi(%s): sodi lõpus\n"
- 
--#: ../lib/hw.c:155
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr "Kohalik loopback"
- 
--#: ../lib/hw.c:158
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr "Serial Line IP"
- 
--#: ../lib/hw.c:159
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr "VJ Serial Line IP"
- 
--#: ../lib/hw.c:160
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr "6-bitine Serial Line IP"
- 
--#: ../lib/hw.c:161
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr "VJ 6-bitine Serial Line IP"
- 
--#: ../lib/hw.c:162
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr "Adaptiivne Serial Line IP"
- 
--#: ../lib/hw.c:165
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr "Ethernet"
- 
--#: ../lib/hw.c:171
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr "Fiber Distributed Data Interface"
- 
--#: ../lib/hw.c:174
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr "HIPPI"
- 
--#: ../lib/hw.c:186
-+#: ../lib/hw.c:191
- msgid "generic X.25"
- msgstr "üldine X.25"
- 
--#: ../lib/hw.c:189
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr "IPIP tunnel"
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
- msgstr "Kakspunktprotokoll"
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr "(Cisco-)HDLC"
- 
--#: ../lib/hw.c:196
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:199
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr "ARCnet"
- 
--#: ../lib/hw.c:202
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr "Frame Relay DLCI"
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr "Frame Relay Access Device"
- 
--#: ../lib/hw.c:206
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr "IPv6-in-IPv4"
- 
--#: ../lib/hw.c:209
-+#: ../lib/hw.c:214
- msgid "IrLAP"
- msgstr "IrLAP"
- 
--#: ../lib/hw.c:212
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr "16/4 Mbps Token Ring"
- 
--#: ../lib/hw.c:214
-+#: ../lib/hw.c:219
- msgid "16/4 Mbps Token Ring (New)"
- msgstr "16/4 Mbps Token Ring (New)"
- 
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
- #: ../lib/inet.c:153 ../lib/inet6.c:79
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
-@@ -1972,27 +2372,32 @@
- msgid "[UNKNOWN]"
- msgstr "[TUNDMATU]"
- 
--#: ../lib/inet6_gr.c:79
-+#: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr "INET6 (IPv6) pole antud süsteemis konfigureeritud\n"
- 
--#: ../lib/inet6_gr.c:82
-+#: ../lib/inet6_gr.c:74
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
- msgstr "Tuuma IPv6 ruutingutabel\n"
- 
--#: ../lib/inet6_gr.c:84
-+#: ../lib/inet6_gr.c:76
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
- msgstr ""
--"Sihtpunkt                                   Järgmine samm                    "
--"       Lipud Meetr  Mitu Kasut Liides\n"
-+"Sihtpunkt                                   Järgmine "
-+"samm                           Lipud Meetr  Mitu Kasut Liides\n"
- 
--#: ../lib/inet6_gr.c:158
-+#: ../lib/inet6_gr.c:150
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr "Tuuma IPv6 naabrite puhver\n"
- 
--#: ../lib/inet6_gr.c:161
-+#: ../lib/inet6_gr.c:153
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
-@@ -2000,7 +2405,8 @@
- "Naaber                                      HW Aadress        Liides   Lipud "
- "Mitu Olek\n"
- 
--#: ../lib/inet6_gr.c:165
-+#: ../lib/inet6_gr.c:157
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
-@@ -2009,31 +2415,38 @@
- "Mitu Olek            Stale(sec) Delete(sec)\n"
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr "Kasutamine: route [-vF] del AADRESS\n"
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr ""
- "            route [-vF] add AADRESS [gw GW] [metric M] [[dev] LIIDES]\n"
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr "            route [-FC] flush      Seda EI toetata\n"
- 
- #: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
- msgstr "`inet6' ruutingutabeli tühjendamist ei toetata\n"
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr "INET (IPv4) pole antud süsteemis konfigureeritud\n"
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
- msgstr "Tuuma IP ruutingutabel\n"
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2042,6 +2455,7 @@
- "Liides\n"
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
-@@ -2050,6 +2464,7 @@
- "Liides\n"
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
-@@ -2058,10 +2473,12 @@
- "Liides   MSS   Aken   irtt\n"
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
- msgstr "Tuuma IP ruutingu puhver\n"
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2070,6 +2487,7 @@
- "Liides\n"
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
-@@ -2078,6 +2496,7 @@
- "Liides\n"
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
-@@ -2086,6 +2505,7 @@
- "Liides   MSS    Aken  irtt  HH  Arp\n"
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-@@ -2093,7 +2513,8 @@
- "Lähtepunkt      Sihtpunkt       Ruuter          Lipud Meetr  Mitu Kasut "
- "Liides   MSS   Aken   irtt  TOS HHRef HHUptod     SpecDst\n"
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
-@@ -2101,31 +2522,36 @@
- "Kasutamine: route [-vF] del {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric "
- "M] [[dev] LIIDES]\n"
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
- msgstr ""
- "            route [-vF] add {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric "
- "M]\n"
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- "                              [netmask N] [mss MSS] [window W] [irtt I]\n"
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr "                              [mod] [dyn] [reinstate] [[dev] LIIDES]\n"
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
- msgstr ""
- "            route [-vF] add {-host|-net} AADRESS[/PREFIKS] [metric M] "
- "reject\n"
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr "            route [-FC] flush      Seda EI toetata\n"
- 
-@@ -2135,14 +2561,17 @@
- msgstr "route: %s: võrku ei saa kasutada ruuterina\n"
- 
- #: ../lib/inet_sr.c:174
-+#, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr "route: vigane MSS/MTU\n"
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr "route: Vigane akna suurus\n"
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr "route: vigane algne rtt\n"
- 
-@@ -2157,75 +2586,92 @@
- msgstr "route: vale võrgumask %s\n"
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr "route: võrgumask ei sobi ruutingu aadressiga\n"
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
- msgstr "`inet' ruutingutabeli tühjendamist ei toetata\n"
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
- msgstr "`inet' ruutingu puhvri muutmist ei toetata\n"
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr "IPX pole antud süsteemis konfigureeritud\n"
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
- msgstr "Tuuma IPX ruutingutabel\n"
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
- msgstr "Sihtpunkt                 Ruuteri võrk              Ruuter ise\n"
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
- msgstr "IPX osa vajab ümbertegemist\n"
- 
- #: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr "IP maskeerimise kirjed\n"
- 
- #: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr "Proto  Aegub  Lähtepunkt           Sihtpunkt            Pordid\n"
- 
- #: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
--"Proto  Aegub     Initseq Delta Prevd Lähtepunkt           Sihtpunkt          "
--"  Pordid\n"
-+"Proto  Aegub     Initseq Delta Prevd Lähtepunkt           "
-+"Sihtpunkt            Pordid\n"
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr "NET/ROM pole antud süsteemis konfigureeritud\n"
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
- msgstr "Tuuma NET/ROM ruutingutabel\n"
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr "Sihtpunkt   Mnemoonika Kvaliteet Naaber    Liides\n"
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
- msgstr "netrom kasutus\n"
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
- msgstr "NET/ROM osa vajab ümbertegemist\n"
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr "Sellest programmist ei saa PPP-d käivitada\n"
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
- msgstr "Palun kasutage pppd'd\n"
- 
-@@ -2234,287 +2680,314 @@
- msgstr "Sõlme aadress peab olema kümnekohaline"
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr "ROSE pole antud süsteemis konfigureeritud\n"
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
- msgstr "Tuuma ROSE ruutingutabel\n"
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr "in_tr(%s): vigane token ring-aadress\n"
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr "in_tr(%s): ignoreerin lõpetavat koolonit\n"
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr "in_tr(%s): sodi lõpus\n"
- 
--#: ../lib/interface.c:164
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
- msgstr "Hoiatus: `inet' sokleid ei ole: %s\n"
- 
--#: ../lib/interface.c:316
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr "Hoiatus: ei saa avada faili %s (%s). Väljund on piiratud.\n"
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:556
-+#: ../lib/interface.c:571
- msgid "Device not found"
- msgstr "Liidest ei leitud"
- 
--#: ../lib/interface.c:560
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
- msgstr "%s: viga liidese info küsimisel: %s\n"
- 
--#: ../lib/interface.c:593
-+#: ../lib/interface.c:608
- msgid "     - no statistics available -"
- msgstr "     - statistikat ei ole      -"
- 
--#: ../lib/interface.c:597
-+#: ../lib/interface.c:612
-+#, c-format
- msgid "[NO FLAGS]"
- msgstr "[LIPPE POLE]"
- 
--#: ../lib/interface.c:673
-+#: ../lib/interface.c:688
- #, c-format
- msgid "%-9.9s Link encap:%s  "
- msgstr "%-9.9s kapseldus:%s  "
- 
--#: ../lib/interface.c:678
-+#: ../lib/interface.c:693
- #, c-format
- msgid "HWaddr %s  "
- msgstr "HWaddr %s  "
- 
--#: ../lib/interface.c:681
-+#: ../lib/interface.c:696
- #, c-format
- msgid "Media:%s"
- msgstr "meedia:%s"
- 
--#: ../lib/interface.c:683
-+#: ../lib/interface.c:698
-+#, c-format
- msgid "(auto)"
- msgstr "(auto)"
- 
--#: ../lib/interface.c:690
-+#: ../lib/interface.c:705
- #, c-format
- msgid "          %s addr:%s "
- msgstr "          %s aadress:%s "
- 
--#: ../lib/interface.c:693
-+#: ../lib/interface.c:708
- #, c-format
- msgid " P-t-P:%s "
- msgstr " P-t-P:%s "
- 
--#: ../lib/interface.c:696
-+#: ../lib/interface.c:711
- #, c-format
- msgid " Bcast:%s "
- msgstr " bcast:%s "
- 
--#: ../lib/interface.c:698
-+#: ../lib/interface.c:713
- #, c-format
- msgid " Mask:%s\n"
- msgstr " mask:%s\n"
- 
--#: ../lib/interface.c:715
-+#: ../lib/interface.c:730
- #, c-format
- msgid "          inet6 addr: %s/%d"
- msgstr "          inet6 aadr: %s/%d"
- 
--#: ../lib/interface.c:717
-+#: ../lib/interface.c:732
-+#, c-format
- msgid " Scope:"
- msgstr " skoop:"
- 
--#: ../lib/interface.c:720
-+#: ../lib/interface.c:735
-+#, c-format
- msgid "Global"
- msgstr "globaalne"
- 
--#: ../lib/interface.c:723
-+#: ../lib/interface.c:738
-+#, c-format
- msgid "Link"
- msgstr "ühendus"
- 
--#: ../lib/interface.c:726
-+#: ../lib/interface.c:741
-+#, c-format
- msgid "Site"
- msgstr "site"
- 
--#: ../lib/interface.c:729
-+#: ../lib/interface.c:744
-+#, c-format
- msgid "Compat"
- msgstr "ühilduvus"
- 
--#: ../lib/interface.c:732
-+#: ../lib/interface.c:747
-+#, c-format
- msgid "Host"
- msgstr "host"
- 
--#: ../lib/interface.c:735
-+#: ../lib/interface.c:750
-+#, c-format
- msgid "Unknown"
- msgstr "tundmatu"
- 
--#: ../lib/interface.c:750
-+#: ../lib/interface.c:765
- #, c-format
- msgid "          IPX/Ethernet II addr:%s\n"
- msgstr "          IPX/Ethernet II aadr:%s\n"
- 
--#: ../lib/interface.c:753
-+#: ../lib/interface.c:768
- #, c-format
- msgid "          IPX/Ethernet SNAP addr:%s\n"
- msgstr "          IPX/Ethernet SNAP aadr:%s\n"
- 
--#: ../lib/interface.c:756
-+#: ../lib/interface.c:771
- #, c-format
- msgid "          IPX/Ethernet 802.2 addr:%s\n"
- msgstr "          IPX/Ethernet 802.2 aadr:%s\n"
- 
--#: ../lib/interface.c:759
-+#: ../lib/interface.c:774
- #, c-format
- msgid "          IPX/Ethernet 802.3 addr:%s\n"
- msgstr "          IPX/Ethernet 802.3 aadr:%s\n"
- 
--#: ../lib/interface.c:769
-+#: ../lib/interface.c:784
- #, c-format
- msgid "          EtherTalk Phase 2 addr:%s\n"
- msgstr "          EtherTalk Phase 2 aadr:%s\n"
- 
--#: ../lib/interface.c:778
-+#: ../lib/interface.c:793
- #, c-format
- msgid "          econet addr:%s\n"
- msgstr "          econeti aadr:%s\n"
- 
--#: ../lib/interface.c:785
-+#: ../lib/interface.c:800
-+#, c-format
- msgid "[NO FLAGS] "
- msgstr "[LIPPE POLE]"
- 
--#: ../lib/interface.c:787
-+#: ../lib/interface.c:802
-+#, c-format
- msgid "UP "
- msgstr "UP "
- 
--#: ../lib/interface.c:789
-+#: ../lib/interface.c:804
-+#, c-format
- msgid "BROADCAST "
- msgstr "BROADCAST "
- 
--#: ../lib/interface.c:791
-+#: ../lib/interface.c:806
-+#, c-format
- msgid "DEBUG "
- msgstr "DEBUG "
- 
--#: ../lib/interface.c:793
-+#: ../lib/interface.c:808
-+#, c-format
- msgid "LOOPBACK "
- msgstr "LOOPBACK "
- 
--#: ../lib/interface.c:795
-+#: ../lib/interface.c:810
-+#, c-format
- msgid "POINTOPOINT "
- msgstr "POINTOPOINT "
- 
--#: ../lib/interface.c:797
-+#: ../lib/interface.c:812
-+#, c-format
- msgid "NOTRAILERS "
- msgstr "NOTRAILERS "
- 
--#: ../lib/interface.c:799
-+#: ../lib/interface.c:814
-+#, c-format
- msgid "RUNNING "
- msgstr "RUNNING "
- 
--#: ../lib/interface.c:801
-+#: ../lib/interface.c:816
-+#, c-format
- msgid "NOARP "
- msgstr "NOARP "
- 
--#: ../lib/interface.c:803
-+#: ../lib/interface.c:818
-+#, c-format
- msgid "PROMISC "
- msgstr "PROMISC "
- 
--#: ../lib/interface.c:805
-+#: ../lib/interface.c:820
-+#, c-format
- msgid "ALLMULTI "
- msgstr "ALLMULTI "
- 
--#: ../lib/interface.c:807
-+#: ../lib/interface.c:822
-+#, c-format
- msgid "SLAVE "
- msgstr "SLAVE "
- 
--#: ../lib/interface.c:809
-+#: ../lib/interface.c:824
-+#, c-format
- msgid "MASTER "
- msgstr "MASTER "
- 
--#: ../lib/interface.c:811
-+#: ../lib/interface.c:826
-+#, c-format
- msgid "MULTICAST "
- msgstr "MULTICAST "
- 
--#: ../lib/interface.c:814
-+#: ../lib/interface.c:829
-+#, c-format
- msgid "DYNAMIC "
- msgstr "DYNAMIC "
- 
- #. DONT FORGET TO ADD THE FLAGS IN ife_print_short
--#: ../lib/interface.c:817
-+#: ../lib/interface.c:832
- #, c-format
- msgid " MTU:%d  Metric:%d"
- msgstr " MTU:%d meetrika:%d"
- 
--#: ../lib/interface.c:821
-+#: ../lib/interface.c:836
- #, c-format
- msgid "  Outfill:%d  Keepalive:%d"
- msgstr "  ülalhoidepakettide intervall:%d  ülalhoidetaimaut:%d"
- 
--#: ../lib/interface.c:835
-+#: ../lib/interface.c:850
- #, c-format
- msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
- msgstr "RX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu kaadri vigu:%lu\n"
- 
--#: ../lib/interface.c:840
-+#: ../lib/interface.c:855
- #, c-format
- msgid "             compressed:%lu\n"
- msgstr "             pakitud:%lu\n"
- 
--#: ../lib/interface.c:852
-+#: ../lib/interface.c:895
- #, c-format
- msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
- msgstr "TX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu carrier:%lu\n"
- 
--#: ../lib/interface.c:856
-+#: ../lib/interface.c:899
- #, c-format
- msgid "          collisions:%lu "
- msgstr "          kollisioone:%lu "
- 
--#: ../lib/interface.c:858
-+#: ../lib/interface.c:901
- #, c-format
- msgid "compressed:%lu "
- msgstr "pakitud:%lu "
- 
--#: ../lib/interface.c:860
-+#: ../lib/interface.c:903
- #, c-format
- msgid "txqueuelen:%d "
- msgstr "txqueuelen:%d "
- 
--#: ../lib/interface.c:862
-+#: ../lib/interface.c:905
- #, c-format
- msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
- msgstr "RX baite:%llu (%lu.%lu %s)  TX baite:%llu (%lu.%lu %s)\n"
- 
--#: ../lib/interface.c:873
-+#: ../lib/interface.c:916
- #, c-format
- msgid "Interrupt:%d "
- msgstr "katkestus:%d "
- 
- #. Only print devices using it for
- #. I/O maps
--#: ../lib/interface.c:876
-+#: ../lib/interface.c:919
- #, c-format
- msgid "Base address:0x%x "
- msgstr "baasaadress:0x%x "
- 
--#: ../lib/interface.c:878
-+#: ../lib/interface.c:921
- #, c-format
- msgid "Memory:%lx-%lx "
- msgstr "mälu:%lx-%lx "
- 
--#: ../lib/interface.c:881
-+#: ../lib/interface.c:924
- #, c-format
- msgid "DMA chan:%x "
- msgstr "DMA kanal:%x "
- 
- #: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr "Ei leidnud ühtegi kasutatavat aadressiperekonda\n"
- 
-@@ -2538,29 +3011,32 @@
- msgid "ip: argument is wrong: %s\n"
- msgstr "iptunnel: vale argument %s\n"
- 
--#: ../ipmaddr.c:58
-+#: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr "Kasutamine: ipmaddr [ add | del ] MULTIAADR dev STRING\n"
- 
--#: ../ipmaddr.c:59
-+#: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr "            ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- 
--#: ../ipmaddr.c:60
-+#: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr "            ipmaddr -V | -version\n"
- 
--#: ../ipmaddr.c:260
-+#: ../ipmaddr.c:263
- #, c-format
- msgid "family %d "
- msgstr "perekond %d "
- 
--#: ../ipmaddr.c:269
-+#: ../ipmaddr.c:272
- #, c-format
- msgid " users %d"
- msgstr " kasutajaid %d"
- 
--#: ../ipmaddr.c:355
-+#: ../ipmaddr.c:358
- msgid "Cannot create socket"
- msgstr "Ei saa avada soklit"
- 
-@@ -2575,6 +3051,7 @@
- msgstr "slattach: tty_lock: (%s): %s\n"
- 
- #: ../slattach.c:192
-+#, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr "slattach: ei saa PID faili kirjutada\n"
- 
-@@ -2594,18 +3071,22 @@
- msgstr "slattach: tty_hangup(RAISE): %s\n"
- 
- #: ../slattach.c:468
-+#, c-format
- msgid "slattach: tty name too long\n"
- msgstr "slattach: terminali nimi on liiga pikk\n"
- 
- #: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr "slattach: tty_open: ei saa lugeda jooksvat olekut\n"
- 
- #: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
- msgstr "slattach: tty_open: liiniprotokolli küsimine ebaõnnestus\n"
- 
- #: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr "slattach: tty_open: ei saa seada RAW moodi\n"
- 
-@@ -2615,6 +3096,7 @@
- msgstr "slattach: tty_open: ei saa seada kiiruseks %s bps\n"
- 
- #: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr "slattach: tty_open: ei saa seada 8N1 moodi\n"
- 
-@@ -2637,3 +3119,20 @@
- #, c-format
- msgid " interface %s\n"
- msgstr " liides %s\n"
-+
-+#~ msgid ""
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+#~ "<-''-\n"
-+#~ msgstr ""
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [netmask <nm>] "
-+#~ "pub\n"
-+
-+#~ msgid "%s: unknown interface: %s\n"
-+#~ msgstr "ifconfig: tundmatu liides %s: %s\n"
-+
-+#~ msgid "        -n, --numeric            dont resolve names\n"
-+#~ msgstr ""
-+#~ "        -n, --numeric            mitte lahendada numbreid nimedeks\n"
-+
-+#~ msgid "Routing table for `ddp' not yet supported.\n"
-+#~ msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n"
---- net-tools-1.60.orig/po/de.po
-+++ net-tools-1.60/po/de.po
-@@ -1,106 +1,121 @@
--# $Id: de.po,v 1.10 2000/08/01 03:19:48 ecki Exp $
-+# $Id: de.po,v 1.11 2003/10/25 21:15:09 ecki Exp $
- # German translation for net-tools 1.51
- # Copyright (C) 1999 Ralf Bächle <ralf@gnu.org>
- msgid ""
- msgstr ""
- "Project-Id-Version: net-tools 1.51\n"
--"POT-Creation-Date: 2000-02-14 02:31+0100\n"
--"PO-Revision-Date: 1998-03-01 00:02+0100\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
-+"PO-Revision-Date: 2005-06-13 00:02+0100\n"
- "Last-Translator: Ralf Bächle <ralf@gnu.org>\n"
- "Language-Team:\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:110 ../arp.c:269
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
--msgstr "arp: Hostname muß angegeben werden\n"
-+msgstr "arp: Hostname muss angegeben werden\n"
- 
--#: ../arp.c:207 ../arp.c:221
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
--msgstr "Kein ARP Eintrag für %s\n"
-+msgstr "Kein ARP-Eintrag für %s\n"
- 
--#: ../arp.c:239
-+#: ../arp.c:248
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr "rarp: Kann Eintrag aus %s : %u nicht setzen.\n"
- 
--#: ../arp.c:243
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr "arp: unpassende Protokolltypen.\n"
- 
--#: ../arp.c:252
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
--msgstr "arp: Gerät ,,%s'' hat HW-Adresse %s ,,%s''.\n"
-+msgstr "arp: Gerät »%s« hat HW-Adresse %s »%s«.\n"
- 
--#: ../arp.c:282
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
--msgstr "arp: Hardwareadresse muß angegeben werden\n"
-+msgstr "arp: Hardwareadresse muss angegeben werden\n"
- 
--#: ../arp.c:290
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr "arp: ungültige Hardwareadresse\n"
- 
--#: ../arp.c:387
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr "arp: Kann %s nicht öffnen!\n"
- 
--#: ../arp.c:403
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr "arp: Formatfehler in Zeile %u von Etherfile %s.\n"
- 
--#: ../arp.c:416
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr "arp: Kann Eintrag auf Zeile %u von Etherdatei %s nicht setzen!\n"
- 
--#: ../arp.c:437
--msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
-+#: ../arp.c:448
-+#, fuzzy, c-format
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
- msgstr "Adresse\t\t\tHWTyp\tHWAdresse\t    Flags   Maske\t\t  Iface\n"
- 
--#: ../arp.c:467
-+#: ../arp.c:476
-+#, fuzzy
-+msgid "<from_interface>"
-+msgstr " Schnittstelle: %s\n"
-+
-+#: ../arp.c:478
- msgid "(incomplete)"
--msgstr "(unvollsändig)"
-+msgstr "(unvollständig)"
- 
--#: ../arp.c:484
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr "%s (%s) auf "
- 
--#: ../arp.c:490
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
- msgstr "<unvollständig> "
- 
--#: ../arp.c:496
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
- msgstr "netzmaske %s "
- 
--#: ../arp.c:513
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr "auf %s\n"
- 
--#: ../arp.c:592
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr "Einträge: %d   Ignoriert: %d   Gefunden: %d\n"
- 
--#: ../arp.c:596
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr "%s (%s) -- kein Eintrag\n"
- 
--#: ../arp.c:598
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
--msgstr "arp: In %d Einträgen wurde kein Zutreffender gefunden.\n"
-+msgstr "arp: In %d Einträgen wurde kein zutreffender gefunden.\n"
- 
--#: ../arp.c:613
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-@@ -109,157 +124,165 @@
- "Benutzung:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<Hostname>]\n"
- 
--#: ../arp.c:614
-+#: ../arp.c:627
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
- msgstr "  arp [-v]          [-i <if>] -d  <Hostname> [pub][nopub]\n"
- 
--#: ../arp.c:615
-+#: ../arp.c:628
-+#, fuzzy, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
- msgstr "  arp [-vnD] [<HW>] [-i <if>] -f  <Dateiname>           <- Eintrag aus Datei hinzufügen\n"
- 
--#: ../arp.c:616
-+#: ../arp.c:629
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
- msgstr ""
- "  arp [-v]   [<HW>] [-i <if>] -s  <Rechnername> <hwaddr> [temp][nopub]\n"
- 
--#: ../arp.c:617
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <Hostname> <hwaddr> [netmask <nm>] pub\n"
--
--#: ../arp.c:618
-+#: ../arp.c:630
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
- msgstr "  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub\n"
- 
--#: ../arp.c:620
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
- msgstr "        -a                       Alle Hosts im BSD-Format anzeigen\n"
- 
--#: ../arp.c:621
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr "        -s, --set                Neuen ARP-Eintrag setzen\n"
- 
--#: ../arp.c:622
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr "        -d, --delete             Einen bestimmten Eintrag löschen\n"
- 
--#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr "        -v, --verbose            Ausführliche Ausgaben\n"
- 
--#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
--msgid "        -n, --numeric            dont resolve names\n"
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, fuzzy, c-format
-+msgid "        -n, --numeric            don't resolve names\n"
- msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
- 
--#: ../arp.c:625
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
--msgstr "        -i, --device             Netzwerksgerät (z.B. eth0) angeben\n"
-+msgstr "        -i, --device             Netzwerkgerät (z.B. eth0) angeben\n"
- 
--#: ../arp.c:626
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
- msgstr "        -D, --use-device         <hwaddr> von gegebenem Gerät lesen\n"
- 
--#: ../arp.c:627
-+#: ../arp.c:639
-+#, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr "        -A, -p, --protocol              Routentabelle anzeigen\n"
- 
--#: ../arp.c:628
-+#: ../arp.c:640
-+#, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
- "        -f, --file               Neue Einträge aus Datei lesen\n"
- "\n"
- 
--#: ../arp.c:630 ../rarp.c:181
-+#: ../arp.c:642 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
- msgstr "  <HW>='-H <hw>' um Hardwareadresstyp anzugeben.  Standard: %s\n"
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr "  Liste möglicher Hardwaretypen, die ARP unterstützen:\n"
- 
--#: ../arp.c:664
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr "%s: Hardwaretyp nicht unterstützt!\n"
- 
--#: ../arp.c:668
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr "%s: Adressfamilie nicht unterstützt!\n"
- 
--#: ../arp.c:703
-+#: ../arp.c:716
-+#, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr "arp: -N noch nicht unterstützt.\n"
- 
--#: ../arp.c:713
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr "arp: %s: unbekannte Adressfamilie.\n"
- 
--#: ../arp.c:722
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr "arp: %s: unbekannter Hardwaretyp.\n"
- 
--#: ../arp.c:741
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
--msgstr "arp: %s: Kernel unterstützt nur ,,inet''.\n"
-+msgstr "arp: %s: Kernel unterstützt nur »inet«.\n"
- 
--#: ../arp.c:746
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr "arp: %s: Hardware unterstützt kein ARP.\n"
- 
--#: ../hostname.c:69
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
--msgstr "Rechnernamen auf ,,%s'' setzen\n"
-+msgstr "Rechnernamen auf »%s« setzen\n"
- 
--#: ../hostname.c:74
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr "%s: Nur Root darf den Rechnernamen ändern\n"
- 
--#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr "%s: name zu lang\n"
- 
--#: ../hostname.c:89
-+#: ../hostname.c:91
- #, c-format
- msgid "Setting hostname to `%s'\n"
--msgstr "Setze Hostname auf ,,%s''\n"
-+msgstr "Setze Hostname auf »%s«\n"
- 
--#: ../hostname.c:94
-+#: ../hostname.c:96
- #, c-format
- msgid "%s: you must be root to change the host name\n"
--msgstr "%s: Nur Root darf then Rechnernamen ändern\n"
-+msgstr "%s: Nur Root darf den Rechnernamen ändern\n"
- 
--#: ../hostname.c:108
-+#: ../hostname.c:109
- #, c-format
- msgid "Setting domainname to `%s'\n"
--msgstr "Setze domainname auf ,,%s''\n"
-+msgstr "Setze domainname auf »%s«\n"
- 
--#: ../hostname.c:113
-+#: ../hostname.c:114
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
- msgstr "%s: Nur Root darf den Domainnamen ändern\n"
-@@ -267,51 +290,56 @@
- #: ../hostname.c:131
- #, c-format
- msgid "Resolving `%s' ...\n"
--msgstr "Löse ,,%s'' auf ...\n"
-+msgstr "Löse »%s« auf ...\n"
- 
- #: ../hostname.c:137
- #, c-format
- msgid "Result: h_name=`%s'\n"
--msgstr "Ergebnis: h_name=,,%s''\n"
-+msgstr "Ergebnis: h_name=»%s«\n"
- 
- #: ../hostname.c:142
- #, c-format
- msgid "Result: h_aliases=`%s'\n"
--msgstr "Ergebnis: h_aliases=,,%s''\n"
-+msgstr "Ergebnis: h_aliases=»%s«\n"
- 
- #: ../hostname.c:147
- #, c-format
- msgid "Result: h_addr_list=`%s'\n"
--msgstr "Ergebnis: h_addr_list=,,%s''\n"
-+msgstr "Ergebnis: h_addr_list=»%s«\n"
- 
--#: ../hostname.c:209
-+#: ../hostname.c:208
- #, c-format
- msgid "%s: can't open `%s'\n"
--msgstr "%s: Kann ,,%s'' nicht öffnen\n"
-+msgstr "%s: Kann »%s« nicht öffnen\n"
- 
--#: ../hostname.c:223
-+#: ../hostname.c:222
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
- msgstr ""
- "Benutzung: hostname [-v] {Hostname|-F Datei} Hostname (aus Datei) setzen\n"
- 
--#: ../hostname.c:224
-+#: ../hostname.c:223
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
--"       domainname [-v] {nisdomain|-F file}   NIS Domainname (aus Datei) "
-+"       domainname [-v] {nisdomain|-F file}   NIS-Domainname (aus Datei) "
- "setzen.\n"
- 
--#: ../hostname.c:226
-+#: ../hostname.c:225
-+#, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
- msgstr "       nodename [-v] {Rechnername|-F Datei}\n"
- 
--#: ../hostname.c:228
-+#: ../hostname.c:227
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]\n"
- 
--#: ../hostname.c:229
-+#: ../hostname.c:228
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
-@@ -319,7 +347,8 @@
- "       hostname [-v]                         Hostnamen anzeigen\n"
- "\n"
- 
--#: ../hostname.c:230
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
-@@ -328,7 +357,8 @@
- "beenden.\n"
- "\n"
- 
--#: ../hostname.c:231
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
-@@ -336,43 +366,52 @@
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- 
--#: ../hostname.c:232
-+#: ../hostname.c:231
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr "    -s, --short           Kurzer Hostname\n"
- 
--#: ../hostname.c:233
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr "    -a, --alias           Namensalias\n"
- 
--#: ../hostname.c:234
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr "    -i, --ip-address      Adressen für den Hostnamen\n"
- 
--#: ../hostname.c:235
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr "    -f, --fqdn, --long    Langer Hostname (FQDN)\n"
- 
--#: ../hostname.c:236
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
--msgstr "    -d, --domain          DNS Domainname\n"
-+msgstr "    -d, --domain          DNS-Domainname\n"
- 
--#: ../hostname.c:237
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
--msgstr "    -y, --yp, --nis       NIS/YP Domainname\n"
-+msgstr "    -y, --yp, --nis       NIS/YP-Domainname\n"
- 
--#: ../hostname.c:239
-+#: ../hostname.c:238
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
--msgstr "    -n, --node            DECnet Knotennamen\n"
-+msgstr "    -n, --node            DECnet-Knotennamen\n"
- 
--#: ../hostname.c:241
-+#: ../hostname.c:240
-+#, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
- msgstr ""
--"    -F, --file            Hostnamen oder NIS Domainnamen aus Datei lesen\n"
-+"    -F, --file            Hostnamen oder NIS-Domainnamen aus Datei lesen\n"
- "\n"
- 
--#: ../hostname.c:243
-+#: ../hostname.c:242
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -380,395 +419,268 @@
- "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
- "   part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
--"   Dies Kommando setzt oder gibt den Hostnamen oder NIS Domainnamen aus.\n"
--"   Es ist ebenfalls möglich die DNS Domain oder den FQDN (langen Hostnamen)\n"
-+"   Dies Kommando setzt oder gibt den Hostnamen oder NIS-Domainnamen aus.\n"
-+"   Es ist ebenfalls möglich die DNS-Domain oder den FQDN (langen Hostnamen)\n"
- "   ausgeben zu lassen.  Außer wenn DNS oder NIS als Namensdienst verwendet\n"
--"   wird, können FQDN (Fully Qualified Domain Name) und DNS Domainname (welcher\n"
-+"   wird, können FQDN (Fully Qualified Domain Name) und DNS-Domainname (welcher\n"
- "   Teil des FQDNs ist) in /etc/hosts geändert werden.\n"
- 
- #: ../hostname.c:338
- #, c-format
- msgid "%s: You can't change the DNS domain name with this command\n"
--msgstr "%s: Mit diesem Program kann der DNS Domainname nicht geändert werden\n"
-+msgstr "%s: Mit diesem Programm kann der DNS-Domainname nicht geändert werden\n"
- 
- #: ../hostname.c:339
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
- msgstr ""
- "\n"
--"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der "
--"DNS\n"
-+"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der DNS\n"
- 
- #: ../hostname.c:340
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
--msgstr ""
--"Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert "
--"werden.\n"
-+msgstr "Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert werden.\n"
- 
- #: ../hostname.c:357
- #, c-format
- msgid "gethostname()=`%s'\n"
--msgstr "gethostname()=,,%s''\n"
-+msgstr "gethostname()=»%s«\n"
- 
- #: ../hostname.c:374
- #, c-format
- msgid "getdomainname()=`%s'\n"
--msgstr "getdomainname()=,,%s''\n"
-+msgstr "getdomainname()=»%s«\n"
- 
- #: ../hostname.c:389
- #, c-format
- msgid "getnodename()=`%s'\n"
--msgstr "getnodename()=,,%s''\n"
-+msgstr "getnodename()=»%s«\n"
- 
--#: ../ifconfig.c:159
--#, c-format
--msgid "%-9.9s Link encap:%s  "
--msgstr "%-9.9s Protokoll:%s  "
-+#: ../ifconfig.c:107
-+#, fuzzy, c-format
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr "SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-Ülf    TX-OK TX-Feh TX-DRP TX-Üb Flg\n"
- 
--#: ../ifconfig.c:164
--#, c-format
--msgid "HWaddr %s  "
--msgstr "Hardware Adresse %s  "
-+#: ../ifconfig.c:129 ../ifconfig.c:161
-+#, fuzzy, c-format
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
- 
--#: ../ifconfig.c:167
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
- #, c-format
--msgid "Media:%s"
--msgstr "Medium:%s"
-+msgid "No support for INET on this system.\n"
-+msgstr "INET ist auf diesem System nicht verfügbar.\n"
- 
--#: ../ifconfig.c:169
--msgid "(auto)"
--msgstr "(auto)"
-+#: ../ifconfig.c:193
-+#, fuzzy, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
- 
--#: ../ifconfig.c:176
--#, c-format
--msgid "          %s addr:%s "
--msgstr "          %s Adresse:%s "
-+#: ../ifconfig.c:202
-+#, fuzzy, c-format
-+msgid ""
-+"Usage:\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+msgstr ""
-+"Syntax:\n"
-+"  ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n"
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:204
- #, c-format
--msgid " P-t-P:%s "
--msgstr " P-z-P:%s "
-+msgid "  [add <address>[/<prefixlen>]]\n"
-+msgstr "  [add <Adresse>[/<Präfixlänge>]]\n"
- 
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:205
- #, c-format
--msgid " Bcast:%s "
--msgstr " Bcast:%s "
-+msgid "  [del <address>[/<prefixlen>]]\n"
-+msgstr "  [del <Adresse>[/<Präfixlänge>]]\n"
- 
--#: ../ifconfig.c:184
-+#: ../ifconfig.c:206
- #, c-format
--msgid " Mask:%s\n"
--msgstr " Maske:%s\n"
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
- 
--#: ../ifconfig.c:201
-+#: ../ifconfig.c:207
- #, c-format
--msgid "          inet6 addr: %s/%d"
--msgstr "          inet6 Adresse: %s/%d"
--
--#: ../ifconfig.c:203
--msgid " Scope:"
--msgstr " Gültigkeitsbereich:"
--
--#: ../ifconfig.c:206
--msgid "Global"
--msgstr "Global"
-+msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+msgstr "  [netmask <Adresse>]  [dstaddr <Adresse>]  [tunnel <Adresse>]\n"
- 
--#: ../ifconfig.c:209
--msgid "Link"
--msgstr "Verbindung"
-+#: ../ifconfig.c:210
-+#, c-format
-+msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
- #: ../ifconfig.c:212
--msgid "Site"
--msgstr "Standort"
--
--#: ../ifconfig.c:215
--msgid "Compat"
--msgstr "Kompatibilität"
--
--#: ../ifconfig.c:218
--msgid "Host"
--msgstr "Maschine"
--
--#: ../ifconfig.c:221
--msgid "Unknown"
--msgstr "Unbekannt"
--
--#: ../ifconfig.c:236
- #, c-format
--msgid "          IPX/Ethernet II addr:%s\n"
--msgstr "          IPX/Ethernet II Adresse:%s\n"
-+msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+msgstr "  [hw <HW> <Adresse>]  [metric <NN>]  [mtu <NN>]\n"
- 
--#: ../ifconfig.c:239
-+#: ../ifconfig.c:213
- #, c-format
--msgid "          IPX/Ethernet SNAP addr:%s\n"
--msgstr "          IPX/Ethernet SNAP Adresse:%s\n"
-+msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
--#: ../ifconfig.c:242
-+#: ../ifconfig.c:214
- #, c-format
--msgid "          IPX/Ethernet 802.2 addr:%s\n"
--msgstr "          IPX/Ethernet 802.2 Adresse:%s\n"
-+msgid "  [multicast]  [[-]promisc]\n"
-+msgstr "  [multicast]  [[-]promisc]\n"
- 
--#: ../ifconfig.c:245
-+#: ../ifconfig.c:215
- #, c-format
--msgid "          IPX/Ethernet 802.3 addr:%s\n"
--msgstr "          IPX/Ethernet 802.3 Adresse:%s\n"
-+msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <Typ>]\n"
- 
--#: ../ifconfig.c:255
-+#: ../ifconfig.c:217
- #, c-format
--msgid "          EtherTalk Phase 2 addr:%s\n"
--msgstr "          EtherTalk Phase 2 Adresse:%s\n"
-+msgid "  [txqueuelen <NN>]\n"
-+msgstr "  [txqueuelen <Länge>]\n"
- 
--#: ../ifconfig.c:264
-+#: ../ifconfig.c:220
- #, c-format
--msgid "          econet addr:%s\n"
--msgstr "          econet Adresse:%s\n"
--
--#: ../ifconfig.c:270
--msgid "[NO FLAGS] "
--msgstr "[KEINE FLAGS] "
--
--#: ../ifconfig.c:272
--msgid "UP "
--msgstr "UP "
--
--#: ../ifconfig.c:274
--msgid "BROADCAST "
--msgstr "BROADCAST "
--
--#: ../ifconfig.c:276
--msgid "DEBUG "
--msgstr "DEBUG "
--
--#: ../ifconfig.c:278
--msgid "LOOPBACK "
--msgstr "LOOPBACK "
--
--#: ../ifconfig.c:280
--msgid "POINTOPOINT "
--msgstr "PUNKTZUPUNKT "
--
--#: ../ifconfig.c:282
--msgid "NOTRAILERS "
--msgstr "NOTRAILERS "
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
- 
--#: ../ifconfig.c:284
--msgid "RUNNING "
--msgstr "RUNNING "
-+#: ../ifconfig.c:222
-+#, c-format
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr ""
-+"  [up|down] ...\n"
-+"\n"
- 
--#: ../ifconfig.c:286
--msgid "NOARP "
--msgstr "NOARP "
-+#: ../ifconfig.c:224
-+#, c-format
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "  <HW>=Hardwaretyp.\n"
- 
--#: ../ifconfig.c:288
--msgid "PROMISC "
--msgstr "PROMISC "
-+#: ../ifconfig.c:225
-+#, c-format
-+msgid "  List of possible hardware types:\n"
-+msgstr "  Liste möglicher Hardwaretypen:\n"
- 
--#: ../ifconfig.c:290
--msgid "ALLMULTI "
--msgstr "ALLMULTI "
-+#. 1 = ARPable
-+#: ../ifconfig.c:227
-+#, c-format
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "  <AF>=Adressfamilie.  Standardwert: %s\n"
- 
--#: ../ifconfig.c:292
--msgid "SLAVE "
--msgstr "SLAVE "
-+#: ../ifconfig.c:228
-+#, c-format
-+msgid "  List of possible address families:\n"
-+msgstr "  List der möglichen Adressfamilien:\n"
- 
--#: ../ifconfig.c:294
--msgid "MASTER "
--msgstr "MASTER "
-+#: ../ifconfig.c:303
-+#, c-format
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:296
--msgid "MULTICAST "
--msgstr "MULTICAST "
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:299
--msgid "DYNAMIC "
--msgstr "DYNAMIC "
-+#: ../ifconfig.c:380
-+#, c-format
-+msgid "Unknown media type.\n"
-+msgstr "Typ des Mediums unbekannt.\n"
- 
--#: ../ifconfig.c:302
-+#: ../ifconfig.c:417
- #, c-format
--msgid " MTU:%d  Metric:%d"
--msgstr " MTU:%d  Metric:%d"
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
- 
--#: ../ifconfig.c:306
-+#: ../ifconfig.c:429
- #, c-format
--msgid "  Outfill:%d  Keepalive:%d"
--msgstr "  Outfill:%d  Keepalive:%d"
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:320
-+#: ../ifconfig.c:441
- #, c-format
--msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
- msgstr ""
--"Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n"
- 
--#: ../ifconfig.c:325
-+#: ../ifconfig.c:465
- #, c-format
--msgid "             compressed:%lu\n"
--msgstr "             komprimiert:%lu\n"
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:329
-+#: ../ifconfig.c:523
- #, c-format
--msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
- msgstr ""
--"Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n"
- 
--#: ../ifconfig.c:333
-+#: ../ifconfig.c:652
- #, c-format
--msgid "          collisions:%lu "
--msgstr "          Kollisionen:%lu "
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:335
-+#: ../ifconfig.c:684
- #, c-format
--msgid "compressed:%lu "
--msgstr "Komprimiert:%lu "
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:337
-+#: ../ifconfig.c:693
- #, c-format
--msgid "txqueuelen:%d "
--msgstr "Sendewarteschlangenlänge:%d "
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: ungültige %s Adresse.\n"
- 
--#: ../ifconfig.c:345
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
- #, c-format
--msgid "Interrupt:%d "
--msgstr "Interrupt:%d "
--
--#. Only print devices using it for
--#. I/O maps
--#: ../ifconfig.c:348
--#, c-format
--msgid "Base address:0x%x "
--msgstr "Basisadresse:0x%x "
--
--#: ../ifconfig.c:350
--#, c-format
--msgid "Memory:%lx-%lx "
--msgstr "Speicher:%lx-%lx "
--
--#: ../ifconfig.c:353
--#, c-format
--msgid "DMA chan:%x "
--msgstr "DMA Kanal:%x "
-+msgid "No support for INET6 on this system.\n"
-+msgstr "INET6 ist auf diesem System nicht verfügbar.\n"
- 
--#: ../ifconfig.c:384 ../ifconfig.c:405
-+#: ../ifconfig.c:780 ../ifconfig.c:871
- #, c-format
--msgid "%s: unknown interface: %s\n"
--msgstr "%s: unbekannte Schnittstelle: %s\n"
--
--#: ../ifconfig.c:421
--msgid ""
--"Usage:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
--msgstr ""
--"Syntax:\n"
--"  ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n"
--
--#: ../ifconfig.c:425
--msgid "  [add <address>[/<prefixlen>]]\n"
--msgstr "  [add <Adresse>[/<Prefixlänge>]]\n"
--
--#: ../ifconfig.c:427
--msgid "  [del <address>[/<prefixlen>]]\n"
--msgstr "  [del <Adresse>[/<Prefixlänge>]]\n"
--
--#: ../ifconfig.c:432
--msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
--msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
--
--#: ../ifconfig.c:433
--msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
--msgstr "  [netmask <Addresse>]  [dstaddr <Adresse>]  [tunnel <Adresse>]\n"
--
--#: ../ifconfig.c:436
--msgid "  [outfill <NN>] [keepalive <NN>]\n"
--msgstr "  [outfill <NN>] [keepalive <NN>]\n"
--
--#: ../ifconfig.c:438
--msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
--msgstr "  [hw <HW> <Adresse>]  [metric <NN>]  [mtu <NN>]\n"
--
--#: ../ifconfig.c:439
--msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--
--#: ../ifconfig.c:440
--msgid "  [multicast]  [[-]promisc]\n"
--msgstr "  [multicast]  [[-]promisc]\n"
--
--#: ../ifconfig.c:441
--msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
--msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <Typ>]\n"
--
--#: ../ifconfig.c:443
--msgid "  [txqueuelen <NN>]\n"
--msgstr "  [txqueuelen <Länge>]\n"
--
--#: ../ifconfig.c:446
--msgid "  [[-]dynamic]\n"
--msgstr "  [[-]dynamic]\n"
--
--#: ../ifconfig.c:448
--msgid ""
--"  [up|down] ...\n"
--"\n"
-+msgid "Interface %s not initialized\n"
- msgstr ""
--"  [up|down] ...\n"
--"\n"
--
--#: ../ifconfig.c:450
--msgid "  <HW>=Hardware Type.\n"
--msgstr "  <HW>=Hardwaretyp.\n"
--
--#: ../ifconfig.c:451
--msgid "  List of possible hardware types:\n"
--msgstr "  Liste möglicher Hardwaretypen:\n"
--
--#. 1 = ARPable
--#: ../ifconfig.c:453
--#, c-format
--msgid "  <AF>=Address family. Default: %s\n"
--msgstr "  <AF>=Adressfamilie.  Standardwert: %s\n"
--
--#: ../ifconfig.c:454
--msgid "  List of possible address families:\n"
--msgstr "  List der möglichen Adressfamilien:\n"
--
--#: ../ifconfig.c:593
--msgid "Unknown media type.\n"
--msgstr "Typ des Mediums unbekannt.\n"
- 
--#: ../ifconfig.c:881
--#, c-format
--msgid "%s: invalid %s address.\n"
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, fuzzy, c-format
-+msgid "Bad address.\n"
- msgstr "%s: ungültige %s Adresse.\n"
- 
--#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
--msgid "No support for INET6 on this system.\n"
--msgstr "INET6 ist auf diesem System nicht verfügbar.\n"
--
--#: ../ifconfig.c:983
-+#: ../ifconfig.c:885
-+#, c-format
- msgid "Address deletion not supported on this system.\n"
--msgstr "Das Löschen von Adressen ist auf diesem System nicht unterstützt.\n"
-+msgstr "Das Löschen von Adressen wird auf diesem System nicht unterstützt.\n"
- 
--#: ../ifconfig.c:1066
--msgid "No support for INET on this system.\n"
--msgstr "INET ist auf diesem System nicht verfügbar.\n"
-+#: ../ifconfig.c:957
-+#, fuzzy, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "Kann die Adressen der Familie %d nicht setzen.\n"
- 
--#: ../ifconfig.c:1076
-+#: ../ifconfig.c:983
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr "ECONET wird auf diesem System nicht unterstützt.\n"
- 
--#: ../ifconfig.c:1084
-+#: ../ifconfig.c:991
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr "Kann die Adressen der Familie %d nicht setzen.\n"
- 
--#: ../netstat.c:383
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
--msgstr ""
--"(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie "
--"sollten Root sein.)\n"
-+msgstr "(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie sollten Root sein.)\n"
- 
--#: ../netstat.c:387
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
-@@ -776,198 +688,220 @@
- "(Es konnten nicht alle Prozesse identifiziert werden; Informationen über\n"
- "nicht-eigene Processe werden nicht angezeigt; Root kann sie anzeigen.)\n"
- 
--#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr "HÖRT"
- 
--#: ../netstat.c:395
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr "VERBINGSAUFBAU GESCHICKT"
- 
--#: ../netstat.c:396 ../netstat.c:1168
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr "VERBINDUNGSABBAU GESCHICKT"
- 
--#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr "VERBUNDEN"
- 
--#: ../netstat.c:419
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr "Aktive NET/ROM Sockets\n"
- 
--#: ../netstat.c:420
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
--msgstr ""
--"Benutzer   Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
-+msgstr "Benutzer   Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  Recv-Q\n"
- 
--#: ../netstat.c:430 ../netstat.c:1208
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr "Probleme beim Lesen von %s\n"
- 
--#: ../netstat.c:465
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr "SYN_SENT"
- 
--#: ../netstat.c:466
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr "SYN_RECV"
- 
--#: ../netstat.c:467
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr "FIN_WAIT1"
- 
--#: ../netstat.c:468
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr "FIN_WAIT2"
- 
--#: ../netstat.c:469
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr "TIME_WAIT"
- 
--#: ../netstat.c:470
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr "CLOSE"
- 
--#: ../netstat.c:471
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr "CLOSE_WAIT"
- 
--#: ../netstat.c:472
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr "LAST_ACK"
- 
--#: ../netstat.c:473
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr "LISTEN"
- 
--#: ../netstat.c:474
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr "CLOSING"
- 
--#: ../netstat.c:544
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr "Warnung, fehlerhafte igmp6 line %d.\n"
- 
--#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
--#: ../netstat.c:935 ../netstat.c:940
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr "netstat: Nicht unterstützte Adressfamilie %d!\n"
- 
--#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr "Warnung, fehlerhafte igmp-Zeile %d.\n"
- 
--#: ../netstat.c:666
-+#: ../netstat.c:677
-+#, fuzzy, c-format
-+msgid "Active X.25 sockets\n"
-+msgstr "Aktive AX.25 Sockets\n"
-+
-+#. IMHO, Vr/Vs is not very usefull --SF
-+#: ../netstat.c:679
-+#, fuzzy, c-format
-+msgid ""
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
-+msgstr "Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  Empf-Q\n"
-+
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr "Warnung, fehlerhafte TCP Zeile.\n"
- 
--#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr "aus (0.00/%ld/%d)"
- 
--#: ../netstat.c:708
-+#: ../netstat.c:804
- #, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr "ein (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:713
-+#: ../netstat.c:809
- #, fuzzy, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr "ein%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:718
-+#: ../netstat.c:814
- #, fuzzy, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr "ein%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr "unkn-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:799
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr "Warnung, fehlerhafe UDP-Zeile.\n"
- 
--#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr "UNBEKANNT"
- 
--#: ../netstat.c:860 ../netstat.c:980
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr "ein%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:949
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr "Warnung, fehlerhafte raw-Zeile.\n"
- 
--#: ../netstat.c:1028
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr "Warnung, fehlerhafte UNIX-Zeile.\n"
- 
--#: ../netstat.c:1055
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr "STREAM"
- 
--#: ../netstat.c:1059
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr "DGRAM"
- 
--#: ../netstat.c:1063
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr "RAW"
- 
--#: ../netstat.c:1067
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr "RDM"
- 
--#: ../netstat.c:1071
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
--msgstr "SEQPACKET"
-+msgstr "SEQPAKET"
- 
--#: ../netstat.c:1080
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr "FREI"
- 
--#: ../netstat.c:1096
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr "VERBINDUNGSAUFBAU"
- 
--#: ../netstat.c:1100
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr "VERBUNDEN"
- 
--#: ../netstat.c:1104
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr "VERBINDUNGSABBAU"
- 
--#: ../netstat.c:1135
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
--msgstr "Aktive Sockets in der UNIX Domäne "
-+msgstr "Aktive Sockets in der UNIX-Domäne "
- 
--#: ../netstat.c:1137 ../netstat.c:1666
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr "(Server und stehende Verbindungen)"
- 
--#: ../netstat.c:1140 ../netstat.c:1669
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr "(Nur Server)"
- 
--#: ../netstat.c:1142 ../netstat.c:1671
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr "(ohne Server)"
- 
--#: ../netstat.c:1145
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
-@@ -975,90 +909,90 @@
- "\n"
- "Proto RefZäh Flaggen     Typ        Zustand       I-Node"
- 
--#: ../netstat.c:1147
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr " Pfad\n"
- 
--#: ../netstat.c:1167
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr "SABM GESCHICKT"
- 
--#: ../netstat.c:1170
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr "WIEDERHERSTELLUNG"
- 
--#: ../netstat.c:1184
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr "Aktive AX.25 Sockets\n"
- 
--#: ../netstat.c:1185
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr "Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  Empf-Q\n"
- 
--#: ../netstat.c:1228
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr "Problem beim Lesen von Daten von %s\n"
- 
--#: ../netstat.c:1279
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
- "State"
- msgstr ""
- "Aktive IPX Sockets\n"
--"Proto Recv-Q Send-Q Lokale Adresse             Gegenaddress               "
-+"Proto Recv-Q Send-Q Lokale Adresse             Gegenadresse               "
- "Zustand"
- 
--#: ../netstat.c:1281
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr " Benutzer"
- 
--#: ../netstat.c:1315
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr "VERBUNDEN"
- 
--#: ../netstat.c:1323
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr "UNB."
- 
--#: ../netstat.c:1367
--msgid "     - no statistics available -"
--msgstr "     - keine Statistiken verfügbar -"
--
--#: ../netstat.c:1370
--msgid "[NO FLAGS]"
--msgstr "[KEINE FLAGS]"
--
--#: ../netstat.c:1400
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
--msgstr "Kernel Schnittstellentabelle\n"
-+msgstr "Kernel-Schnittstellentabelle\n"
- 
--#: ../netstat.c:1401
-+#: ../netstat.c:1465
-+#, fuzzy, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
--"Flg\n"
--msgstr ""
--"SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-Ülf    TX-OK TX-Feh TX-DRP TX-Üb "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
-+msgstr "SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-Ülf    TX-OK TX-Feh TX-DRP TX-Üb Flg\n"
- 
--#: ../netstat.c:1404
-+#: ../netstat.c:1469
- msgid "missing interface information"
--msgstr "Fehlende Interfaceinformation"
-+msgstr "Fehlende Interfaceinformationen"
- 
--#: ../netstat.c:1425
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
- "Benutzung: netstat [-veenNcCF] [<Af>] -r\n"
- "           netstat {-V|--version|-h|--help}\n"
- 
--#: ../netstat.c:1426
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr "       netstat [-vnNcaeol] [<Socket> ...]\n"
- 
--#: ../netstat.c:1427
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
-@@ -1066,27 +1000,32 @@
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- 
--#: ../netstat.c:1429
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr "        -r, --route              Routentabelle anzeigen\n"
- 
--#: ../netstat.c:1430
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr "        -i, --interfaces         Schnittstellentabelle auflisten\n"
- 
--#: ../netstat.c:1431
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr ""
- "        -g, --groups             Mitgliedschaft in Multicastgruppen "
- "anzeigen\n"
- 
--#: ../netstat.c:1432
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr ""
- "        -s, --statistics         Netzwerksstatistiken anzeigen (wie SNMP)\n"
- 
--#: ../netstat.c:1434
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
-@@ -1094,23 +1033,38 @@
- "        -M, --masquerade         Maskierte Verbindungen auflisten\n"
- "\n"
- 
--#: ../netstat.c:1438 ../route.c:87
-+#: ../netstat.c:1505
-+#, fuzzy, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
-+msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
-+
-+#: ../netstat.c:1506
-+#, fuzzy, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
-+msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
-+
-+#: ../netstat.c:1507
-+#, fuzzy, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
-+msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
-+
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr "        -N, --symbolic           Hardwarenamen auflösen\n"
- 
--#: ../netstat.c:1439 ../route.c:88
--#, fuzzy
-+#: ../netstat.c:1509 ../route.c:88
-+#, fuzzy, c-format
- msgid "        -e, --extend             display other/more information\n"
--msgstr ""
--"        -e, --extend             Weitere / zusätzliche Informationen "
--"anzeigen\n"
-+msgstr "        -e, --extend             Weitere / zusätzliche Informationen anzeigen\n"
- 
--#: ../netstat.c:1440
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
--msgstr ""
--"        -p, --programs           PID/Programmnamen für Sockets anzeigen\n"
-+msgstr "        -p, --programs           PID/Programmnamen für Sockets anzeigen\n"
- 
--#: ../netstat.c:1441
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
-@@ -1118,24 +1072,27 @@
- "        -c, --continuous         Anzeige laufend aktualisieren\n"
- "\n"
- 
--#: ../netstat.c:1442
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr ""
- "        -l, --listening          Empfangsbereite Serversockets auflisten\n"
- 
--#: ../netstat.c:1443
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr ""
- "        -a, --all, --listening   Alle Sockets anzeigen (normal: nur "
- "verbundene)\n"
- 
--#: ../netstat.c:1444
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr "        -o, --timers             Timer auflisten\n"
- 
--#: ../netstat.c:1445 ../route.c:89
--#, fuzzy
-+#: ../netstat.c:1515 ../route.c:89
-+#, fuzzy, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
-@@ -1143,7 +1100,8 @@
- "        -F, --fib                Forwarding Infomation Base anzeigen "
- "(Standard)\n"
- 
--#: ../netstat.c:1446 ../route.c:90
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
-@@ -1151,110 +1109,118 @@
- "        -C, --cache              Routencache statt FIB anzeigen\n"
- "\n"
- 
--#: ../netstat.c:1448
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- 
--#: ../netstat.c:1449 ../route.c:92
--#, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-+#: ../netstat.c:1519
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr "  <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n"
- 
--#: ../netstat.c:1450 ../route.c:93
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
- msgstr "  Liste möglicher Adressfamilien, die Routen unterstützen:\n"
- 
--#: ../netstat.c:1663
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr "Aktive Internetverbindungen "
- 
--#: ../netstat.c:1673
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- 
--#: ../netstat.c:1675
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr " Benutzer   Inode     "
- 
--#: ../netstat.c:1678
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr " Timer"
- 
--#: ../netstat.c:1708
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
--msgstr "IPv4 Gruppenmitgliedschaften\n"
-+msgstr "IPv4-Gruppenmitgliedschaften\n"
- 
--#: ../netstat.c:1709
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr "Schnittstelle   RefZäh Grupp\n"
- 
--#: ../rarp.c:43
-+#: ../rarp.c:44
- msgid "This kernel does not support RARP.\n"
- msgstr "Dieser Kernel unterstützt kein RARP.\n"
- 
--#: ../rarp.c:82
-+#: ../rarp.c:83
- #, c-format
- msgid "no RARP entry for %s.\n"
--msgstr "Kein RARP Eintrag für %s.\n"
-+msgstr "Kein RARP-Eintrag für %s.\n"
- 
--#: ../rarp.c:95
-+#: ../rarp.c:96
- #, c-format
- msgid "%s: bad hardware address\n"
- msgstr "%s: fehlerhafte Hardwareadresse\n"
- 
--#: ../rarp.c:127
-+#: ../rarp.c:128
- #, c-format
- msgid "rarp: cannot open file %s:%s.\n"
- msgstr "rarp: kann Datei %s:%s nicht öffnen.\n"
- 
--#: ../rarp.c:139
-+#: ../rarp.c:140
- #, c-format
- msgid "rarp: format error at %s:%u\n"
- msgstr "rarp: Formatfehler bei %s:%u\n"
- 
--#: ../rarp.c:143 ../rarp.c:287
-+#: ../rarp.c:144 ../rarp.c:289
- #, c-format
- msgid "rarp: %s: unknown host\n"
- msgstr "rarp: %s: Unbekannter Host\n"
- 
--#: ../rarp.c:146
-+#: ../rarp.c:147
- #, c-format
- msgid "rarp: cannot set entry from %s:%u\n"
- msgstr "rarp: Kann Eintrag aus %s:%u nicht setzen.\n"
- 
--#: ../rarp.c:175
-+#: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
--msgstr ""
--"Benutzung: rarp -a                               Einträge im Cache listen.\n"
-+msgstr "Benutzung: rarp -a                               Einträge im Cache listen.\n"
- 
--#: ../rarp.c:176
-+#: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
--msgstr ""
--"       rarp -d <hostname>                    Eintrag aus dem Cache löschen.\n"
-+msgstr "       rarp -d <hostname>                    Eintrag aus dem Cache löschen.\n"
- 
--#: ../rarp.c:177
-+#: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
--msgstr ""
--"       rarp [<HW>] -s <hostname> <hwaddr>    Eintrag zum Cache zufügen.\n"
-+msgstr "       rarp [<HW>] -s <hostname> <hwaddr>    Eintrag zum Cache zufügen.\n"
- 
--#: ../rarp.c:178
-+#: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
--msgstr ""
--"       rarp -f                               Einträge aus /etc/ethers "
--"zufügen.\n"
-+msgstr "       rarp -f                               Einträge aus /etc/ethers zufügen.\n"
- 
--#: ../rarp.c:179
-+#: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
-@@ -1262,24 +1228,26 @@
- "       rarp -V                               Programmversion anzeigen.\n"
- "\n"
- 
--#: ../rarp.c:236
-+#: ../rarp.c:238
- #, c-format
- msgid "%s: illegal option mix.\n"
- msgstr "%s: Unerlaubte Mischung von Optionen.\n"
- 
--#: ../rarp.c:267
-+#: ../rarp.c:269
- #, c-format
- msgid "rarp: %s: unknown hardware type.\n"
--msgstr "rarp: %s: unknown hardware type.\n"
-+msgstr "rarp: %s: unbekannter Hardwaretyp.\n"
- 
--#: ../route.c:79
-+#: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
- "Benutzung: route [-nNvee] [-FC] [<AF>]           Kernelroutentabelle "
- "anzeigen\n"
- 
--#: ../route.c:80
-+#: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
-@@ -1287,14 +1255,15 @@
- "       route [-v] [-FC] {add|del|flush} ...  Routentabelle für AF ändern.\n"
- "\n"
- 
--#: ../route.c:82
-+#: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
--msgstr ""
--"       route {-h|--help} [<AF>]              Genaue Syntax für AF anzeigen.\n"
-+msgstr "       route {-h|--help} [<AF>]              Genaue Syntax für AF anzeigen.\n"
- 
--#: ../route.c:83
-+#: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
-@@ -1304,590 +1273,891 @@
- "Ende.\n"
- "\n"
- 
-+#: ../route.c:92
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n"
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr "Benutzung: plipconfig [-a] [-i] [-v] Interface\n"
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr "                  [nibble NN] [trigger NN]\n"
- 
- #: ../plipconfig.c:68
--#, fuzzy
-+#, c-format
- msgid "       plipconfig -V | --version\n"
--msgstr "       plipconfig -V\n"
-+msgstr "       plipconfig -V | --version\n"
- 
- #: ../plipconfig.c:74
- #, c-format
- msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr "%s\tnibble %lu  trigger %lu\n"
- 
--#: ../iptunnel.c:79
-+#: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr "Benutzung: iptunnel { add | change | del | show } [ NAME ]\n"
- 
--#: ../iptunnel.c:80
-+#: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr "          [ mode { ipip | gre | sit } ] [ remote ADR ] [ local ADR ]\n"
- 
--#: ../iptunnel.c:81
-+#: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr "          [ [i|o]seq ] [ [i|o]key SCHLÜSSEL ] [ [i|o]csum ]\n"
- 
--#: ../iptunnel.c:82
--#, fuzzy
-+#: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
--msgstr ""
--"          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n"
--"\n"
-+msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n"
- 
--#: ../iptunnel.c:83
-+#: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
- msgstr ""
-+"       iptunnel -V | --version\n"
-+"\n"
- 
--#: ../iptunnel.c:84
-+#: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr "Wobei: NAME := ZEICHENKETTE\n"
- 
--#: ../iptunnel.c:85
-+#: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr "       ADR := { IP_ADRESSE | any }\n"
- 
--#: ../iptunnel.c:86
-+#: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr "       TOS  := { NUMBER | inherit }\n"
- 
--#: ../iptunnel.c:87
-+#: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr "       TTL  := { 1..255 | inherit }\n"
- 
--#: ../iptunnel.c:88
-+#: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr "       KEY  := { DOTTED_QUAD | ZAHL }\n"
- 
--#: ../iptunnel.c:326
-+#: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr "Schlüssel sind mit ipip und sit nicht erlaubt.\n"
- 
--#: ../iptunnel.c:346
-+#: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr "Ein Broadcasttunnel ist nur mit einer Quelladresse möglich\n"
- 
--#: ../iptunnel.c:361
-+#: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr "ttl != 0 und noptmudisc sind inkompatibel\n"
- 
--#: ../iptunnel.c:373
-+#: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr ""
- "Die Tunnelbetriebsart (ipip, fre oder sit) kann nicht festgestellt werden\n"
- 
--#: ../iptunnel.c:411
-+#: ../iptunnel.c:417
- #, c-format
- msgid "%s: %s/ip  remote %s  local %s "
- msgstr "%s: %s/ip  Gegenseite %s  lokal %s "
- 
--#: ../iptunnel.c:415
-+#: ../iptunnel.c:421
- msgid "unknown"
- msgstr "Unbekannt"
- 
--#: ../iptunnel.c:447
-+#: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr "  Pakete außer der Reihenfolge fallenlassen.\n"
- 
--#: ../iptunnel.c:449
-+#: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr "  Prüfsumme im empfangenen Paket wird benötigt.\n"
- 
--#: ../iptunnel.c:451
-+#: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr "  Pakete in Reihenfolge ausgeben.\n"
- 
--#: ../iptunnel.c:453
-+#: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr "  Prüfsumme für ausgegebene Pakete berechnen.\n"
- 
--#: ../iptunnel.c:481
-+#: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
--msgstr "Falsches Format von /proc/net/dev. Tut mir leid\n"
-+msgstr "Falsches Format von /proc/net/dev. Tut mir leid.\n"
- 
--#: ../iptunnel.c:494
-+#: ../iptunnel.c:500
- #, c-format
- msgid "Failed to get type of [%s]\n"
- msgstr "Kann den Typ von [%s] nicht holen\n"
- 
--#: ../iptunnel.c:510
-+#: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr "RX: Pakete     Bytes        Fehler CsumErrs OutOfSeq Mcasts\n"
- 
--#: ../iptunnel.c:513
-+#: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr "TX: Pakete     Bytes        Fehler DeadLoop NoRoute  NoBufs\n"
- 
--#: ../statistics.c:45
-+#: ../statistics.c:47
- msgid "ICMP input histogram:"
--msgstr "ICMP Eingabehistogramm:"
-+msgstr "ICMP-Eingabehistogramm:"
- 
--#: ../statistics.c:46
-+#: ../statistics.c:48
- msgid "ICMP output histogram:"
--msgstr "ICMP Ausgabehistogramm:"
-+msgstr "ICMP-Ausgabehistogramm:"
- 
--#: ../statistics.c:63
-+#: ../statistics.c:65
- #, c-format
- msgid "Forwarding is %s"
- msgstr "Weiterleitung ist %s"
- 
--#: ../statistics.c:64
--#, c-format
--msgid "Default TTL is %d"
-+#: ../statistics.c:66
-+#, fuzzy, c-format
-+msgid "Default TTL is %u"
- msgstr "Standard-TTL ist %d"
- 
--#: ../statistics.c:65
--#, c-format
--msgid "%d total packets received"
--msgstr "%d Pakete insgesamt empfangen"
-+#: ../statistics.c:67
-+#, fuzzy, c-format
-+msgid "%u total packets received"
-+msgstr "%d Pakete insgesamt empfangen"
- 
--#: ../statistics.c:66
--#, c-format
--msgid "%d with invalid headers"
--msgstr "%d with ungültigen Headern"
-+#: ../statistics.c:68
-+#, fuzzy, c-format
-+msgid "%u with invalid headers"
-+msgstr "%d mit ungültigen Headern"
- 
--#: ../statistics.c:67
--#, c-format
--msgid "%d with invalid addresses"
-+#: ../statistics.c:69
-+#, fuzzy, c-format
-+msgid "%u with invalid addresses"
- msgstr "%d mit ungültigen Adressen"
- 
--#: ../statistics.c:68
--#, c-format
--msgid "%d forwarded"
-+#: ../statistics.c:70
-+#, fuzzy, c-format
-+msgid "%u forwarded"
- msgstr "%d weitergeleitet"
- 
--#: ../statistics.c:69
--#, c-format
--msgid "%d with unknown protocol"
-+#: ../statistics.c:71
-+#, fuzzy, c-format
-+msgid "%u with unknown protocol"
- msgstr "%d mit unbekanntem Protokoll"
- 
--#: ../statistics.c:70
--#, c-format
--msgid "%d incoming packets discarded"
-+#: ../statistics.c:72
-+#, fuzzy, c-format
-+msgid "%u incoming packets discarded"
- msgstr "%d eingehende Pakete weggeworfen"
- 
--#: ../statistics.c:71
--#, c-format
--msgid "%d incoming packets delivered"
-+#: ../statistics.c:73
-+#, fuzzy, c-format
-+msgid "%u incoming packets delivered"
- msgstr "%d eingehende Pakete zugestellt"
- 
--#: ../statistics.c:72
--#, c-format
--msgid "%d requests sent out"
-+#: ../statistics.c:74
-+#, fuzzy, c-format
-+msgid "%u requests sent out"
- msgstr "%d Anfragen ausgesandt"
- 
- #. ?
--#: ../statistics.c:73
--#, c-format
--msgid "%d outgoing packets dropped"
-+#: ../statistics.c:75
-+#, fuzzy, c-format
-+msgid "%u outgoing packets dropped"
- msgstr "%d ausgehende Pakete weggeworfen"
- 
--#: ../statistics.c:74
--#, c-format
--msgid "%d dropped because of missing route"
-+#: ../statistics.c:76
-+#, fuzzy, c-format
-+msgid "%u dropped because of missing route"
- msgstr "%d weggeworfen wegen fehlender Route"
- 
--#: ../statistics.c:75
--#, c-format
--msgid "%d fragments dropped after timeout"
-+#: ../statistics.c:77
-+#, fuzzy, c-format
-+msgid "%u fragments dropped after timeout"
- msgstr "%d Fragmente nach Timeout weggeworfen"
- 
--#: ../statistics.c:76
--#, c-format
--msgid "%d reassemblies required"
-+#: ../statistics.c:78
-+#, fuzzy, c-format
-+msgid "%u reassemblies required"
- msgstr "%d Wiederzusammenstellungen nötig"
- 
- #. ?
--#: ../statistics.c:77
--#, c-format
--msgid "%d packets reassembled ok"
-+#: ../statistics.c:79
-+#, fuzzy, c-format
-+msgid "%u packets reassembled ok"
- msgstr "%d Fragmente korrekt empfangen"
- 
--#: ../statistics.c:78
--#, c-format
--msgid "%d packet reassembles failed"
-+#: ../statistics.c:80
-+#, fuzzy, c-format
-+msgid "%u packet reassembles failed"
- msgstr "%d fehlgeschlagene Paketdefragmentierungen"
- 
--#: ../statistics.c:79
--#, c-format
--msgid "%d fragments received ok"
-+#: ../statistics.c:81
-+#, fuzzy, c-format
-+msgid "%u fragments received ok"
- msgstr "%d Fragmente korrekt empfangen"
- 
--#: ../statistics.c:80
--#, c-format
--msgid "%d fragments failed"
--msgstr "%d Fragmente Fehlgeschlagen"
-+#: ../statistics.c:82
-+#, fuzzy, c-format
-+msgid "%u fragments failed"
-+msgstr "%d Fragmente fehlgeschlagen"
- 
--#: ../statistics.c:81
--#, c-format
--msgid "%d fragments created"
-+#: ../statistics.c:83
-+#, fuzzy, c-format
-+msgid "%u fragments created"
- msgstr "%d Fragmente erzeugt"
- 
--#: ../statistics.c:86
--#, c-format
--msgid "%d ICMP messages received"
--msgstr "%d ICMP Nachrichten empfangen"
-+#: ../statistics.c:88
-+#, fuzzy, c-format
-+msgid "%u ICMP messages received"
-+msgstr "%d ICMP-Nachrichten empfangen"
- 
--#: ../statistics.c:87
--#, c-format
--msgid "%d input ICMP message failed."
--msgstr "%d eingegangene ICMP Nachrichten fehlgeschlagen"
-+#: ../statistics.c:89
-+#, fuzzy, c-format
-+msgid "%u input ICMP message failed."
-+msgstr "%d eingegangene ICMP-Nachrichten fehlgeschlagen"
- 
--#: ../statistics.c:88 ../statistics.c:101
--#, c-format
--msgid "destination unreachable: %d"
-+#: ../statistics.c:90 ../statistics.c:103
-+#, fuzzy, c-format
-+msgid "destination unreachable: %u"
- msgstr "Ziel unerreichbar: %d"
- 
--#: ../statistics.c:89
--#, c-format
--msgid "timeout in transit: %d"
-+#: ../statistics.c:91
-+#, fuzzy, c-format
-+msgid "timeout in transit: %u"
- msgstr "Timeout beim Transit: %d"
- 
--#: ../statistics.c:90 ../statistics.c:103
--#, c-format
--msgid "wrong parameters: %d"
-+#: ../statistics.c:92 ../statistics.c:105
-+#, fuzzy, c-format
-+msgid "wrong parameters: %u"
- msgstr "Fehlerhafte Parameter: %d"
- 
- #. ?
--#: ../statistics.c:91
--#, c-format
--msgid "source quenchs: %d"
-+#: ../statistics.c:93
-+#, fuzzy, c-format
-+msgid "source quenches: %u"
- msgstr "Source Quenchs: %d"
- 
--#: ../statistics.c:92
--#, c-format
--msgid "redirects: %d"
-+#: ../statistics.c:94
-+#, fuzzy, c-format
-+msgid "redirects: %u"
- msgstr "Umleitungen: %d"
- 
--#: ../statistics.c:93
--#, c-format
--msgid "echo requests: %d"
--msgstr "Echo Requests: %d"
-+#: ../statistics.c:95
-+#, fuzzy, c-format
-+msgid "echo requests: %u"
-+msgstr "Echo Anfragen: %d"
- 
--#: ../statistics.c:94 ../statistics.c:107
--#, c-format
--msgid "echo replies: %d"
-+#: ../statistics.c:96 ../statistics.c:109
-+#, fuzzy, c-format
-+msgid "echo replies: %u"
- msgstr "Echo Antworten: %d"
- 
--#: ../statistics.c:95
--#, c-format
--msgid "timestamp request: %d"
-+#: ../statistics.c:97
-+#, fuzzy, c-format
-+msgid "timestamp request: %u"
- msgstr "Zeitstempelanfragen: %d"
- 
--#: ../statistics.c:96
--#, c-format
--msgid "timestamp reply: %d"
-+#: ../statistics.c:98
-+#, fuzzy, c-format
-+msgid "timestamp reply: %u"
- msgstr "Zeitstempelantworten: %d"
- 
--#: ../statistics.c:97
--#, c-format
--msgid "address mask request: %d"
-+#: ../statistics.c:99
-+#, fuzzy, c-format
-+msgid "address mask request: %u"
- msgstr "Adressmaskenanfragen: %d"
- 
- #. ?
--#: ../statistics.c:98
--msgid "address mask replies"
--msgstr "Adressmaskenantworten"
-+#: ../statistics.c:100 ../statistics.c:113
-+#, fuzzy, c-format
-+msgid "address mask replies: %u"
-+msgstr "Adressmaskenantworten: %d"
- 
- #. ?
--#: ../statistics.c:99
--#, c-format
--msgid "%d ICMP messages sent"
-+#: ../statistics.c:101
-+#, fuzzy, c-format
-+msgid "%u ICMP messages sent"
- msgstr "%d ICMP-Nachrichten geschickt"
- 
--#: ../statistics.c:100
--#, c-format
--msgid "%d ICMP messages failed"
--msgstr "%d ICMP Nachrichten fehlgeschlagen"
--
- #: ../statistics.c:102
--#, c-format
--msgid "time exceeded: %d"
-+#, fuzzy, c-format
-+msgid "%u ICMP messages failed"
-+msgstr "%d ICMP-Nachrichten fehlgeschlagen"
-+
-+#: ../statistics.c:104
-+#, fuzzy, c-format
-+msgid "time exceeded: %u"
- msgstr "Zeitüberschreitung: %d"
- 
- #. ?
--#: ../statistics.c:104
--#, c-format
--msgid "source quench: %d"
-+#: ../statistics.c:106
-+#, fuzzy, c-format
-+msgid "source quench: %u"
- msgstr "Source Quench: %d"
- 
--#: ../statistics.c:105
--#, c-format
--msgid "redirect: %d"
-+#: ../statistics.c:107
-+#, fuzzy, c-format
-+msgid "redirect: %u"
- msgstr "Umleitungen: %d"
- 
--#: ../statistics.c:106
--#, c-format
--msgid "echo request: %d"
-+#: ../statistics.c:108
-+#, fuzzy, c-format
-+msgid "echo request: %u"
- msgstr "Echo Anfragen: %d"
- 
--#: ../statistics.c:108
--#, c-format
--msgid "timestamp requests: %d"
-+#: ../statistics.c:110
-+#, fuzzy, c-format
-+msgid "timestamp requests: %u"
- msgstr "Zeitstempel Anfragen: %d"
- 
--#: ../statistics.c:109
--#, c-format
--msgid "timestamp replies: %d"
-+#: ../statistics.c:111
-+#, fuzzy, c-format
-+msgid "timestamp replies: %u"
- msgstr "Zeitstempel Antworten: %d"
- 
--#: ../statistics.c:110
--#, c-format
--msgid "address mask requests: %d"
-+#: ../statistics.c:112
-+#, fuzzy, c-format
-+msgid "address mask requests: %u"
- msgstr "Adressmaskenanfragen: %d"
- 
--#: ../statistics.c:111
-+#: ../statistics.c:118
- #, c-format
--msgid "address mask replies: %d"
--msgstr "Adressmaskenantworten: %d"
-+msgid "RTO algorithm is %s"
-+msgstr "RTO-Algorithmus ist %s"
-+
-+#: ../statistics.c:122
-+#, fuzzy, c-format
-+msgid "%u active connections openings"
-+msgstr "%d Verbindungen aktiv geöffnet"
-+
-+#: ../statistics.c:123
-+#, fuzzy, c-format
-+msgid "%u passive connection openings"
-+msgstr "%d Verbindungen passiv geöffnet"
-+
-+#: ../statistics.c:124
-+#, fuzzy, c-format
-+msgid "%u failed connection attempts"
-+msgstr "%d fehlerhafte Verbindungsversuche"
-+
-+#: ../statistics.c:125
-+#, fuzzy, c-format
-+msgid "%u connection resets received"
-+msgstr "%d Verbindungsrücksetzungen empfangen"
-+
-+#: ../statistics.c:126
-+#, fuzzy, c-format
-+msgid "%u connections established"
-+msgstr "%d Verbindungen aufgebaut"
-+
-+#: ../statistics.c:127
-+#, fuzzy, c-format
-+msgid "%u segments received"
-+msgstr "%d Segmente empfangen"
-+
-+#: ../statistics.c:128
-+#, fuzzy, c-format
-+msgid "%u segments send out"
-+msgstr "%d Segmente abgeschickt"
-+
-+#: ../statistics.c:129
-+#, fuzzy, c-format
-+msgid "%u segments retransmited"
-+msgstr "%d Segmente erneut geschickt"
-+
-+#: ../statistics.c:130
-+#, fuzzy, c-format
-+msgid "%u bad segments received."
-+msgstr "%d fehlerhafte Segmente empfangen."
-+
-+#: ../statistics.c:131
-+#, fuzzy, c-format
-+msgid "%u resets sent"
-+msgstr "%d Rücksetzungen geschickt"
-+
-+#: ../statistics.c:136
-+#, fuzzy, c-format
-+msgid "%u packets received"
-+msgstr "%d Pakete empfangen"
-+
-+#: ../statistics.c:137
-+#, fuzzy, c-format
-+msgid "%u packets to unknown port received."
-+msgstr "%d Pakete für unbekannte Ports empfangen."
-+
-+#: ../statistics.c:138
-+#, fuzzy, c-format
-+msgid "%u packet receive errors"
-+msgstr "%d Paketempfangsfehler"
-+
-+#: ../statistics.c:139
-+#, fuzzy, c-format
-+msgid "%u packets sent"
-+msgstr "%d Pakete geschickt"
-+
-+#: ../statistics.c:144
-+#, fuzzy, c-format
-+msgid "%u SYN cookies sent"
-+msgstr "%d SYN-Cookies verschickt"
-+
-+#: ../statistics.c:145
-+#, fuzzy, c-format
-+msgid "%u SYN cookies received"
-+msgstr "%d SYN-Cookies empfangen"
- 
--#: ../statistics.c:116
-+#: ../statistics.c:146
-+#, fuzzy, c-format
-+msgid "%u invalid SYN cookies received"
-+msgstr "%d ungültige SYN-Cookies empfangen"
-+
-+#: ../statistics.c:148
-+#, fuzzy, c-format
-+msgid "%u resets received for embryonic SYN_RECV sockets"
-+msgstr "%d Rücksetzungen für embrionische SYN_RECV-Sockets"
-+
-+#: ../statistics.c:150
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue because of socket buffer overrun"
-+msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen"
-+
-+#. obsolete: 2.2.0 doesn't do that anymore
-+#: ../statistics.c:153
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue"
-+msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
-+
-+#: ../statistics.c:154
-+#, fuzzy, c-format
-+msgid ""
-+"%u packets dropped from out-of-order queue because of socket buffer overrun"
-+msgstr "%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen"
-+
-+#: ../statistics.c:156
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because they were out-of-window"
-+msgstr "%d ICMP-Pakete weggeworfen die außerhalb des Fensters waren"
-+
-+#: ../statistics.c:158
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because socket was locked"
-+msgstr "%d ICMP-Pakete verworfen weil Socket gesperrt war"
-+
-+#: ../statistics.c:160
- #, c-format
--msgid "RTO algorithm is %s"
--msgstr "RTO Algorithmus is %s"
-+msgid "%u TCP sockets finished time wait in fast timer"
-+msgstr ""
- 
--#: ../statistics.c:120
-+#: ../statistics.c:161
- #, c-format
--msgid "%d active connections openings"
--msgstr "%d Verbindungen aktiv geöffnet"
-+msgid "%u time wait sockets recycled by time stamp"
-+msgstr ""
- 
--#: ../statistics.c:121
-+#: ../statistics.c:162
- #, c-format
--msgid "%d passive connection openings"
--msgstr "%d Verbindungen passiv geöffnet"
-+msgid "%u TCP sockets finished time wait in slow timer"
-+msgstr ""
- 
--#: ../statistics.c:122
-+#: ../statistics.c:163
- #, c-format
--msgid "%d failed connection attempts"
--msgstr "%d fehlerhafte Verbindungsversuche"
-+msgid "%u passive connections rejected because of time stamp"
-+msgstr ""
- 
--#: ../statistics.c:123
-+#: ../statistics.c:165
- #, c-format
--msgid "%d connection resets received"
--msgstr "%d Verbindungsrücksetzungen empfangen"
-+msgid "%u active connections rejected because of time stamp"
-+msgstr ""
- 
--#: ../statistics.c:124
-+#: ../statistics.c:167
- #, c-format
--msgid "%d connections established"
--msgstr "%d Verbindungen aufgebaut"
-+msgid "%u packets rejects in established connections because of timestamp"
-+msgstr ""
- 
--#: ../statistics.c:125
-+#: ../statistics.c:169
-+#, fuzzy, c-format
-+msgid "%u delayed acks sent"
-+msgstr "%d Pakete geschickt"
-+
-+#: ../statistics.c:170
- #, c-format
--msgid "%d segments received"
--msgstr "%d Segmente empfangen"
-+msgid "%u delayed acks further delayed because of locked socket"
-+msgstr ""
- 
--#: ../statistics.c:126
-+#: ../statistics.c:172
- #, c-format
--msgid "%d segments send out"
--msgstr "%d Segmente abgeschickt"
-+msgid "Quick ack mode was activated %u times"
-+msgstr ""
- 
--#: ../statistics.c:127
-+#: ../statistics.c:173
- #, c-format
--msgid "%d segments retransmited"
--msgstr "%d Segmente erneut geschickt"
-+msgid "%u times the listen queue of a socket overflowed"
-+msgstr ""
- 
--#: ../statistics.c:128
-+#: ../statistics.c:175
- #, c-format
--msgid "%d bad segments received."
--msgstr "%d fehlerhafte Segmente empfangen."
-+msgid "%u SYNs to LISTEN sockets ignored"
-+msgstr ""
- 
--#: ../statistics.c:129
-+#: ../statistics.c:176
- #, c-format
--msgid "%d resets sent"
--msgstr "%d Rücksetzungen geschickt"
-+msgid "%u packets directly queued to recvmsg prequeue."
-+msgstr ""
- 
--#: ../statistics.c:134
-+#: ../statistics.c:178
- #, c-format
--msgid "%d packets received"
-+msgid "%u of bytes directly received from backlog"
-+msgstr ""
-+
-+#: ../statistics.c:180
-+#, c-format
-+msgid "%u of bytes directly received from prequeue"
-+msgstr ""
-+
-+#: ../statistics.c:182
-+#, fuzzy, c-format
-+msgid "%u packets dropped from prequeue"
-+msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
-+
-+#: ../statistics.c:183
-+#, fuzzy, c-format
-+msgid "%u packet headers predicted"
- msgstr "%d Pakete empfangen"
- 
--#: ../statistics.c:135
-+#: ../statistics.c:184
- #, c-format
--msgid "%d packets to unknown port received."
-+msgid "%u packets header predicted and directly queued to user"
-+msgstr ""
-+
-+#: ../statistics.c:186
-+#, c-format
-+msgid "Ran %u times out of system memory during packet sending"
-+msgstr ""
-+
-+#: ../statistics.c:188
-+#, fuzzy, c-format
-+msgid "%u acknowledgments not containing data received"
- msgstr "%d Pakete für unbekannte Ports empfangen."
- 
--#: ../statistics.c:136
-+#: ../statistics.c:189
- #, c-format
--msgid "%d packet receive errors"
--msgstr "%d Paketempfangsfehler"
-+msgid "%u predicted acknowledgments"
-+msgstr ""
- 
--#: ../statistics.c:137
-+#: ../statistics.c:190
- #, c-format
--msgid "%d packets sent"
--msgstr "%d Pakete geschickt"
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr ""
- 
--#: ../statistics.c:142
-+#: ../statistics.c:191
- #, c-format
--msgid "%d SYN cookies sent"
--msgstr "%d SYN-Cookies verschickt"
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr ""
- 
--#: ../statistics.c:143
-+#: ../statistics.c:192
-+#, fuzzy, c-format
-+msgid "%u bad SACKs received"
-+msgstr "%d fehlerhafte Segmente empfangen."
-+
-+#: ../statistics.c:193
- #, c-format
--msgid "%d SYN cookies received"
--msgstr "%d SYN-Cookies empfangen"
-+msgid "Detected reordering %u times using FACK"
-+msgstr ""
- 
--#: ../statistics.c:144
-+#: ../statistics.c:194
- #, c-format
--msgid "%d invalid SYN cookies received"
--msgstr "%d ungültige SYN-Cookies empfangen"
-+msgid "Detected reordering %u times using SACK"
-+msgstr ""
- 
--#: ../statistics.c:146
-+#: ../statistics.c:195
- #, c-format
--msgid "%d resets received for embryonic SYN_RECV sockets"
--msgstr "%d Rücksetzungen fuer embrionische SYN_RECV Sockets"
-+msgid "Detected reordering %u times using time stamp"
-+msgstr ""
- 
--#: ../statistics.c:148
-+#: ../statistics.c:196
- #, c-format
--msgid "%d packets pruned from receive queue because of socket buffer overrun"
-+msgid "Detected reordering %u times using reno fast retransmit"
- msgstr ""
--"%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange "
--"weggeworfen"
- 
--#. obsolete: 2.2.0 doesn't do that anymore
--#: ../statistics.c:151
-+#: ../statistics.c:197
- #, c-format
--msgid "%d packets pruned from out-of-order queue"
--msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
-+msgid "%u congestion windows fully recovered"
-+msgstr ""
- 
--#: ../statistics.c:152
-+#: ../statistics.c:198
- #, c-format
--msgid ""
--"%d packets dropped from out-of-order queue because of socket buffer overrun"
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
- msgstr ""
--"%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen"
- 
--#: ../statistics.c:154
-+#: ../statistics.c:199
- #, c-format
--msgid "%d ICMP packets dropped because they were out-of-window"
--msgstr "%d ICMP Pakete weggeworfen die auserhalb des Fensters waren"
-+msgid "%u congestion window recovered using DSACK"
-+msgstr ""
- 
--#: ../statistics.c:156
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr ""
-+
-+#: ../statistics.c:201
-+#, fuzzy, c-format
-+msgid "%u retransmits lost"
-+msgstr "%d Rücksetzungen geschickt"
-+
-+#: ../statistics.c:202
-+#, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr ""
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr ""
-+
-+#: ../statistics.c:205
-+#, fuzzy, c-format
-+msgid "%u fast retransmits"
-+msgstr "%d Segmente erneut geschickt"
-+
-+#: ../statistics.c:206
-+#, c-format
-+msgid "%u forward retransmits"
-+msgstr ""
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr ""
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr ""
-+
-+#: ../statistics.c:209
-+#, fuzzy, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr "%d Segmente erneut geschickt"
-+
-+#: ../statistics.c:210
-+#, fuzzy, c-format
-+msgid "%u sack retransmits failed"
-+msgstr "%d fehlgeschlagene Paketdefragmentierungen"
-+
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr ""
-+
-+#: ../statistics.c:212
-+#, fuzzy, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen"
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr ""
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr ""
-+
-+#: ../statistics.c:215
-+#, fuzzy, c-format
-+msgid "%u DSACKs received"
-+msgstr "%d Pakete empfangen"
-+
-+#: ../statistics.c:216
-+#, fuzzy, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "%d Pakete insgesamt empfangen"
-+
-+#: ../statistics.c:217
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "%d Verbindungsrücksetzungen empfangen"
-+
-+#: ../statistics.c:218
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr "%d Verbindungsrücksetzungen empfangen"
-+
-+#: ../statistics.c:219
-+#, fuzzy, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr "%d Verbindungsrücksetzungen empfangen"
-+
-+#: ../statistics.c:220
- #, c-format
--msgid "%d ICMP packets dropped because socket was locked"
--msgstr "%d ICMP Pakete verworfen weil Socket gesperrt war"
-+msgid "%u connections aborted due to memory pressure"
-+msgstr ""
-+
-+#: ../statistics.c:221
-+#, fuzzy, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr "%d Verbindungsrücksetzungen empfangen"
- 
- #: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr ""
-+
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr ""
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr ""
-+
-+#: ../statistics.c:292
- msgid "enabled"
- msgstr "aktiviert"
- 
--#: ../statistics.c:222
-+#: ../statistics.c:292
- msgid "disabled"
- msgstr "deaktiviert"
- 
--#: ../statistics.c:272
--#, c-format
--msgid "unknown title %s\n"
--msgstr "Unbekannter Titel %s\n"
--
--#: ../statistics.c:298
-+#: ../statistics.c:375
- msgid "error parsing /proc/net/snmp"
- msgstr "Fehler beim Parsen von /proc/net/snmp"
- 
--#: ../statistics.c:311
-+#: ../statistics.c:388
- msgid "cannot open /proc/net/snmp"
- msgstr "Kann /proc/net/snmp nicht öffnen"
- 
- #: ../lib/activate.c:69
- #, c-format
- msgid "Hardware type `%s' not supported.\n"
--msgstr "Hardwaretyp ,,%s'' nicht unterstützt.\n"
-+msgstr "Hardwaretyp »%s« nicht unterstützt.\n"
- 
- #: ../lib/activate.c:73
- #, c-format
- msgid "Cannot change line discipline to `%s'.\n"
--msgstr "Kann line discipline nicht auf ``%s'' setzen.\n"
-+msgstr "Kann line discipline nicht auf »%s« setzen.\n"
- 
--#: ../lib/af.c:145 ../lib/hw.c:148
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr "UNSPEC"
- 
--#: ../lib/af.c:147
-+#: ../lib/af.c:155
- msgid "UNIX Domain"
--msgstr "UNIX Domain"
-+msgstr "UNIX-Domain"
- 
--#: ../lib/af.c:150
-+#: ../lib/af.c:158
- msgid "DARPA Internet"
--msgstr "DARPA Internet"
-+msgstr "DARPA-Internet"
- 
--#: ../lib/af.c:153
-+#: ../lib/af.c:161
- msgid "IPv6"
- msgstr "IPv6"
- 
--#: ../lib/af.c:156 ../lib/hw.c:169
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr "AMPR AX.25"
- 
--#: ../lib/af.c:159 ../lib/hw.c:175
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr "AMPR NET/ROM"
- 
--#: ../lib/af.c:162
-+#: ../lib/af.c:170
- msgid "Novell IPX"
- msgstr ""
- 
--#: ../lib/af.c:165
-+#: ../lib/af.c:173
- msgid "Appletalk DDP"
- msgstr "Appletalk DDP"
- 
--#: ../lib/af.c:168 ../lib/hw.c:207
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr "Econet"
- 
--#: ../lib/af.c:171 ../lib/hw.c:172
-+#: ../lib/af.c:179
-+msgid "CCITT X.25"
-+msgstr ""
-+
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr "AMPR ROSE"
- 
--#: ../lib/af.c:174 ../lib/hw.c:160
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr "Ash"
- 
--#: ../lib/af.c:232
-+#: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr "Bitte nur eine Adressfamilie angeben.\n"
- 
--#: ../lib/af.c:293
-+#: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr "Zu viele Adressfamilien angegeben.\n"
- 
--#: ../lib/af.c:304
-+#: ../lib/af.c:315
- #, c-format
- msgid "Unknown address family `%s'.\n"
--msgstr "Unbekannte Adressfamilie `%s'.\n"
--
--#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
--#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
--#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
--#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
--msgid "[NONE SET]"
--msgstr "[NICHT GESETZT]"
-+msgstr "Unbekannte Adressfamilie »%s«.\n"
- 
--#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
- #, c-format
- msgid "in_arcnet(%s): invalid arcnet address!\n"
- msgstr "in_arcnet(%s): Ungültige ARCnet-Adresse!\n"
- 
--#: ../lib/arcnet.c:108
-+#: ../lib/arcnet.c:97
- #, c-format
- msgid "in_arcnet(%s): trailing : ignored!\n"
- msgstr "in_arcnet(%s): angehängt : ignoriert!\n"
- 
--#: ../lib/arcnet.c:120
-+#: ../lib/arcnet.c:109
- #, c-format
- msgid "in_arcnet(%s): trailing junk!\n"
- msgstr "in_arcnet(%s): Nachfolgender Müll!\n"
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
--msgstr "Fehlerhafte Ash Adresse"
-+msgstr "Fehlerhafte Ash-Adresse"
-+
-+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-+msgid "[NONE SET]"
-+msgstr "[NICHT GESETZT]"
- 
- #: ../lib/ax25.c:97 ../lib/netrom.c:100
- msgid "Invalid callsign"
-@@ -1898,22 +2168,21 @@
- msgstr "Rufzeichen zu lang"
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr "AX.25 ist auf diesem System nicht konfiguriert.\n"
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr "Kernel AX.25 Routentabelle\n"
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr "Ziel         SStelle  Benutzer\n"
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n"
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1929,153 +2198,168 @@
- msgid "in_ether(%s): trailing junk!\n"
- msgstr "in_ether(%s): Nachfolgender Müll!\n"
- 
--#: ../lib/fddi.c:95 ../lib/fddi.c:110
-+#: ../lib/fddi.c:84 ../lib/fddi.c:99
- #, c-format
- msgid "in_fddi(%s): invalid fddi address!\n"
- msgstr "in_fddi(%s): Ungültige FDDI-Adresse!\n"
- 
--#: ../lib/fddi.c:122
-+#: ../lib/fddi.c:111
- #, c-format
- msgid "in_fddi(%s): trailing : ignored!\n"
- msgstr "in_fddi(%s): nachfolgend : ignoriert!\n"
- 
--#: ../lib/fddi.c:134
-+#: ../lib/fddi.c:123
- #, c-format
- msgid "in_fddi(%s): trailing junk!\n"
- msgstr "in_fddi(%s): Nachfolgender Müll!\n"
- 
--#: ../lib/getroute.c:97 ../lib/setroute.c:76
-+#: ../lib/getroute.c:101 ../lib/setroute.c:80
- #, c-format
- msgid "Address family `%s' not supported.\n"
- msgstr "Adressfamilie `%s' wird nicht unterstützt.\n"
- 
--#: ../lib/getroute.c:103 ../lib/setroute.c:80
-+#: ../lib/getroute.c:107 ../lib/setroute.c:84
- #, c-format
- msgid "No routing for address family `%s'.\n"
- msgstr "Kein Routen für Adressfamilie `%s'.\n"
- 
--#: ../lib/hippi.c:96 ../lib/hippi.c:111
-+#: ../lib/hippi.c:84 ../lib/hippi.c:99
- #, c-format
- msgid "in_hippi(%s): invalid hippi address!\n"
- msgstr "in_hippi(%s): Ungültige HIPPI-Adresse!\n"
- 
--#: ../lib/hippi.c:123
-+#: ../lib/hippi.c:111
- #, c-format
- msgid "in_hippi(%s): trailing : ignored!\n"
- msgstr "in_hippi(%s): nachfolgend : ignoriert!\n"
- 
--#: ../lib/hippi.c:134
-+#: ../lib/hippi.c:122
- #, c-format
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr "in_hippi(%s): Nachfolgender Müll!\n"
- 
--#: ../lib/hw.c:147
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr "Lokale Schleife"
- 
--#: ../lib/hw.c:150
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr "Serielle IP"
- 
--#: ../lib/hw.c:151
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr "Serielle VJ-IP"
- 
--#: ../lib/hw.c:152
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr "6-bit Serielle IP"
- 
--#: ../lib/hw.c:153
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr "VJ 6-bit Serielle IP"
- 
--#: ../lib/hw.c:154
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr "Adaptive Serielle IP"
- 
--#: ../lib/hw.c:157
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr "Ethernet"
- 
--#: ../lib/hw.c:163
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr "Fiber Distributed Data Interface"
- 
--#: ../lib/hw.c:166
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr "HIPPI"
- 
--#: ../lib/hw.c:178
-+#: ../lib/hw.c:191
-+msgid "generic X.25"
-+msgstr ""
-+
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr "IPIP Tunnel"
- 
--#: ../lib/hw.c:181
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
--msgstr "Punkt-zu-Punkt Verbindung"
-+msgstr "Punkt-zu-Punkt-Verbindung"
- 
--#: ../lib/hw.c:184
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr "(Cisco)-HDLC"
- 
--#: ../lib/hw.c:185
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:188
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr "ARCnet"
- 
--#: ../lib/hw.c:191
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr "Frame Relay DLCI"
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr "Frame Relay Access Device"
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr "IPv6-nach-IPv4"
- 
--#: ../lib/hw.c:198
--#, fuzzy
-+#: ../lib/hw.c:214
- msgid "IrLAP"
--msgstr "LAPB"
-+msgstr "IrLAP"
- 
--#: ../lib/hw.c:201
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr ""
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:219
- msgid "16/4 Mbps Token Ring (New)"
- msgstr ""
- 
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
- #: ../lib/inet.c:153 ../lib/inet6.c:79
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
- msgstr "rresolve: nicht unterstützte Adressfamilie %d !\n"
- 
--#: ../lib/inet6_gr.c:79
-+#: ../lib/inet6.c:131
-+#, fuzzy
-+msgid "[UNKNOWN]"
-+msgstr "UNBEKANNT"
-+
-+#: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr "INET6 (IPv6) ist auf diesem System nicht konfiguriert.\n"
- 
--#: ../lib/inet6_gr.c:82
-+#: ../lib/inet6_gr.c:74
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
--msgstr "Kernel IPv6 Routentabelle\n"
-+msgstr "Kernel-IPv6-Routentabelle\n"
- 
--#: ../lib/inet6_gr.c:84
-+#: ../lib/inet6_gr.c:76
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
--msgstr ""
--"Ziel                                        Nächster Hop                     "
--"            Flags Metric Ref    Benutzer Iface\n"
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
-+msgstr "Ziel                                        Nächster Hop                                 Flags Metric Ref    Benutzer Iface\n"
- 
--#: ../lib/inet6_gr.c:158
-+#: ../lib/inet6_gr.c:150
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr "Kernel IPv6 Nachbarcache\n"
- 
--#: ../lib/inet6_gr.c:161
-+#: ../lib/inet6_gr.c:153
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
-@@ -2083,39 +2367,45 @@
- "Nachbar                                     HW-Adresse        Iface    Flags "
- "Ref Zustand\n"
- 
--#: ../lib/inet6_gr.c:165
-+#: ../lib/inet6_gr.c:157
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
--msgstr ""
--"Nachbar                                     HW-Adresse        Iface    Flags "
--"Ref Zustand          Stale(sec) Löschen(sec)\n"
-+msgstr "Nachbar                                     HW-Adresse        Iface    Flags Ref Zustand          Stale(sec) Löschen(sec)\n"
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr "Benutzung: inet6_route [-vF] del Ziel\n"
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr "       inet6_route [-vF] add Ziel [gw Gateway] [metric M] [[dev] If]\n"
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr "       inet6_route [-FC] flush      NICHT unterstützt\n"
- 
--#: ../lib/inet6_sr.c:182
-+#: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
--msgstr ",,Flush'' für IPv6 Routentabelle nicht unterstützt\n"
-+msgstr "»Flush« für IPv6-Routentabelle nicht unterstützt\n"
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr "INET (IPv4) ist auf diesem System nicht konfiguriert.\n"
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
--msgstr "Kernel IP Routentabelle\n"
-+msgstr "Kernel-IP-Routentabelle\n"
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2124,6 +2414,7 @@
- "Iface\n"
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
-@@ -2132,6 +2423,7 @@
- "Iface\n"
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
-@@ -2140,10 +2432,12 @@
- "Iface    MSS   Fenster irtt\n"
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
--msgstr "Kernel IP Routencache\n"
-+msgstr "Kernel-IP-Routencache\n"
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2152,6 +2446,7 @@
- "Iface\n"
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
-@@ -2160,6 +2455,7 @@
- "Iface\n"
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
-@@ -2168,6 +2464,7 @@
- "Iface    MSS   Fenster irtt   HH  Arp\n"
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-@@ -2175,37 +2472,39 @@
- "Quelle          Ziel            Gateway         Flags Metrik Ref    Ben "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
--msgstr ""
--"Benutzung: inet_route [-vF] del {-host|-net} Ziel[/prefix] [gw Gw] [metric "
--"M] [[dev] If]\n"
-+msgstr "Benutzung: inet_route [-vF] del {-host|-net} Ziel[/Präfix] [gw Gw] [metric M] [[dev] If]\n"
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
--msgstr ""
--"       inet_route [-vF] add {-host|-net} Ziel[/Prefix] [gw Gw] [metric M]\n"
-+msgstr "       inet_route [-vF] add {-host|-net} Ziel[/Präfix] [gw Gw] [metric M]\n"
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
--msgstr ""
--"       inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric M] reject\n"
-+msgstr "       inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric M] reject\n"
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr "       inet_route [-FC] flush      NICHT unterstützt\n"
- 
-@@ -2215,15 +2514,17 @@
- msgstr "route: %s: Netzadresse als Gateway ungültig!\n"
- 
- #: ../lib/inet_sr.c:174
--#, fuzzy
-+#, fuzzy, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr "route: Ungültige MSS.\n"
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr "route: Ungültige Fenstergröße.\n"
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr "route: Ungültige Start-RTT.\n"
- 
-@@ -2238,126 +2539,408 @@
- msgstr "Route: Fehlerhafte Netzmaske %s\n"
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr "route: Netzmaske passt nicht zur Routenadresse\n"
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
--msgstr ",,Flush'' der Inet-Routentabelle nicht unterstützt\n"
-+msgstr "»Flush« der Inet-Routentabelle nicht unterstützt\n"
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
--msgstr "Änderung des ,,Inet'' Routencaches nicht unterstützt\n"
-+msgstr "Änderung des »Inet« Routencaches nicht unterstützt\n"
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr "IPX ist auf diesem System nicht konfiguriert.\n"
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
--msgstr "Kernel IPX Routentabelle\n"
-+msgstr "Kernel-IPX-Routentabelle\n"
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
--msgstr "Ziel                      Router Netz               Router Knoten\n"
-+msgstr "Ziel                      Router-Netz               Router-Knoten\n"
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
--msgstr "IPX: dies muß noch geschrieben werden\n"
-+msgstr "IPX: dies muss noch geschrieben werden\n"
- 
--#: ../lib/masq_info.c:197
-+#: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr "IP-Maskierungseinträge\n"
- 
--#: ../lib/masq_info.c:200
-+#: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr "Prot   expire Quelle               Ziel                 Ports\n"
- 
--#: ../lib/masq_info.c:203
-+#: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
--"Prot   Ablauf    Anf-Seq Delta Prevd Quelle               Ziel               "
--"  Ports\n"
-+"Prot   Ablauf    Anf-Seq Delta Prevd Quelle               "
-+"Ziel                 Ports\n"
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr "NET/ROM ist auf diesem System nicht verfügbar.\n"
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
--msgstr "Kernel NET/ROM Routentabelle\n"
-+msgstr "Kernel-NET/ROM-Routentabelle\n"
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr "Ziel         Mnemonic  Qualität  Nachbar  Iface\n"
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
--msgstr "NET/ROM Benutzung\n"
-+msgstr "NET/ROM-Benutzung\n"
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
--msgstr "NET/ROM: Dies muß noch geschrieben werden\n"
-+msgstr "NET/ROM: Dies muss noch geschrieben werden\n"
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr "Mit diesem Programm kann PPP nicht gestartet werden.\n"
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
--msgstr "Bitte benutzen sie pppd.\n"
-+msgstr "Bitte benutzen Sie pppd.\n"
- 
- #: ../lib/rose.c:87
- msgid "Node address must be ten digits"
--msgstr "Knotenadresse muß zehn Ziffern haben"
-+msgstr "Knotenadresse muss zehn Ziffern haben"
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr "ROSE ist auf diesem System nicht verfügbar.\n"
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
--msgstr "ROSE Kernel Routentabelle\n"
-+msgstr "ROSE-Kernel-Routentabelle\n"
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr "in_tr(%s): ungültige Tokenringadresse!\n"
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr "in_tr(%s): nachfolgend : ignoriert!\n"
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr "in_tr(%s): nachfolgender Müll!\n"
- 
--#: ../lib/interface.c:124
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
--msgstr "Warnung: Keine INET Sockets verfügbar: %s\n"
-+msgstr "Warnung: Keine INET-Sockets verfügbar: %s\n"
- 
--#: ../lib/interface.c:270
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr ""
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:504
-+#: ../lib/interface.c:571
- msgid "Device not found"
- msgstr "Gerät nicht gefunden"
- 
--#: ../lib/interface.c:508
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
- msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
- 
--#: ../lib/sockets.c:59
-+#: ../lib/interface.c:608
-+msgid "     - no statistics available -"
-+msgstr "     - keine Statistiken verfügbar -"
-+
-+#: ../lib/interface.c:612
-+#, c-format
-+msgid "[NO FLAGS]"
-+msgstr "[KEINE FLAGS]"
-+
-+#: ../lib/interface.c:688
-+#, c-format
-+msgid "%-9.9s Link encap:%s  "
-+msgstr "%-9.9s Protokoll:%s  "
-+
-+#: ../lib/interface.c:693
-+#, c-format
-+msgid "HWaddr %s  "
-+msgstr "Hardware Adresse %s  "
-+
-+#: ../lib/interface.c:696
-+#, c-format
-+msgid "Media:%s"
-+msgstr "Medium:%s"
-+
-+#: ../lib/interface.c:698
-+#, c-format
-+msgid "(auto)"
-+msgstr "(auto)"
-+
-+#: ../lib/interface.c:705
-+#, c-format
-+msgid "          %s addr:%s "
-+msgstr "          %s Adresse:%s "
-+
-+#: ../lib/interface.c:708
-+#, c-format
-+msgid " P-t-P:%s "
-+msgstr " P-z-P:%s "
-+
-+#: ../lib/interface.c:711
-+#, c-format
-+msgid " Bcast:%s "
-+msgstr " Bcast:%s "
-+
-+#: ../lib/interface.c:713
-+#, c-format
-+msgid " Mask:%s\n"
-+msgstr " Maske:%s\n"
-+
-+#: ../lib/interface.c:730
-+#, c-format
-+msgid "          inet6 addr: %s/%d"
-+msgstr "          inet6-Adresse: %s/%d"
-+
-+#: ../lib/interface.c:732
-+#, c-format
-+msgid " Scope:"
-+msgstr " Gültigkeitsbereich:"
-+
-+#: ../lib/interface.c:735
-+#, c-format
-+msgid "Global"
-+msgstr "Global"
-+
-+#: ../lib/interface.c:738
-+#, c-format
-+msgid "Link"
-+msgstr "Verbindung"
-+
-+#: ../lib/interface.c:741
-+#, c-format
-+msgid "Site"
-+msgstr "Standort"
-+
-+#: ../lib/interface.c:744
-+#, c-format
-+msgid "Compat"
-+msgstr "Kompatibilität"
-+
-+#: ../lib/interface.c:747
-+#, c-format
-+msgid "Host"
-+msgstr "Maschine"
-+
-+#: ../lib/interface.c:750
-+#, c-format
-+msgid "Unknown"
-+msgstr "Unbekannt"
-+
-+#: ../lib/interface.c:765
-+#, c-format
-+msgid "          IPX/Ethernet II addr:%s\n"
-+msgstr "          IPX/Ethernet II Adresse:%s\n"
-+
-+#: ../lib/interface.c:768
-+#, c-format
-+msgid "          IPX/Ethernet SNAP addr:%s\n"
-+msgstr "          IPX/Ethernet SNAP Adresse:%s\n"
-+
-+#: ../lib/interface.c:771
-+#, c-format
-+msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+msgstr "          IPX/Ethernet 802.2 Adresse:%s\n"
-+
-+#: ../lib/interface.c:774
-+#, c-format
-+msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+msgstr "          IPX/Ethernet 802.3 Adresse:%s\n"
-+
-+#: ../lib/interface.c:784
-+#, c-format
-+msgid "          EtherTalk Phase 2 addr:%s\n"
-+msgstr "          EtherTalk Phase 2 Adresse:%s\n"
-+
-+#: ../lib/interface.c:793
-+#, c-format
-+msgid "          econet addr:%s\n"
-+msgstr "          econet Adresse:%s\n"
-+
-+#: ../lib/interface.c:800
-+#, c-format
-+msgid "[NO FLAGS] "
-+msgstr "[KEINE FLAGS] "
-+
-+#: ../lib/interface.c:802
-+#, c-format
-+msgid "UP "
-+msgstr "UP "
-+
-+#: ../lib/interface.c:804
-+#, c-format
-+msgid "BROADCAST "
-+msgstr "BROADCAST "
-+
-+#: ../lib/interface.c:806
-+#, c-format
-+msgid "DEBUG "
-+msgstr "DEBUG "
-+
-+#: ../lib/interface.c:808
-+#, c-format
-+msgid "LOOPBACK "
-+msgstr "LOOPBACK "
-+
-+#: ../lib/interface.c:810
-+#, c-format
-+msgid "POINTOPOINT "
-+msgstr "PUNKTZUPUNKT "
-+
-+#: ../lib/interface.c:812
-+#, c-format
-+msgid "NOTRAILERS "
-+msgstr "NOTRAILERS "
-+
-+#: ../lib/interface.c:814
-+#, c-format
-+msgid "RUNNING "
-+msgstr "RUNNING "
-+
-+#: ../lib/interface.c:816
-+#, c-format
-+msgid "NOARP "
-+msgstr "NOARP "
-+
-+#: ../lib/interface.c:818
-+#, c-format
-+msgid "PROMISC "
-+msgstr "PROMISC "
-+
-+#: ../lib/interface.c:820
-+#, c-format
-+msgid "ALLMULTI "
-+msgstr "ALLMULTI "
-+
-+#: ../lib/interface.c:822
-+#, c-format
-+msgid "SLAVE "
-+msgstr "SLAVE "
-+
-+#: ../lib/interface.c:824
-+#, c-format
-+msgid "MASTER "
-+msgstr "MASTER "
-+
-+#: ../lib/interface.c:826
-+#, c-format
-+msgid "MULTICAST "
-+msgstr "MULTICAST "
-+
-+#: ../lib/interface.c:829
-+#, c-format
-+msgid "DYNAMIC "
-+msgstr "DYNAMIC "
-+
-+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-+#: ../lib/interface.c:832
-+#, c-format
-+msgid " MTU:%d  Metric:%d"
-+msgstr " MTU:%d  Metrik:%d"
-+
-+#: ../lib/interface.c:836
-+#, c-format
-+msgid "  Outfill:%d  Keepalive:%d"
-+msgstr "  Outfill:%d  Keepalive:%d"
-+
-+#: ../lib/interface.c:850
-+#, fuzzy, c-format
-+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgstr "Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n"
-+
-+#: ../lib/interface.c:855
-+#, c-format
-+msgid "             compressed:%lu\n"
-+msgstr "             komprimiert:%lu\n"
-+
-+#: ../lib/interface.c:895
-+#, fuzzy, c-format
-+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgstr "Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n"
-+
-+#: ../lib/interface.c:899
-+#, c-format
-+msgid "          collisions:%lu "
-+msgstr "          Kollisionen:%lu "
-+
-+#: ../lib/interface.c:901
-+#, c-format
-+msgid "compressed:%lu "
-+msgstr "Komprimiert:%lu "
-+
-+#: ../lib/interface.c:903
-+#, c-format
-+msgid "txqueuelen:%d "
-+msgstr "Sendewarteschlangenlänge:%d "
-+
-+#: ../lib/interface.c:905
-+#, c-format
-+msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-+msgstr ""
-+
-+#: ../lib/interface.c:916
-+#, c-format
-+msgid "Interrupt:%d "
-+msgstr "Interrupt:%d "
-+
-+#. Only print devices using it for
-+#. I/O maps
-+#: ../lib/interface.c:919
-+#, c-format
-+msgid "Base address:0x%x "
-+msgstr "Basisadresse:0x%x "
-+
-+#: ../lib/interface.c:921
-+#, c-format
-+msgid "Memory:%lx-%lx "
-+msgstr "Speicher:%lx-%lx "
-+
-+#: ../lib/interface.c:924
-+#, c-format
-+msgid "DMA chan:%x "
-+msgstr "DMA Kanal:%x "
-+
-+#: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr "Keine benutzbaren Adressfamilien gefunden.\n"
- 
-@@ -2369,41 +2952,44 @@
- #: ../lib/util-ank.c:238
- #, c-format
- msgid "ip: %s is invalid inet prefix\n"
--msgstr "ip: %s ist ein ungültiges INET-Prefix\n"
-+msgstr "ip: %s ist ein ungültiges INET-Präfix\n"
- 
- #: ../lib/util-ank.c:248
- #, c-format
- msgid "ip: %s is invalid IPv4 address\n"
--msgstr "ip: %s ist eine ungültige IPv4 Adresse\n"
-+msgstr "ip: %s ist eine ungültige IPv4-Adresse\n"
- 
- #: ../lib/util-ank.c:256
- #, c-format
- msgid "ip: argument is wrong: %s\n"
- msgstr "ip: Fehlerhaftes Argument: %s\n"
- 
--#: ../ipmaddr.c:56
-+#: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr "Benutzung: ipmaddr [ add | del ] MULTIADR dev NAME\n"
- 
--#: ../ipmaddr.c:57
-+#: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr "       ipmaddr show [ dev NAME ] [ ipv4 | ipv6 | link | all ]\n"
- 
--#: ../ipmaddr.c:58
-+#: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr ""
- 
--#: ../ipmaddr.c:258
-+#: ../ipmaddr.c:263
- #, c-format
- msgid "family %d "
- msgstr "familie %d "
- 
--#: ../ipmaddr.c:267
-+#: ../ipmaddr.c:272
- #, c-format
- msgid " users %d"
- msgstr " Benutzer %d"
- 
--#: ../ipmaddr.c:353
-+#: ../ipmaddr.c:358
- msgid "Cannot create socket"
- msgstr "Kann Socket nicht öffnen"
- 
-@@ -2418,13 +3004,14 @@
- msgstr "slattach: tty_lock: (%s): %s\n"
- 
- #: ../slattach.c:192
-+#, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr "slattach: Kann PID-Datei nicht schreiben\n"
- 
- #: ../slattach.c:202
- #, c-format
- msgid "slattach: tty_lock: UUCP user %s unknown!\n"
--msgstr "slattach: tty_lock: UUCP Benutzer %s unbekannt!\n"
-+msgstr "slattach: tty_lock: UUCP-Benutzer %s unbekannt!\n"
- 
- #: ../slattach.c:430
- #, c-format
-@@ -2436,39 +3023,71 @@
- msgid "slattach: tty_hangup(RAISE): %s\n"
- msgstr "slattach: tty_hangup(RAISE): %s\n"
- 
--#: ../slattach.c:486
-+#: ../slattach.c:468
-+#, fuzzy, c-format
-+msgid "slattach: tty name too long\n"
-+msgstr "%s: name zu lang\n"
-+
-+#: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr "slattach: tty_open: kann aktuellen Zustand nicht auslesen!\n"
- 
--#: ../slattach.c:493
-+#: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
- msgstr ""
- "slattach: tty_open: Kann augenblicklichen Leitungszustand nicht auslesen!\n"
- 
--#: ../slattach.c:501
-+#: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr "slattach: tty_open: Kann RAW-Modus nicht setzen!\n"
- 
--#: ../slattach.c:508
-+#: ../slattach.c:520
- #, c-format
- msgid "slattach: tty_open: cannot set %s bps!\n"
- msgstr "slattach: tty_open: Kann %s bps nicht setzen!\n"
- 
--#: ../slattach.c:518
-+#: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr "slattach: tty_open: Kann 8N1-Modus nicht setzen!\n"
- 
--#: ../slattach.c:686
-+#: ../slattach.c:672
-+#, c-format
-+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+msgstr ""
-+
-+#: ../slattach.c:704
- #, c-format
- msgid "%s started"
- msgstr "%s gestartet"
- 
--#: ../slattach.c:687
-+#: ../slattach.c:705
- #, c-format
- msgid " on %s"
- msgstr " auf %s"
- 
--#: ../slattach.c:688
-+#: ../slattach.c:706
- #, c-format
- msgid " interface %s\n"
- msgstr " Schnittstelle: %s\n"
-+
-+msgid ""
-+"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+"<-''-\n"
-+msgstr ""
-+"  arp [-v]   [<HW>] [-i <if>] -s  <Hostname> <hwaddr> [netmask <nm>] pub\n"
-+
-+msgid "%s: unknown interface: %s\n"
-+msgstr "%s: unbekannte Schnittstelle: %s\n"
-+
-+msgid "address mask replies"
-+msgstr "Adressmaskenantworten"
-+
-+msgid "unknown title %s\n"
-+msgstr "Unbekannter Titel %s\n"
-+
-+msgid "Routing table for `ddp' not yet supported.\n"
-+msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n"
---- net-tools-1.60.orig/po/fr.po
-+++ net-tools-1.60/po/fr.po
-@@ -4,7 +4,8 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: net-tools 1.51\n"
--"POT-Creation-Date: 2000-02-14 02:31+0100\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
- "PO-Revision-Date: 1998-03-01 00:02+0100\n"
- "Last-Translator: J.M.Vansteene <vanstee@worldnet.fr>\n"
- "Language-Team:\n"
-@@ -12,273 +13,277 @@
- "Content-Type: text/plain; charset=iso8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:110 ../arp.c:269
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
- msgstr "arp: nécessite un nom d'hôte\n"
- 
--#: ../arp.c:207 ../arp.c:221
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
- msgstr "Pas d'entrée ARP pour %s\n"
- 
--#: ../arp.c:239
-+#: ../arp.c:248
- #, fuzzy, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n"
- 
--#: ../arp.c:243
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr ""
- 
--#: ../arp.c:252
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
- msgstr ""
- 
--#: ../arp.c:282
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
- msgstr "arp: nécessite une adresse matériel\n"
- 
--#: ../arp.c:290
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr "arp: adresse matériel invalide\n"
- 
--#: ../arp.c:387
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr "arp: ne peut ouvrir le fichier ether %s !\n"
- 
--#: ../arp.c:403
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr "arp: erreur de format ligne %u du fichier ether %s !\n"
- 
--#: ../arp.c:416
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr "arp: ne peut définir l'entrée en ligne %u du fichier ether %s !\n"
- 
--#: ../arp.c:437
--msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
-+#: ../arp.c:448
-+#, fuzzy, c-format
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
- msgstr "Adresse\t\t\tTypeMap\tAdresseMat\t   Indicateurs\t\t  Iface\n"
- 
--#: ../arp.c:467
-+#: ../arp.c:476
-+#, fuzzy
-+msgid "<from_interface>"
-+msgstr "%s: interface inconnue: %s\n"
-+
-+#: ../arp.c:478
- msgid "(incomplete)"
- msgstr ""
- 
--#: ../arp.c:484
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr ""
- 
--#: ../arp.c:490
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
- msgstr ""
- 
--#: ../arp.c:496
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
- msgstr ""
- 
--#: ../arp.c:513
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr ""
- 
--#: ../arp.c:592
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr "Entrées: %d\tIgnorées: %d\tTrouvées: %d\n"
- 
--#: ../arp.c:596
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr ""
- 
--#: ../arp.c:598
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
- msgstr "arp: aucune correspondance trouvée dans %d entrées\n"
- 
--#: ../arp.c:613
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
- "cache\n"
- msgstr ""
- "Syntaxe:\n"
--"  arp [-vn]  [<MAT>] [-i <if>] [-a] [<hôte>]              <-Affiche cache "
--"ARP\n"
-+"  arp [-vn]  [<MAT>] [-i <if>] [-a] [<hôte>]              <-Affiche cache ARP\n"
- 
--#: ../arp.c:614
-+#: ../arp.c:627
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
--msgstr ""
--"  arp [-v]          [-i <if>] -d  <hôte> [pub][nopub]     <-Supprime entrée "
--"ARP\n"
-+msgstr "  arp [-v]          [-i <if>] -d  <hôte> [pub][nopub]     <-Supprime entrée ARP\n"
- 
--#: ../arp.c:615
--#, fuzzy
-+#: ../arp.c:628
-+#, fuzzy, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
--msgstr ""
--"  arp [-vnD] [<MAT>] [-i <if>] -f  <fichier>              <-Ajout entrée "
--"depuis fichier\n"
-+msgstr "  arp [-vnD] [<MAT>] [-i <if>] -f  <fichier>              <-Ajout entrée depuis fichier\n"
- 
--#: ../arp.c:616
-+#: ../arp.c:629
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
--msgstr ""
--"  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [temp][nopub] <-Ajout "
--"entrée\n"
-+msgstr "  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [temp][nopub] <-Ajout entrée\n"
- 
--#: ../arp.c:617
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--"  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [netmask <nm>] pub  "
--"<-''-\n"
--
--#: ../arp.c:618
-+#: ../arp.c:630
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
- msgstr ""
--"  arp [-v]   [<MAT>] [-i <if>] -Ds <hôte> <if> [netmask <nm>] pub      "
--"<-''-\n"
-+"  arp [-v]   [<MAT>] [-i <if>] -Ds <hôte> <if> [netmask <nm>] pub      <-''-\n"
- "\n"
- 
--#: ../arp.c:620
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
--msgstr ""
--"        -a                       affiche (tous) les hôtes en style BSD\n"
-+msgstr "        -a                       affiche (tous) les hôtes en style BSD\n"
- 
--#: ../arp.c:621
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr "        -s, --set                définit une nouvelle entrée ARP\n"
- 
--#: ../arp.c:622
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr "        -d, --delete             supprime une entrée\n"
- 
--#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr "        -v, --verbose            mode verbeux\n"
- 
--#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
--msgid "        -n, --numeric            dont resolve names\n"
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, fuzzy, c-format
-+msgid "        -n, --numeric            don't resolve names\n"
- msgstr "        -n, --numeric            ne résout pas les noms\n"
- 
--#: ../arp.c:625
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
--msgstr ""
--"        -i, --device             spécifie l'interface réseau (p.ex. eth0)\n"
-+msgstr "        -i, --device             spécifie l'interface réseau (p.ex. eth0)\n"
- 
--#: ../arp.c:626
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
--msgstr ""
--"        -D, --use-device         lit l'<adrmat> depuis le périphérique\n"
-+msgstr "        -D, --use-device         lit l'<adrmat> depuis le périphérique\n"
- 
--#: ../arp.c:627
--#, fuzzy
-+#: ../arp.c:639
-+#, fuzzy, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr "        -r, --route              affiche la table de routage\n"
- 
--#: ../arp.c:628
--#, fuzzy
-+#: ../arp.c:640
-+#, fuzzy, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
- "        -f, --file               lit les nouvelles entrées dans le fichier\n"
- "\n"
- 
--#: ../arp.c:630 ../rarp.c:181
-+#: ../arp.c:642 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
--msgstr ""
--"  <HW>=Utilisez '-H <hw>' pour spécifier le type d'adresse matériel. Défaut: "
--"%s\n"
-+msgstr "  <HW>=Utilisez '-H <hw>' pour spécifier le type d'adresse matériel. Défaut: %s\n"
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr "  Liste les types de matériels supportant ARP:\n"
- 
--#: ../arp.c:664
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr "%s: type de matétiel non supporté !\n"
- 
--#: ../arp.c:668
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr "%s: famille d'adresses non supportée !\n"
- 
--#: ../arp.c:703
--#, fuzzy
-+#: ../arp.c:716
-+#, fuzzy, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr "Table de routage pour `ddp' pas encore supporté.\n"
- 
--#: ../arp.c:713
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr "arp: %s: famille d'adresses inconnue.\n"
- 
--#: ../arp.c:722
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr "arp: %s: type de matériel inconnu.\n"
- 
--#: ../arp.c:741
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
- msgstr "arp: %s: le noyau ne supporte que 'inet'.\n"
- 
--#: ../arp.c:746
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr "arp: %s: type de matériel sans support ARP.\n"
- 
--#: ../hostname.c:69
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
- msgstr "Définit le nom de noeud à `%s'\n"
- 
--#: ../hostname.c:74
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr "%s: vous devez être root pour changer le nom de noeud\n"
- 
--#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr "%s: nom trop long\n"
- 
--#: ../hostname.c:89
-+#: ../hostname.c:91
- #, c-format
- msgid "Setting hostname to `%s'\n"
- msgstr "Définit le nom d'hôte à `%s'\n"
- 
--#: ../hostname.c:94
-+#: ../hostname.c:96
- #, c-format
- msgid "%s: you must be root to change the host name\n"
- msgstr "%s: vous devez être root pour changer le nom d'hôte\n"
- 
--#: ../hostname.c:108
-+#: ../hostname.c:109
- #, c-format
- msgid "Setting domainname to `%s'\n"
- msgstr "Définit le nom de domaine à `%s'\n"
- 
--#: ../hostname.c:113
-+#: ../hostname.c:114
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
- msgstr "%s: vous devez être root pour changer le nom de domaine\n"
-@@ -303,38 +308,36 @@
- msgid "Result: h_addr_list=`%s'\n"
- msgstr "Résultat : h_addr_list=`%s'\n"
- 
--#: ../hostname.c:209
-+#: ../hostname.c:208
- #, c-format
- msgid "%s: can't open `%s'\n"
- msgstr "%s: ne peut ouvrir `%s'\n"
- 
--#: ../hostname.c:223
-+#: ../hostname.c:222
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
--msgstr ""
--"Syntaxe : hostname [-v] {hôte|-F fichier}      définit le nom d'hôte (depuis "
--"le fichier)\n"
-+msgstr "Syntaxe : hostname [-v] {hôte|-F fichier}      définit le nom d'hôte (depuis le fichier)\n"
- 
--#: ../hostname.c:224
-+#: ../hostname.c:223
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
--msgstr ""
--"       domainname [-v] {domaine_nis|-F fichier}   définit le domaine NIS "
--"(depuis le fichier)\n"
-+msgstr "       domainname [-v] {domaine_nis|-F fichier}   définit le domaine NIS (depuis le fichier)\n"
- 
--#: ../hostname.c:226
--#, fuzzy
-+#: ../hostname.c:225
-+#, fuzzy, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
--msgstr ""
--"       nodename [-v] {nom_noeud|-F fichier}      Définit le nom de noeud "
--"DECnet (depuis le fichier)\n"
-+msgstr "       nodename [-v] {nom_noeud|-F fichier}      Définit le nom de noeud DECnet (depuis le fichier)\n"
- 
--#: ../hostname.c:228
-+#: ../hostname.c:227
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  affiche le nom formatté\n"
- 
--#: ../hostname.c:229
-+#: ../hostname.c:228
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
-@@ -342,7 +345,8 @@
- "       hostname [-v]                         affiche le nom d'hôte\n"
- "\n"
- 
--#: ../hostname.c:230
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
-@@ -350,7 +354,8 @@
- "       hostname -V|--version|-h|--help       affiche des infos et termine\n"
- "\n"
- 
--#: ../hostname.c:231
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
-@@ -358,45 +363,52 @@
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- 
--#: ../hostname.c:232
-+#: ../hostname.c:231
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr "    -s, --short           nom d'hôte court\n"
- 
--#: ../hostname.c:233
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr "    -a, --alias           noms d'alias\n"
- 
--#: ../hostname.c:234
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr "    -i, --ip-address      adresses de l'hôte\n"
- 
--#: ../hostname.c:235
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr "    -f, --fqdn, --long    nom d'hôte long (FQDN)\n"
- 
--#: ../hostname.c:236
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
- msgstr "    -d, --domain          nom de domaine DNS\n"
- 
--#: ../hostname.c:237
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
- msgstr "    -y, --yp, --nis       nom de domaine NIS/YP\n"
- 
--#: ../hostname.c:239
-+#: ../hostname.c:238
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
- msgstr "    -n, --node            nom de noeud DECnet\n"
- 
--#: ../hostname.c:241
--#, fuzzy
-+#: ../hostname.c:240
-+#, fuzzy, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
- msgstr ""
--"    -F, --file            lit le nom d'hôte ou le nom de domaine NIS depuis "
--"le fichier\n"
-+"    -F, --file            lit le nom d'hôte ou le nom de domaine NIS depuis le fichier\n"
- "\n"
- 
--#: ../hostname.c:243
-+#: ../hostname.c:242
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -411,15 +423,16 @@
- msgstr "%s: Vous ne pouvez changer le nom de domaine DNS avec cette commande\n"
- 
- #: ../hostname.c:339
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
- msgstr ""
- "\n"
--"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez "
--"changer le\n"
-+"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n"
- 
- #: ../hostname.c:340
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
- "nom de domaine DNS (qui fait partie du FQDN) dans le fichier /etc/hosts.\n"
-@@ -439,554 +452,453 @@
- msgid "getnodename()=`%s'\n"
- msgstr "getnodename()=`%s'\n"
- 
--#: ../ifconfig.c:159
--#, c-format
--msgid "%-9.9s Link encap:%s  "
--msgstr "%-9.9s Lien encap:%s  "
-+#: ../ifconfig.c:107
-+#, fuzzy, c-format
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr ""
-+"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Indic\n"
- 
--#: ../ifconfig.c:164
--#, c-format
--msgid "HWaddr %s  "
--msgstr "HWaddr %s  "
-+#: ../ifconfig.c:129 ../ifconfig.c:161
-+#, fuzzy, c-format
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
- 
--#: ../ifconfig.c:167
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
- #, c-format
--msgid "Media:%s"
--msgstr "Media:%s"
-+msgid "No support for INET on this system.\n"
-+msgstr "Pas de support de INET sur ce système.\n"
- 
--#: ../ifconfig.c:169
--msgid "(auto)"
--msgstr "(auto)"
-+#: ../ifconfig.c:193
-+#, fuzzy, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
- 
--#: ../ifconfig.c:176
--#, c-format
--msgid "          %s addr:%s "
--msgstr "          %s adr:%s "
-+#: ../ifconfig.c:202
-+#, fuzzy, c-format
-+msgid ""
-+"Usage:\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+msgstr ""
-+"Syntaxe:\n"
-+"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n"
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:204
- #, c-format
--msgid " P-t-P:%s "
--msgstr " P-t-P:%s "
-+msgid "  [add <address>[/<prefixlen>]]\n"
-+msgstr "  [add <adresse>[/<lg_prefixe>]]\n"
- 
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:205
- #, c-format
--msgid " Bcast:%s "
--msgstr " Bcast:%s "
-+msgid "  [del <address>[/<prefixlen>]]\n"
-+msgstr "  [del <adresse>[/<lg_prefixe>]]\n"
- 
--#: ../ifconfig.c:184
-+#: ../ifconfig.c:206
- #, c-format
--msgid " Mask:%s\n"
--msgstr " Masque:%s\n"
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<adresse>]]  [[-]pointopoint [<adresse>]]\n"
- 
--#: ../ifconfig.c:201
--#, c-format
--msgid "          inet6 addr: %s/%d"
--msgstr "          adr inet6: %s/%d"
-+#: ../ifconfig.c:207
-+#, fuzzy, c-format
-+msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+msgstr "  [netmask <adresse>]  [dstaddr <adresse>]  [tunnel <adresse>]\n"
- 
--#: ../ifconfig.c:203
--msgid " Scope:"
--msgstr " Scope:"
-+#: ../ifconfig.c:210
-+#, c-format
-+msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
--#: ../ifconfig.c:206
--msgid "Global"
--msgstr "Global"
-+#: ../ifconfig.c:212
-+#, c-format
-+msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+msgstr "  [hw <HW> <adresse>]  [metric <NN>]  [mtu <NN>]\n"
- 
--#: ../ifconfig.c:209
--msgid "Link"
--msgstr "Lien"
-+#: ../ifconfig.c:213
-+#, c-format
-+msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
--#: ../ifconfig.c:212
--msgid "Site"
--msgstr "Site"
-+#: ../ifconfig.c:214
-+#, c-format
-+msgid "  [multicast]  [[-]promisc]\n"
-+msgstr "  [multicast]  [[-]promisc]\n"
- 
- #: ../ifconfig.c:215
--msgid "Compat"
--msgstr "Compat"
-+#, c-format
-+msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
- 
--#: ../ifconfig.c:218
--msgid "Host"
--msgstr "Hôte"
-+#: ../ifconfig.c:217
-+#, fuzzy, c-format
-+msgid "  [txqueuelen <NN>]\n"
-+msgstr "  [txqueuelen longueur]\n"
- 
--#: ../ifconfig.c:221
--msgid "Unknown"
--msgstr "Inconnu"
-+#: ../ifconfig.c:220
-+#, c-format
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
- 
--#: ../ifconfig.c:236
-+#: ../ifconfig.c:222
- #, c-format
--msgid "          IPX/Ethernet II addr:%s\n"
--msgstr "          adr IPX/Ethernet II:%s\n"
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr ""
-+"  [up|down] ...\n"
-+"\n"
- 
--#: ../ifconfig.c:239
-+#: ../ifconfig.c:224
- #, c-format
--msgid "          IPX/Ethernet SNAP addr:%s\n"
--msgstr "          adr IPX/Ethernet SNAP:%s\n"
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "  <HW>=Type de matériel.\n"
- 
--#: ../ifconfig.c:242
-+#: ../ifconfig.c:225
- #, c-format
--msgid "          IPX/Ethernet 802.2 addr:%s\n"
--msgstr "          adr IPX/Ethernet 802.2:%s\n"
-+msgid "  List of possible hardware types:\n"
-+msgstr "  Liste des types de matériels possibles:\n"
- 
--#: ../ifconfig.c:245
-+#. 1 = ARPable
-+#: ../ifconfig.c:227
- #, c-format
--msgid "          IPX/Ethernet 802.3 addr:%s\n"
--msgstr "          adr IPX/Ethernet 802.3:%s\n"
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "  <AF>=famille d'Adresses. Défaut: %s\n"
- 
--#: ../ifconfig.c:255
-+#: ../ifconfig.c:228
- #, c-format
--msgid "          EtherTalk Phase 2 addr:%s\n"
--msgstr "          adr EtherTalk Phase 2:%s\n"
-+msgid "  List of possible address families:\n"
-+msgstr "  Liste des familles d'adresses possibles:\n"
- 
--#: ../ifconfig.c:264
-+#: ../ifconfig.c:303
- #, c-format
--msgid "          econet addr:%s\n"
--msgstr "          adr econet:%s\n"
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:270
--msgid "[NO FLAGS] "
--msgstr "[PAS INDICATEURS] "
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:272
--msgid "UP "
--msgstr "UP "
-+#: ../ifconfig.c:380
-+#, c-format
-+msgid "Unknown media type.\n"
-+msgstr "Type de média inconnu.\n"
- 
--#: ../ifconfig.c:274
--msgid "BROADCAST "
--msgstr "BROADCAST "
-+#: ../ifconfig.c:417
-+#, c-format
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
- 
--#: ../ifconfig.c:276
--msgid "DEBUG "
--msgstr "DEBUG "
-+#: ../ifconfig.c:429
-+#, c-format
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:278
--msgid "LOOPBACK "
--msgstr "LOOPBACK "
-+#: ../ifconfig.c:441
-+#, c-format
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:280
--msgid "POINTOPOINT "
--msgstr "POINTOPOINT "
-+#: ../ifconfig.c:465
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:282
--msgid "NOTRAILERS "
--msgstr "NOTRAILERS "
-+#: ../ifconfig.c:523
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:284
--msgid "RUNNING "
--msgstr "RUNNING "
-+#: ../ifconfig.c:652
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:286
--msgid "NOARP "
--msgstr "NOARP "
-+#: ../ifconfig.c:684
-+#, c-format
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:288
--msgid "PROMISC "
--msgstr "PROMISC "
-+#: ../ifconfig.c:693
-+#, c-format
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: adresse %s invalide.\n"
- 
--#: ../ifconfig.c:290
--msgid "ALLMULTI "
--msgstr "ALLMULTI "
--
--#: ../ifconfig.c:292
--msgid "SLAVE "
--msgstr "SLAVE "
--
--#: ../ifconfig.c:294
--msgid "MASTER "
--msgstr "MASTER "
--
--#: ../ifconfig.c:296
--msgid "MULTICAST "
--msgstr "MULTICAST "
--
--#: ../ifconfig.c:299
--msgid "DYNAMIC "
--msgstr "DYNAMIC "
--
--#: ../ifconfig.c:302
--#, c-format
--msgid " MTU:%d  Metric:%d"
--msgstr " MTU:%d  Metric:%d"
--
--#: ../ifconfig.c:306
--#, c-format
--msgid "  Outfill:%d  Keepalive:%d"
--msgstr "  Outfill:%d  Keepalive:%d"
--
--#: ../ifconfig.c:320
--#, c-format
--msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
--msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n"
--
--#: ../ifconfig.c:325
--#, c-format
--msgid "             compressed:%lu\n"
--msgstr "             compressés:%lu\n"
--
--#: ../ifconfig.c:329
--#, c-format
--msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
--msgstr ""
--"Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n"
--
--#: ../ifconfig.c:333
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
- #, c-format
--msgid "          collisions:%lu "
--msgstr "          collisions:%lu "
--
--#: ../ifconfig.c:335
--#, c-format
--msgid "compressed:%lu "
--msgstr "compressés:%lu "
--
--#: ../ifconfig.c:337
--#, c-format
--msgid "txqueuelen:%d "
--msgstr "lg file transmission:%d "
--
--#: ../ifconfig.c:345
--#, c-format
--msgid "Interrupt:%d "
--msgstr "Interruption:%d "
--
--#. Only print devices using it for
--#. I/O maps
--#: ../ifconfig.c:348
--#, c-format
--msgid "Base address:0x%x "
--msgstr "Adresse de base:0x%x "
--
--#: ../ifconfig.c:350
--#, c-format
--msgid "Memory:%lx-%lx "
--msgstr "Mémoire:%lx-%lx "
--
--#: ../ifconfig.c:353
--#, c-format
--msgid "DMA chan:%x "
--msgstr "Canal DMA:%x "
-+msgid "No support for INET6 on this system.\n"
-+msgstr "Pas de support de INET6 sur ce système.\n"
- 
--#: ../ifconfig.c:384 ../ifconfig.c:405
-+#: ../ifconfig.c:780 ../ifconfig.c:871
- #, c-format
--msgid "%s: unknown interface: %s\n"
--msgstr "%s: interface inconnue: %s\n"
--
--#: ../ifconfig.c:421
--msgid ""
--"Usage:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
--msgstr ""
--"Syntaxe:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n"
--
--#: ../ifconfig.c:425
--msgid "  [add <address>[/<prefixlen>]]\n"
--msgstr "  [add <adresse>[/<lg_prefixe>]]\n"
--
--#: ../ifconfig.c:427
--msgid "  [del <address>[/<prefixlen>]]\n"
--msgstr "  [del <adresse>[/<lg_prefixe>]]\n"
--
--#: ../ifconfig.c:432
--msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
--msgstr "  [[-]broadcast [<adresse>]]  [[-]pointopoint [<adresse>]]\n"
--
--#: ../ifconfig.c:433
--#, fuzzy
--msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
--msgstr "  [netmask <adresse>]  [dstaddr <adresse>]  [tunnel <adresse>]\n"
--
--#: ../ifconfig.c:436
--msgid "  [outfill <NN>] [keepalive <NN>]\n"
--msgstr "  [outfill <NN>] [keepalive <NN>]\n"
--
--#: ../ifconfig.c:438
--msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
--msgstr "  [hw <HW> <adresse>]  [metric <NN>]  [mtu <NN>]\n"
--
--#: ../ifconfig.c:439
--msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--
--#: ../ifconfig.c:440
--msgid "  [multicast]  [[-]promisc]\n"
--msgstr "  [multicast]  [[-]promisc]\n"
--
--#: ../ifconfig.c:441
--msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
--msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
--
--#: ../ifconfig.c:443
--#, fuzzy
--msgid "  [txqueuelen <NN>]\n"
--msgstr "  [txqueuelen longueur]\n"
--
--#: ../ifconfig.c:446
--msgid "  [[-]dynamic]\n"
--msgstr "  [[-]dynamic]\n"
--
--#: ../ifconfig.c:448
--msgid ""
--"  [up|down] ...\n"
--"\n"
-+msgid "Interface %s not initialized\n"
- msgstr ""
--"  [up|down] ...\n"
--"\n"
--
--#: ../ifconfig.c:450
--msgid "  <HW>=Hardware Type.\n"
--msgstr "  <HW>=Type de matériel.\n"
--
--#: ../ifconfig.c:451
--msgid "  List of possible hardware types:\n"
--msgstr "  Liste des types de matériels possibles:\n"
--
--#. 1 = ARPable
--#: ../ifconfig.c:453
--#, c-format
--msgid "  <AF>=Address family. Default: %s\n"
--msgstr "  <AF>=famille d'Adresses. Défaut: %s\n"
--
--#: ../ifconfig.c:454
--msgid "  List of possible address families:\n"
--msgstr "  Liste des familles d'adresses possibles:\n"
--
--#: ../ifconfig.c:593
--msgid "Unknown media type.\n"
--msgstr "Type de média inconnu.\n"
- 
--#: ../ifconfig.c:881
--#, c-format
--msgid "%s: invalid %s address.\n"
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, fuzzy, c-format
-+msgid "Bad address.\n"
- msgstr "%s: adresse %s invalide.\n"
- 
--#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
--msgid "No support for INET6 on this system.\n"
--msgstr "Pas de support de INET6 sur ce système.\n"
--
--#: ../ifconfig.c:983
-+#: ../ifconfig.c:885
-+#, c-format
- msgid "Address deletion not supported on this system.\n"
- msgstr "Suppression d'adresses pas supporté par ce système.\n"
- 
--#: ../ifconfig.c:1066
--msgid "No support for INET on this system.\n"
--msgstr "Pas de support de INET sur ce système.\n"
-+#: ../ifconfig.c:957
-+#, fuzzy, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n"
- 
--#: ../ifconfig.c:1076
-+#: ../ifconfig.c:983
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr "Pas de support de ECONET sur ce système.\n"
- 
--#: ../ifconfig.c:1084
-+#: ../ifconfig.c:991
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n"
- 
--#: ../netstat.c:383
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
--msgstr ""
--"(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez être root.)\n"
-+msgstr "(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez être root.)\n"
- 
--#: ../netstat.c:387
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
- msgstr ""
- "(Tous les processus ne peuvent être identifiés, les infos sur les processus\n"
--"non possédés ne seront pas affichées, vous devez être root pour les voir "
--"toutes.)\n"
-+"non possédés ne seront pas affichées, vous devez être root pour les voir toutes.)\n"
- 
--#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr "LISTENING"
- 
--#: ../netstat.c:395
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr "CONN SENT"
- 
--#: ../netstat.c:396 ../netstat.c:1168
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr "DISC SENT"
- 
--#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr "ESTABLISHED"
- 
--#: ../netstat.c:419
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr "sockets NET/ROM actives\n"
- 
--#: ../netstat.c:420
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
- msgstr ""
--"Utilisatr  Dest       Source     Periph  Etat         Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"Utilisatr  Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-"
-+"Q\n"
- 
--#: ../netstat.c:430 ../netstat.c:1208
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr ""
- 
--#: ../netstat.c:465
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr "SYN_SENT"
- 
--#: ../netstat.c:466
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr "SYN_RECV"
- 
--#: ../netstat.c:467
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr "FIN_WAIT1"
- 
--#: ../netstat.c:468
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr "FIN_WAIT2"
- 
--#: ../netstat.c:469
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr "TIME_WAIT"
- 
--#: ../netstat.c:470
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr "CLOSE"
- 
--#: ../netstat.c:471
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr "CLOSE_WAIT"
- 
--#: ../netstat.c:472
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr "LAST_ACK"
- 
--#: ../netstat.c:473
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr "LISTEN"
- 
--#: ../netstat.c:474
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr "CLOSING"
- 
--#: ../netstat.c:544
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr "attention, ligne igmp6 en erreur %d.\n"
- 
--#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
--#: ../netstat.c:935 ../netstat.c:940
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr "netstat: famille d'adresses pas supportée %d !\n"
- 
--#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr "attention, ligne igmp6 en erreur %d.\n"
- 
--#: ../netstat.c:666
-+#: ../netstat.c:677
-+#, fuzzy, c-format
-+msgid "Active X.25 sockets\n"
-+msgstr "Sockets AX.25 actives\n"
-+
-+#. IMHO, Vr/Vs is not very usefull --SF
-+#: ../netstat.c:679
-+#, fuzzy, c-format
-+msgid ""
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
-+msgstr "Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-Q\n"
-+
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr "attention, ligne tcp en erreur.\n"
- 
--#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr "off (0.00/%ld/%d)"
- 
--#: ../netstat.c:708
-+#: ../netstat.c:804
- #, fuzzy, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr "on%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:713
-+#: ../netstat.c:809
- #, fuzzy, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr "on%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:718
-+#: ../netstat.c:814
- #, fuzzy, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr "on%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr "unkn-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:799
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr "attention, ligne udp en erreur.\n"
- 
--#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr "INCONNU"
- 
--#: ../netstat.c:860 ../netstat.c:980
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr "on%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:949
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr "attention, ligne raw en erreur.\n"
- 
--#: ../netstat.c:1028
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr "attention, ligne unix en erreur.\n"
- 
--#: ../netstat.c:1055
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr "STREAM"
- 
--#: ../netstat.c:1059
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr "DGRAM"
- 
--#: ../netstat.c:1063
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr "RAW"
- 
--#: ../netstat.c:1067
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr "RDM"
- 
--#: ../netstat.c:1071
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
- msgstr "SEQPACKET"
- 
--#: ../netstat.c:1080
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr "LIBRE"
- 
--#: ../netstat.c:1096
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr "ENCONNEXION"
- 
--#: ../netstat.c:1100
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr "CONNECTE"
- 
--#: ../netstat.c:1104
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr "ENDECONNEXION"
- 
--#: ../netstat.c:1135
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
- msgstr "Sockets du domaine UNIX actives"
- 
--#: ../netstat.c:1137 ../netstat.c:1666
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr "(serveurs et établies)"
- 
--#: ../netstat.c:1140 ../netstat.c:1669
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr "(seulement serveurs)"
- 
--#: ../netstat.c:1142 ../netstat.c:1671
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr "(sans serveurs)"
- 
--#: ../netstat.c:1145
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
-@@ -994,32 +906,36 @@
- "\n"
- "Proto RefCpt Indicatrs   Type       Etat          I-Node"
- 
--#: ../netstat.c:1147
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr " Chemin\n"
- 
--#: ../netstat.c:1167
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr "SABM SENT"
- 
--#: ../netstat.c:1170
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr "RECOVERY"
- 
--#: ../netstat.c:1184
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr "Sockets AX.25 actives\n"
- 
--#: ../netstat.c:1185
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr "Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-Q\n"
- 
--#: ../netstat.c:1228
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr ""
- 
--#: ../netstat.c:1279
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-@@ -1029,55 +945,53 @@
- "Proto Recv-Q Send-Q Adresse locale             Adresse distante           "
- "Etat"
- 
--#: ../netstat.c:1281
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr "Utilisatr"
- 
--#: ../netstat.c:1315
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr "ESTAB"
- 
--#: ../netstat.c:1323
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr "UNK."
- 
--#: ../netstat.c:1367
--msgid "     - no statistics available -"
--msgstr ""
--
--#: ../netstat.c:1370
--msgid "[NO FLAGS]"
--msgstr "[PAS INDICATEURS]"
--
--#: ../netstat.c:1400
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
- msgstr "Table d'interfaces noyau\n"
- 
--#: ../netstat.c:1401
-+#: ../netstat.c:1465
-+#, fuzzy, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
- "Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Indic\n"
- 
--#: ../netstat.c:1404
-+#: ../netstat.c:1469
- msgid "missing interface information"
- msgstr "informations d'interface manquantes"
- 
--#: ../netstat.c:1425
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
--"syntaxe: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"syntaxe: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- 
--#: ../netstat.c:1426
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr "       netstat [-vnNcaeol] [<Socket> ...]\n"
- 
--#: ../netstat.c:1427
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
-@@ -1085,27 +999,30 @@
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- 
--#: ../netstat.c:1429
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr "        -r, --route              affiche la table de routage\n"
- 
--#: ../netstat.c:1430
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr "        -i, --interfaces         affiche la table d'interfaces\n"
- 
--#: ../netstat.c:1431
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr ""
- "        -g, --groups             affiche les membres d'un groupe multicast\n"
- 
--#: ../netstat.c:1432
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
--msgstr ""
--"        -s, --statistics         affiche les statistiques réseau (comme "
--"SNMP)\n"
-+msgstr "        -s, --statistics         affiche les statistiques réseau (comme SNMP)\n"
- 
--#: ../netstat.c:1434
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
-@@ -1113,23 +1030,41 @@
- "        -M, --masquerade         affiche les connexions masquées\n"
- "\n"
- 
--#: ../netstat.c:1438 ../route.c:87
-+#: ../netstat.c:1505
-+#, fuzzy, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
-+msgstr "        -n, --numeric            ne résout pas les noms\n"
-+
-+#: ../netstat.c:1506
-+#, fuzzy, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
-+msgstr "        -n, --numeric            ne résout pas les noms\n"
-+
-+#: ../netstat.c:1507
-+#, fuzzy, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
-+msgstr "        -n, --numeric            ne résout pas les noms\n"
-+
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr "        -N, --symbolic           résoud les noms matériels\n"
- 
--#: ../netstat.c:1439 ../route.c:88
--#, fuzzy
-+#: ../netstat.c:1509 ../route.c:88
-+#, fuzzy, c-format
- msgid "        -e, --extend             display other/more information\n"
- msgstr ""
- "        -e, --extend             affiche d'autres/plus d'informations\n"
- 
--#: ../netstat.c:1440
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr ""
- "        -p, --programs           affiche le nom du programme/PID des "
- "sockets\n"
- 
--#: ../netstat.c:1441
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
-@@ -1137,32 +1072,31 @@
- "        -c, --continuous         listing continu\n"
- "\n"
- 
--#: ../netstat.c:1442
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
--msgstr ""
--"        -l, --listening          affiche les sockets du serveur à l'écoute\n"
-+msgstr "        -l, --listening          affiche les sockets du serveur à l'écoute\n"
- 
--#: ../netstat.c:1443
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
--msgstr ""
--"        -a, --all, --listening   affiche toutes les prises (défaut: "
--"connectés)\n"
-+msgstr "        -a, --all, --listening   affiche toutes les prises (défaut: connectés)\n"
- 
--#: ../netstat.c:1444
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr "        -o, --timers             affiche les timers\n"
- 
--#: ../netstat.c:1445 ../route.c:89
--#, fuzzy
-+#: ../netstat.c:1515 ../route.c:89
-+#, fuzzy, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
--msgstr ""
--"        -F, --fib                affiche la Forwarding Infomation Base "
--"(défaut)\n"
-+msgstr "        -F, --fib                affiche la Forwarding Infomation Base (défaut)\n"
- 
--#: ../netstat.c:1446 ../route.c:90
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
-@@ -1170,110 +1104,118 @@
- "        -C, --cache              affiche le cache de routage au lieu de FIB\n"
- "\n"
- 
--#: ../netstat.c:1448
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- 
--#: ../netstat.c:1449 ../route.c:92
--#, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-+#: ../netstat.c:1519
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr "  <AF>=Utiliser '-A <af>' ou '--<af>' Défaut: %s\n"
- 
--#: ../netstat.c:1450 ../route.c:93
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
- msgstr "  Liste les familles d'adresses possibles (supportant le routage):\n"
- 
--#: ../netstat.c:1663
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr "Connexions Internet actives "
- 
--#: ../netstat.c:1673
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- "\n"
--"Proto Recv-Q Send-Q Adresse locale          Adresse distante        Etat     "
--"  "
-+"Proto Recv-Q Send-Q Adresse locale          Adresse distante        "
-+"Etat       "
- 
--#: ../netstat.c:1675
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr " Utilisatr  Inode     "
- 
--#: ../netstat.c:1678
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr " Timer"
- 
--#: ../netstat.c:1708
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
- msgstr ""
- 
--#: ../netstat.c:1709
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr ""
- 
--#: ../rarp.c:43
-+#: ../rarp.c:44
- msgid "This kernel does not support RARP.\n"
- msgstr "Ce noyau ne supporte pas RARP.\n"
- 
--#: ../rarp.c:82
-+#: ../rarp.c:83
- #, c-format
- msgid "no RARP entry for %s.\n"
- msgstr "pas d'entrée RARP pour %s.\n"
- 
--#: ../rarp.c:95
-+#: ../rarp.c:96
- #, c-format
- msgid "%s: bad hardware address\n"
- msgstr "%s: mauvaise adresse matériel\n"
- 
--#: ../rarp.c:127
-+#: ../rarp.c:128
- #, c-format
- msgid "rarp: cannot open file %s:%s.\n"
- msgstr "rarp: ne peut ouvrir le fichier %s:%s.\n"
- 
--#: ../rarp.c:139
-+#: ../rarp.c:140
- #, c-format
- msgid "rarp: format error at %s:%u\n"
- msgstr "rarp: erreur de format à %s:%u\n"
- 
--#: ../rarp.c:143 ../rarp.c:287
-+#: ../rarp.c:144 ../rarp.c:289
- #, c-format
- msgid "rarp: %s: unknown host\n"
- msgstr "rarp: %s: hôte inconnu\n"
- 
--#: ../rarp.c:146
-+#: ../rarp.c:147
- #, c-format
- msgid "rarp: cannot set entry from %s:%u\n"
- msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n"
- 
--#: ../rarp.c:175
-+#: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
--msgstr ""
--"Usage: rarp -a                               liste les entrées en cache.\n"
-+msgstr "Usage: rarp -a                               liste les entrées en cache.\n"
- 
--#: ../rarp.c:176
-+#: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
--msgstr ""
--"       rarp -d <hostname>                    supprime l'entrée du cache.\n"
-+msgstr "       rarp -d <hostname>                    supprime l'entrée du cache.\n"
- 
--#: ../rarp.c:177
-+#: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
--msgstr ""
--"       rarp [<HW>] -s <hostname> <adrmat>    ajoute l'entrée au cache.\n"
-+msgstr "       rarp [<HW>] -s <hostname> <adrmat>    ajoute l'entrée au cache.\n"
- 
--#: ../rarp.c:178
-+#: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
--msgstr ""
--"       rarp -f                               ajoute les entrées depuis "
--"/etc/ethers.\n"
-+msgstr "       rarp -f                               ajoute les entrées depuis /etc/ethers.\n"
- 
--#: ../rarp.c:179
-+#: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
-@@ -1281,24 +1223,26 @@
- "       rarp -V                               affiche la version.\n"
- "\n"
- 
--#: ../rarp.c:236
-+#: ../rarp.c:238
- #, c-format
- msgid "%s: illegal option mix.\n"
- msgstr "%s: combinaison d'options illégales.\n"
- 
--#: ../rarp.c:267
-+#: ../rarp.c:269
- #, c-format
- msgid "rarp: %s: unknown hardware type.\n"
- msgstr "rarp: %s: type de matériel inconnu.\n"
- 
--#: ../route.c:79
-+#: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
- "Syntaxe: route [-nNvee] [-FC] [<AF>]           Liste les tables de routage "
- "noyau\n"
- 
--#: ../route.c:80
-+#: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
-@@ -1307,15 +1251,15 @@
- "pour AF.\n"
- "\n"
- 
--#: ../route.c:82
-+#: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
--msgstr ""
--"       route {-h|--help} [<AF>]              Utilisation détaillée pour l'AF "
--"spécifié.\n"
-+msgstr "       route {-h|--help} [<AF>]              Utilisation détaillée pour l'AF spécifié.\n"
- 
--#: ../route.c:83
-+#: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
-@@ -1325,16 +1269,23 @@
- "termine.\n"
- "\n"
- 
-+#: ../route.c:92
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>=Utiliser '-A <af>' ou '--<af>' Défaut: %s\n"
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr "Syntaxe: plipconfig [-a] [-i] [-v] interface\n"
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr "                  [nibble NN] [trigger NN]\n"
- 
- #: ../plipconfig.c:68
--#, fuzzy
-+#, fuzzy, c-format
- msgid "       plipconfig -V | --version\n"
- msgstr "       plipconfig -V\n"
- 
-@@ -1343,474 +1294,763 @@
- msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr "%s\tnibble %lu  trigger %lu\n"
- 
--#: ../iptunnel.c:79
-+#: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr ""
- 
--#: ../iptunnel.c:80
-+#: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr ""
- 
--#: ../iptunnel.c:81
-+#: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr ""
- 
--#: ../iptunnel.c:82
-+#: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
- msgstr ""
- 
--#: ../iptunnel.c:83
-+#: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
- msgstr ""
- 
--#: ../iptunnel.c:84
-+#: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr ""
- 
--#: ../iptunnel.c:85
-+#: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr ""
- 
--#: ../iptunnel.c:86
-+#: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr ""
- 
--#: ../iptunnel.c:87
-+#: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr ""
- 
--#: ../iptunnel.c:88
-+#: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr ""
- 
--#: ../iptunnel.c:326
-+#: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr ""
- 
--#: ../iptunnel.c:346
-+#: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr ""
- 
--#: ../iptunnel.c:361
-+#: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr ""
- 
--#: ../iptunnel.c:373
-+#: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr ""
- 
--#: ../iptunnel.c:411
-+#: ../iptunnel.c:417
- #, c-format
- msgid "%s: %s/ip  remote %s  local %s "
- msgstr ""
- 
--#: ../iptunnel.c:415
-+#: ../iptunnel.c:421
- #, fuzzy
- msgid "unknown"
- msgstr "Inconnu"
- 
--#: ../iptunnel.c:447
-+#: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr ""
- 
--#: ../iptunnel.c:449
-+#: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr ""
- 
--#: ../iptunnel.c:451
-+#: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr ""
- 
--#: ../iptunnel.c:453
-+#: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr ""
- 
--#: ../iptunnel.c:481
-+#: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
- msgstr ""
- 
--#: ../iptunnel.c:494
-+#: ../iptunnel.c:500
- #, c-format
- msgid "Failed to get type of [%s]\n"
- msgstr ""
- 
--#: ../iptunnel.c:510
-+#: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr ""
- 
--#: ../iptunnel.c:513
-+#: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr ""
- 
--#: ../statistics.c:45
-+#: ../statistics.c:47
- msgid "ICMP input histogram:"
- msgstr "Histogramme d'entrée ICMP"
- 
--#: ../statistics.c:46
-+#: ../statistics.c:48
- msgid "ICMP output histogram:"
- msgstr "Histogramme de sortie ICMP"
- 
--#: ../statistics.c:63
-+#: ../statistics.c:65
- #, c-format
- msgid "Forwarding is %s"
- msgstr "Réacheminement est %s"
- 
--#: ../statistics.c:64
--#, c-format
--msgid "Default TTL is %d"
-+#: ../statistics.c:66
-+#, fuzzy, c-format
-+msgid "Default TTL is %u"
- msgstr "TTL par défaut est %d"
- 
--#: ../statistics.c:65
--#, c-format
--msgid "%d total packets received"
-+#: ../statistics.c:67
-+#, fuzzy, c-format
-+msgid "%u total packets received"
- msgstr "%d paquets totaux reçus"
- 
--#: ../statistics.c:66
--#, c-format
--msgid "%d with invalid headers"
-+#: ../statistics.c:68
-+#, fuzzy, c-format
-+msgid "%u with invalid headers"
- msgstr "%d avec en-tête invalides"
- 
--#: ../statistics.c:67
--#, c-format
--msgid "%d with invalid addresses"
-+#: ../statistics.c:69
-+#, fuzzy, c-format
-+msgid "%u with invalid addresses"
- msgstr "%d avec adresses invalides"
- 
--#: ../statistics.c:68
--#, c-format
--msgid "%d forwarded"
-+#: ../statistics.c:70
-+#, fuzzy, c-format
-+msgid "%u forwarded"
- msgstr "%d réacheminées"
- 
--#: ../statistics.c:69
--#, c-format
--msgid "%d with unknown protocol"
-+#: ../statistics.c:71
-+#, fuzzy, c-format
-+msgid "%u with unknown protocol"
- msgstr "%d avec protocole inconnu"
- 
--#: ../statistics.c:70
--#, c-format
--msgid "%d incoming packets discarded"
-+#: ../statistics.c:72
-+#, fuzzy, c-format
-+msgid "%u incoming packets discarded"
- msgstr "%d paquets entrant jetés"
- 
--#: ../statistics.c:71
--#, c-format
--msgid "%d incoming packets delivered"
-+#: ../statistics.c:73
-+#, fuzzy, c-format
-+msgid "%u incoming packets delivered"
- msgstr "%d paquets entrant délivrés"
- 
--#: ../statistics.c:72
--#, c-format
--msgid "%d requests sent out"
-+#: ../statistics.c:74
-+#, fuzzy, c-format
-+msgid "%u requests sent out"
- msgstr "%d requêtes envoyées"
- 
- #. ?
--#: ../statistics.c:73
--#, c-format
--msgid "%d outgoing packets dropped"
-+#: ../statistics.c:75
-+#, fuzzy, c-format
-+msgid "%u outgoing packets dropped"
- msgstr "%d paquets sortant jetés"
- 
--#: ../statistics.c:74
--#, c-format
--msgid "%d dropped because of missing route"
-+#: ../statistics.c:76
-+#, fuzzy, c-format
-+msgid "%u dropped because of missing route"
- msgstr "%d jetés pour cause de route manquante"
- 
--#: ../statistics.c:75
--#, c-format
--msgid "%d fragments dropped after timeout"
-+#: ../statistics.c:77
-+#, fuzzy, c-format
-+msgid "%u fragments dropped after timeout"
- msgstr "%d fragments jetés après timeout"
- 
--#: ../statistics.c:76
--#, c-format
--msgid "%d reassemblies required"
-+#: ../statistics.c:78
-+#, fuzzy, c-format
-+msgid "%u reassemblies required"
- msgstr "%d nécessitant un réassemblage"
- 
- #. ?
--#: ../statistics.c:77
--#, c-format
--msgid "%d packets reassembled ok"
-+#: ../statistics.c:79
-+#, fuzzy, c-format
-+msgid "%u packets reassembled ok"
- msgstr "%d paquets réassemblés correctement"
- 
--#: ../statistics.c:78
--#, c-format
--msgid "%d packet reassembles failed"
-+#: ../statistics.c:80
-+#, fuzzy, c-format
-+msgid "%u packet reassembles failed"
- msgstr "%d paquets mal réassemblés"
- 
--#: ../statistics.c:79
--#, c-format
--msgid "%d fragments received ok"
-+#: ../statistics.c:81
-+#, fuzzy, c-format
-+msgid "%u fragments received ok"
- msgstr "%d fragments reçus correctement"
- 
--#: ../statistics.c:80
--#, c-format
--msgid "%d fragments failed"
-+#: ../statistics.c:82
-+#, fuzzy, c-format
-+msgid "%u fragments failed"
- msgstr "%d fragments en échec"
- 
--#: ../statistics.c:81
--#, c-format
--msgid "%d fragments created"
-+#: ../statistics.c:83
-+#, fuzzy, c-format
-+msgid "%u fragments created"
- msgstr "%d fragments créés"
- 
--#: ../statistics.c:86
--#, c-format
--msgid "%d ICMP messages received"
-+#: ../statistics.c:88
-+#, fuzzy, c-format
-+msgid "%u ICMP messages received"
- msgstr "%d messages ICMP reçus"
- 
--#: ../statistics.c:87
--#, c-format
--msgid "%d input ICMP message failed."
-+#: ../statistics.c:89
-+#, fuzzy, c-format
-+msgid "%u input ICMP message failed."
- msgstr "%d messages d'entrée ICMP en échec"
- 
--#: ../statistics.c:88 ../statistics.c:101
--#, c-format
--msgid "destination unreachable: %d"
-+#: ../statistics.c:90 ../statistics.c:103
-+#, fuzzy, c-format
-+msgid "destination unreachable: %u"
- msgstr "destination injoignable: %d"
- 
--#: ../statistics.c:89
--#, c-format
--msgid "timeout in transit: %d"
-+#: ../statistics.c:91
-+#, fuzzy, c-format
-+msgid "timeout in transit: %u"
- msgstr "timeout en transmission: %d"
- 
--#: ../statistics.c:90 ../statistics.c:103
--#, c-format
--msgid "wrong parameters: %d"
-+#: ../statistics.c:92 ../statistics.c:105
-+#, fuzzy, c-format
-+msgid "wrong parameters: %u"
- msgstr "mauvais paramètre: %d"
- 
- #. ?
--#: ../statistics.c:91
--#, c-format
--msgid "source quenchs: %d"
-+#: ../statistics.c:93
-+#, fuzzy, c-format
-+msgid "source quenches: %u"
- msgstr "Source Quenchs: %d"
- 
--#: ../statistics.c:92
--#, c-format
--msgid "redirects: %d"
-+#: ../statistics.c:94
-+#, fuzzy, c-format
-+msgid "redirects: %u"
- msgstr "Redirections: %d"
- 
--#: ../statistics.c:93
--#, c-format
--msgid "echo requests: %d"
-+#: ../statistics.c:95
-+#, fuzzy, c-format
-+msgid "echo requests: %u"
- msgstr "requêtes echo: %d"
- 
--#: ../statistics.c:94 ../statistics.c:107
--#, c-format
--msgid "echo replies: %d"
-+#: ../statistics.c:96 ../statistics.c:109
-+#, fuzzy, c-format
-+msgid "echo replies: %u"
- msgstr "réponses echo: %d"
- 
--#: ../statistics.c:95
--#, c-format
--msgid "timestamp request: %d"
-+#: ../statistics.c:97
-+#, fuzzy, c-format
-+msgid "timestamp request: %u"
- msgstr "requêtes datées: %d"
- 
--#: ../statistics.c:96
--#, c-format
--msgid "timestamp reply: %d"
-+#: ../statistics.c:98
-+#, fuzzy, c-format
-+msgid "timestamp reply: %u"
- msgstr "réponses datées: %d"
- 
--#: ../statistics.c:97
--#, c-format
--msgid "address mask request: %d"
-+#: ../statistics.c:99
-+#, fuzzy, c-format
-+msgid "address mask request: %u"
- msgstr "requêtes de masque d'adresse: %d"
- 
- #. ?
--#: ../statistics.c:98
--msgid "address mask replies"
--msgstr "réponses de masque d'adresses"
-+#: ../statistics.c:100 ../statistics.c:113
-+#, fuzzy, c-format
-+msgid "address mask replies: %u"
-+msgstr "réponses de masque d'adresse: %d"
- 
- #. ?
--#: ../statistics.c:99
--#, c-format
--msgid "%d ICMP messages sent"
-+#: ../statistics.c:101
-+#, fuzzy, c-format
-+msgid "%u ICMP messages sent"
- msgstr "%d messages ICMP envoyés"
- 
--#: ../statistics.c:100
--#, c-format
--msgid "%d ICMP messages failed"
-+#: ../statistics.c:102
-+#, fuzzy, c-format
-+msgid "%u ICMP messages failed"
- msgstr "%d messages ICMP en échec"
- 
--#: ../statistics.c:102
--#, c-format
--msgid "time exceeded: %d"
-+#: ../statistics.c:104
-+#, fuzzy, c-format
-+msgid "time exceeded: %u"
- msgstr "temps dépassé: %d"
- 
- #. ?
--#: ../statistics.c:104
--#, c-format
--msgid "source quench: %d"
-+#: ../statistics.c:106
-+#, fuzzy, c-format
-+msgid "source quench: %u"
- msgstr "Source Quench: %d"
- 
--#: ../statistics.c:105
--#, c-format
--msgid "redirect: %d"
-+#: ../statistics.c:107
-+#, fuzzy, c-format
-+msgid "redirect: %u"
- msgstr "redirection: %d"
- 
--#: ../statistics.c:106
--#, c-format
--msgid "echo request: %d"
-+#: ../statistics.c:108
-+#, fuzzy, c-format
-+msgid "echo request: %u"
- msgstr "requête echo: %d"
- 
--#: ../statistics.c:108
--#, c-format
--msgid "timestamp requests: %d"
-+#: ../statistics.c:110
-+#, fuzzy, c-format
-+msgid "timestamp requests: %u"
- msgstr "requêtes datées: %d"
- 
--#: ../statistics.c:109
--#, c-format
--msgid "timestamp replies: %d"
-+#: ../statistics.c:111
-+#, fuzzy, c-format
-+msgid "timestamp replies: %u"
- msgstr "réponses datées: %d"
- 
--#: ../statistics.c:110
--#, c-format
--msgid "address mask requests: %d"
-+#: ../statistics.c:112
-+#, fuzzy, c-format
-+msgid "address mask requests: %u"
- msgstr "requêtes de masque d'adresse: %d"
- 
--#: ../statistics.c:111
--#, c-format
--msgid "address mask replies: %d"
--msgstr "réponses de masque d'adresse: %d"
--
--#: ../statistics.c:116
-+#: ../statistics.c:118
- #, c-format
- msgid "RTO algorithm is %s"
- msgstr "algorithme RTO est %s"
- 
--#: ../statistics.c:120
--#, c-format
--msgid "%d active connections openings"
-+#: ../statistics.c:122
-+#, fuzzy, c-format
-+msgid "%u active connections openings"
- msgstr "%d ouvertures de connexions actives"
- 
--#: ../statistics.c:121
--#, c-format
--msgid "%d passive connection openings"
-+#: ../statistics.c:123
-+#, fuzzy, c-format
-+msgid "%u passive connection openings"
- msgstr "%d ouvertures de connexions passives"
- 
--#: ../statistics.c:122
--#, c-format
--msgid "%d failed connection attempts"
-+#: ../statistics.c:124
-+#, fuzzy, c-format
-+msgid "%u failed connection attempts"
- msgstr "%d tentatives de connexion échouées"
- 
--#: ../statistics.c:123
--#, c-format
--msgid "%d connection resets received"
-+#: ../statistics.c:125
-+#, fuzzy, c-format
-+msgid "%u connection resets received"
- msgstr "%d réinitialisations de connexions reçues"
- 
--#: ../statistics.c:124
--#, c-format
--msgid "%d connections established"
-+#: ../statistics.c:126
-+#, fuzzy, c-format
-+msgid "%u connections established"
- msgstr "%d connexions établies"
- 
--#: ../statistics.c:125
--#, c-format
--msgid "%d segments received"
-+#: ../statistics.c:127
-+#, fuzzy, c-format
-+msgid "%u segments received"
- msgstr "%d segments reçus"
- 
--#: ../statistics.c:126
--#, c-format
--msgid "%d segments send out"
-+#: ../statistics.c:128
-+#, fuzzy, c-format
-+msgid "%u segments send out"
- msgstr "%d segments envoyés"
- 
--#: ../statistics.c:127
--#, c-format
--msgid "%d segments retransmited"
-+#: ../statistics.c:129
-+#, fuzzy, c-format
-+msgid "%u segments retransmited"
- msgstr "%d segments retransmis"
- 
--#: ../statistics.c:128
--#, c-format
--msgid "%d bad segments received."
-+#: ../statistics.c:130
-+#, fuzzy, c-format
-+msgid "%u bad segments received."
- msgstr "%d mauvais segments reçus."
- 
--#: ../statistics.c:129
--#, c-format
--msgid "%d resets sent"
-+#: ../statistics.c:131
-+#, fuzzy, c-format
-+msgid "%u resets sent"
- msgstr "%d réinitialisations envoyées"
- 
--#: ../statistics.c:134
--#, c-format
--msgid "%d packets received"
-+#: ../statistics.c:136
-+#, fuzzy, c-format
-+msgid "%u packets received"
- msgstr "%d paquets reçus"
- 
--#: ../statistics.c:135
--#, c-format
--msgid "%d packets to unknown port received."
-+#: ../statistics.c:137
-+#, fuzzy, c-format
-+msgid "%u packets to unknown port received."
- msgstr "%d paquets reçus pour un port inconnu"
- 
--#: ../statistics.c:136
--#, c-format
--msgid "%d packet receive errors"
-+#: ../statistics.c:138
-+#, fuzzy, c-format
-+msgid "%u packet receive errors"
- msgstr "%d erreurs en réception de paquets"
- 
--#: ../statistics.c:137
-+#: ../statistics.c:139
-+#, fuzzy, c-format
-+msgid "%u packets sent"
-+msgstr "%d paquets envoyés"
-+
-+#: ../statistics.c:144
-+#, fuzzy, c-format
-+msgid "%u SYN cookies sent"
-+msgstr "%d SYN-Cookies reçus"
-+
-+#: ../statistics.c:145
-+#, fuzzy, c-format
-+msgid "%u SYN cookies received"
-+msgstr "%d SYN-Cookies reçus"
-+
-+#: ../statistics.c:146
-+#, fuzzy, c-format
-+msgid "%u invalid SYN cookies received"
-+msgstr "%d SYN-Cookies reçus incorrects"
-+
-+#: ../statistics.c:148
-+#, fuzzy, c-format
-+msgid "%u resets received for embryonic SYN_RECV sockets"
-+msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires"
-+
-+#: ../statistics.c:150
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue because of socket buffer overrun"
-+msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein"
-+
-+#. obsolete: 2.2.0 doesn't do that anymore
-+#: ../statistics.c:153
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue"
-+msgstr "%d paquets supprimés de la file hors service"
-+
-+#: ../statistics.c:154
-+#, fuzzy, c-format
-+msgid ""
-+"%u packets dropped from out-of-order queue because of socket buffer overrun"
-+msgstr "%d paquets jetés de la file hors service en raison de tampon de sockets plein"
-+
-+#: ../statistics.c:156
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because they were out-of-window"
-+msgstr "%d ICMP paquets jetés car hors de la fenêtre"
-+
-+#: ../statistics.c:158
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because socket was locked"
-+msgstr "%d paquets ICMP jetés car la socket a été vérouillée"
-+
-+#: ../statistics.c:160
- #, c-format
--msgid "%d packets sent"
-+msgid "%u TCP sockets finished time wait in fast timer"
-+msgstr ""
-+
-+#: ../statistics.c:161
-+#, c-format
-+msgid "%u time wait sockets recycled by time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:162
-+#, c-format
-+msgid "%u TCP sockets finished time wait in slow timer"
-+msgstr ""
-+
-+#: ../statistics.c:163
-+#, c-format
-+msgid "%u passive connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:165
-+#, c-format
-+msgid "%u active connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:167
-+#, c-format
-+msgid "%u packets rejects in established connections because of timestamp"
-+msgstr ""
-+
-+#: ../statistics.c:169
-+#, fuzzy, c-format
-+msgid "%u delayed acks sent"
- msgstr "%d paquets envoyés"
- 
--#: ../statistics.c:142
-+#: ../statistics.c:170
- #, c-format
--msgid "%d SYN cookies sent"
-+msgid "%u delayed acks further delayed because of locked socket"
- msgstr ""
- 
--#: ../statistics.c:143
-+#: ../statistics.c:172
- #, c-format
--msgid "%d SYN cookies received"
--msgstr "%d SYN-Cookies reçus"
-+msgid "Quick ack mode was activated %u times"
-+msgstr ""
- 
--#: ../statistics.c:144
-+#: ../statistics.c:173
- #, c-format
--msgid "%d invalid SYN cookies received"
--msgstr "%d SYN-Cookies reçus incorrects"
-+msgid "%u times the listen queue of a socket overflowed"
-+msgstr ""
- 
--#: ../statistics.c:146
-+#: ../statistics.c:175
- #, c-format
--msgid "%d resets received for embryonic SYN_RECV sockets"
--msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires"
-+msgid "%u SYNs to LISTEN sockets ignored"
-+msgstr ""
- 
--#: ../statistics.c:148
-+#: ../statistics.c:176
- #, c-format
--msgid "%d packets pruned from receive queue because of socket buffer overrun"
-+msgid "%u packets directly queued to recvmsg prequeue."
- msgstr ""
--"%d paquets supprimés de la file de réception en raison de tampon de sockets "
--"plein"
- 
--#. obsolete: 2.2.0 doesn't do that anymore
--#: ../statistics.c:151
-+#: ../statistics.c:178
-+#, c-format
-+msgid "%u of bytes directly received from backlog"
-+msgstr ""
-+
-+#: ../statistics.c:180
- #, c-format
--msgid "%d packets pruned from out-of-order queue"
-+msgid "%u of bytes directly received from prequeue"
-+msgstr ""
-+
-+#: ../statistics.c:182
-+#, fuzzy, c-format
-+msgid "%u packets dropped from prequeue"
- msgstr "%d paquets supprimés de la file hors service"
- 
--#: ../statistics.c:152
-+#: ../statistics.c:183
-+#, fuzzy, c-format
-+msgid "%u packet headers predicted"
-+msgstr "%d paquets reçus"
-+
-+#: ../statistics.c:184
- #, c-format
--msgid ""
--"%d packets dropped from out-of-order queue because of socket buffer overrun"
-+msgid "%u packets header predicted and directly queued to user"
- msgstr ""
--"%d paquets jetés de la file hors service en raison de tampon de sockets plein"
- 
--#: ../statistics.c:154
-+#: ../statistics.c:186
- #, c-format
--msgid "%d ICMP packets dropped because they were out-of-window"
--msgstr "%d ICMP paquets jetés car hors de la fenêtre"
-+msgid "Ran %u times out of system memory during packet sending"
-+msgstr ""
- 
--#: ../statistics.c:156
-+#: ../statistics.c:188
-+#, fuzzy, c-format
-+msgid "%u acknowledgments not containing data received"
-+msgstr "%d paquets reçus pour un port inconnu"
-+
-+#: ../statistics.c:189
- #, c-format
--msgid "%d ICMP packets dropped because socket was locked"
--msgstr "%d paquets ICMP jetés car la socket a été vérouillée"
-+msgid "%u predicted acknowledgments"
-+msgstr ""
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr ""
-+
-+#: ../statistics.c:192
-+#, fuzzy, c-format
-+msgid "%u bad SACKs received"
-+msgstr "%d mauvais segments reçus."
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr ""
-+
-+#: ../statistics.c:194
-+#, c-format
-+msgid "Detected reordering %u times using SACK"
-+msgstr ""
-+
-+#: ../statistics.c:195
-+#, c-format
-+msgid "Detected reordering %u times using time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:196
-+#, c-format
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:197
-+#, c-format
-+msgid "%u congestion windows fully recovered"
-+msgstr ""
-+
-+#: ../statistics.c:198
-+#, c-format
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr ""
-+
-+#: ../statistics.c:199
-+#, c-format
-+msgid "%u congestion window recovered using DSACK"
-+msgstr ""
-+
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr ""
-+
-+#: ../statistics.c:201
-+#, fuzzy, c-format
-+msgid "%u retransmits lost"
-+msgstr "%d réinitialisations envoyées"
-+
-+#: ../statistics.c:202
-+#, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr ""
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr ""
-+
-+#: ../statistics.c:205
-+#, fuzzy, c-format
-+msgid "%u fast retransmits"
-+msgstr "%d segments retransmis"
-+
-+#: ../statistics.c:206
-+#, c-format
-+msgid "%u forward retransmits"
-+msgstr ""
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr ""
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr ""
-+
-+#: ../statistics.c:209
-+#, fuzzy, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr "%d segments retransmis"
-+
-+#: ../statistics.c:210
-+#, fuzzy, c-format
-+msgid "%u sack retransmits failed"
-+msgstr "%d paquets mal réassemblés"
-+
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr ""
-+
-+#: ../statistics.c:212
-+#, fuzzy, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein"
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr ""
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr ""
-+
-+#: ../statistics.c:215
-+#, fuzzy, c-format
-+msgid "%u DSACKs received"
-+msgstr "%d paquets reçus"
-+
-+#: ../statistics.c:216
-+#, fuzzy, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "%d paquets totaux reçus"
-+
-+#: ../statistics.c:217
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "%d réinitialisations de connexions reçues"
-+
-+#: ../statistics.c:218
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr "%d réinitialisations de connexions reçues"
-+
-+#: ../statistics.c:219
-+#, fuzzy, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr "%d réinitialisations de connexions reçues"
-+
-+#: ../statistics.c:220
-+#, c-format
-+msgid "%u connections aborted due to memory pressure"
-+msgstr ""
-+
-+#: ../statistics.c:221
-+#, fuzzy, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr "%d réinitialisations de connexions reçues"
- 
- #: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr ""
-+
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr ""
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr ""
-+
-+#: ../statistics.c:292
- msgid "enabled"
- msgstr "activée"
- 
--#: ../statistics.c:222
-+#: ../statistics.c:292
- msgid "disabled"
- msgstr "désactivée"
- 
--#: ../statistics.c:272
--#, c-format
--msgid "unknown title %s\n"
--msgstr "titre inconnu %s\n"
--
--#: ../statistics.c:298
-+#: ../statistics.c:375
- msgid "error parsing /proc/net/snmp"
- msgstr "erreur d'analyse de /proc/net/snmp"
- 
--#: ../statistics.c:311
-+#: ../statistics.c:388
- msgid "cannot open /proc/net/snmp"
- msgstr "ne peut ouvrir /proc/net/snmp"
- 
-@@ -1824,89 +2064,95 @@
- msgid "Cannot change line discipline to `%s'.\n"
- msgstr "Ne peut changer la discipline de ligne à `%s'.\n"
- 
--#: ../lib/af.c:145 ../lib/hw.c:148
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr "UNSPEC"
- 
--#: ../lib/af.c:147
-+#: ../lib/af.c:155
- msgid "UNIX Domain"
- msgstr "Domaine UNIX"
- 
--#: ../lib/af.c:150
-+#: ../lib/af.c:158
- msgid "DARPA Internet"
- msgstr "DARPA Internet"
- 
--#: ../lib/af.c:153
-+#: ../lib/af.c:161
- msgid "IPv6"
- msgstr "IPv6"
- 
--#: ../lib/af.c:156 ../lib/hw.c:169
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr "AMPR AX.25"
- 
--#: ../lib/af.c:159 ../lib/hw.c:175
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr "AMPR NET/ROM"
- 
--#: ../lib/af.c:162
-+#: ../lib/af.c:170
- msgid "Novell IPX"
- msgstr ""
- 
--#: ../lib/af.c:165
-+#: ../lib/af.c:173
- msgid "Appletalk DDP"
- msgstr "Appletalk DDP"
- 
--#: ../lib/af.c:168 ../lib/hw.c:207
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr "Econet"
- 
--#: ../lib/af.c:171 ../lib/hw.c:172
-+#: ../lib/af.c:179
-+msgid "CCITT X.25"
-+msgstr ""
-+
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr "AMPR ROSE"
- 
--#: ../lib/af.c:174 ../lib/hw.c:160
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr "Ash"
- 
--#: ../lib/af.c:232
-+#: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr "Ne fournissez pas plus d'une famille d'adresses SVP.\n"
- 
--#: ../lib/af.c:293
-+#: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr "Trop d'arguments de familles d'adresses.\n"
- 
--#: ../lib/af.c:304
-+#: ../lib/af.c:315
- #, c-format
- msgid "Unknown address family `%s'.\n"
- msgstr "Famille d'adresses inconnue `%s'.\n"
- 
--#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
--#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
--#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
--#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
--msgid "[NONE SET]"
--msgstr "[INDEFINI]"
--
--#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
- #, c-format
- msgid "in_arcnet(%s): invalid arcnet address!\n"
- msgstr "in_arcnet(%s): adresse arcnet invalide !\n"
- 
--#: ../lib/arcnet.c:108
-+#: ../lib/arcnet.c:97
- #, c-format
- msgid "in_arcnet(%s): trailing : ignored!\n"
- msgstr "in_arcnet(%s): restant : ignoré !\n"
- 
--#: ../lib/arcnet.c:120
-+#: ../lib/arcnet.c:109
- #, c-format
- msgid "in_arcnet(%s): trailing junk!\n"
- msgstr "in_arcnet(%s): le restant à la poubelle !\n"
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
- msgstr "Adresse Ash malformée"
- 
-+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-+msgid "[NONE SET]"
-+msgstr "[INDEFINI]"
-+
- #: ../lib/ax25.c:97 ../lib/netrom.c:100
- msgid "Invalid callsign"
- msgstr "Signal d'appel invalide"
-@@ -1916,22 +2162,21 @@
- msgstr "Signal d'appel trop long"
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr "AX.25 pas configuré sur ce système.\n"
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr "Table de routage AX.25 du noyau\n"
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr "Destination  Iface    Utilisation\n"
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr "Table de routage pour `ddp' pas encore supporté.\n"
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1947,153 +2192,171 @@
- msgid "in_ether(%s): trailing junk!\n"
- msgstr "in_ether(%s): le restant à la poubelle !\n"
- 
--#: ../lib/fddi.c:95 ../lib/fddi.c:110
-+#: ../lib/fddi.c:84 ../lib/fddi.c:99
- #, c-format
- msgid "in_fddi(%s): invalid fddi address!\n"
- msgstr "in_fddi(%s): adresse fddi invalide!\n"
- 
--#: ../lib/fddi.c:122
-+#: ../lib/fddi.c:111
- #, c-format
- msgid "in_fddi(%s): trailing : ignored!\n"
- msgstr "in_fddi(%s): restant ignoré !\n"
- 
--#: ../lib/fddi.c:134
-+#: ../lib/fddi.c:123
- #, c-format
- msgid "in_fddi(%s): trailing junk!\n"
- msgstr "in_fddi(%s): le restant à la poubelle !\n"
- 
--#: ../lib/getroute.c:97 ../lib/setroute.c:76
-+#: ../lib/getroute.c:101 ../lib/setroute.c:80
- #, c-format
- msgid "Address family `%s' not supported.\n"
- msgstr "Famille d'adresses `%s' non supportée.\n"
- 
--#: ../lib/getroute.c:103 ../lib/setroute.c:80
-+#: ../lib/getroute.c:107 ../lib/setroute.c:84
- #, c-format
- msgid "No routing for address family `%s'.\n"
- msgstr "Pas de routage pour la famille d'adresses `%s'.\n"
- 
--#: ../lib/hippi.c:96 ../lib/hippi.c:111
-+#: ../lib/hippi.c:84 ../lib/hippi.c:99
- #, c-format
- msgid "in_hippi(%s): invalid hippi address!\n"
- msgstr "in_hippi(%s): adresse hippi invalide!\n"
- 
--#: ../lib/hippi.c:123
-+#: ../lib/hippi.c:111
- #, c-format
- msgid "in_hippi(%s): trailing : ignored!\n"
- msgstr "in_hippi(%s): restant ignoré !\n"
- 
--#: ../lib/hippi.c:134
-+#: ../lib/hippi.c:122
- #, c-format
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr "in_hippi(%s): le restant à la poubelle !\n"
- 
--#: ../lib/hw.c:147
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr "Boucle locale"
- 
--#: ../lib/hw.c:150
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr "IP ligne série"
- 
--#: ../lib/hw.c:151
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr "IP ligne série - VJ "
- 
--#: ../lib/hw.c:152
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr "IP ligne série - 6 bits"
- 
--#: ../lib/hw.c:153
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr "IP ligne série - 6 bits VJ"
- 
--#: ../lib/hw.c:154
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr "IP ligne série adaptative"
- 
--#: ../lib/hw.c:157
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr "Ethernet"
- 
--#: ../lib/hw.c:163
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr "Fiber Distributed Data Interface"
- 
--#: ../lib/hw.c:166
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr "HIPPI"
- 
--#: ../lib/hw.c:178
-+#: ../lib/hw.c:191
-+msgid "generic X.25"
-+msgstr ""
-+
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr "IPIP Tunnel"
- 
--#: ../lib/hw.c:181
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
- msgstr "Protocole Point-à-Point"
- 
--#: ../lib/hw.c:184
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr "(Cisco)-HDLC"
- 
--#: ../lib/hw.c:185
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:188
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr "ARCnet"
- 
--#: ../lib/hw.c:191
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr "Frame Relay DLCI"
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr "Périphériue d'accès Frame Relay"
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr "IPv6-dans-IPv4"
- 
--#: ../lib/hw.c:198
-+#: ../lib/hw.c:214
- #, fuzzy
- msgid "IrLAP"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:201
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr ""
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:219
- msgid "16/4 Mbps Token Ring (New)"
- msgstr ""
- 
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
- #: ../lib/inet.c:153 ../lib/inet6.c:79
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
- msgstr "rresolve: famille d'adresses non suportée %d !\n"
- 
--#: ../lib/inet6_gr.c:79
-+#: ../lib/inet6.c:131
-+#, fuzzy
-+msgid "[UNKNOWN]"
-+msgstr "INCONNU"
-+
-+#: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr "INET6 (IPv6) pas configuré sur ce système.\n"
- 
--#: ../lib/inet6_gr.c:82
-+#: ../lib/inet6_gr.c:74
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
- msgstr "Table de routage IPv6 du noyau\n"
- 
--#: ../lib/inet6_gr.c:84
-+#: ../lib/inet6_gr.c:76
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
- msgstr ""
--"Destination                                 Prochain Hop                     "
--"       Indic Metric Ref    Utilis. Iface\n"
-+"Destination                                 Prochain "
-+"Hop                            Indic Metric Ref    Utilis. Iface\n"
- 
--#: ../lib/inet6_gr.c:158
-+#: ../lib/inet6_gr.c:150
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr "Cache voisin IPv6 du noyau\n"
- 
--#: ../lib/inet6_gr.c:161
-+#: ../lib/inet6_gr.c:153
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
-@@ -2101,39 +2364,45 @@
- "Voisin                                      Adresse MAT       Iface    Indic "
- "Ref Etat\n"
- 
--#: ../lib/inet6_gr.c:165
-+#: ../lib/inet6_gr.c:157
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
--msgstr ""
--"Voisin                                      Adresse MAT       Iface    Indic "
--"Ref Etat             Bloqué(sec) Détuit(sec)\n"
-+msgstr "Voisin                                      Adresse MAT       Iface    Indic Ref Etat             Bloqué(sec) Détuit(sec)\n"
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr "Syntaxe: inet6_route [-vF] del Cible\n"
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr "       inet6_route [-vF] add Cible [gw Gw] [metric M] [[dev] If]\n"
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr "       inet6_route [-FC] flush      PAS supporté\n"
- 
--#: ../lib/inet6_sr.c:182
-+#: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
- msgstr "Flush de table de routage `inet6' pas supporté\n"
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr "INET (IPv4) pas configuré sur ce système.\n"
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
- msgstr "Table de routage IP du noyau\n"
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2142,26 +2411,26 @@
- "Iface\n"
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
--msgstr ""
--"Destination     Passerelle      Genmask         Indic   MSS Fenêtre irtt "
--"Iface\n"
-+msgstr "Destination     Passerelle      Genmask         Indic   MSS Fenêtre irtt Iface\n"
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
--msgstr ""
--"Destination     Passerelle      Genmask         Indic Metric Ref    Use "
--"Iface    MSS  Fenêtre irtt\n"
-+msgstr "Destination     Passerelle      Genmask         Indic Metric Ref    Use Iface    MSS  Fenêtre irtt\n"
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
- msgstr "cache de routage IP du noyau\n"
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2170,30 +2439,28 @@
- "Iface\n"
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
--msgstr ""
--"Source          Destination     Passerelle      Indic   MSS Fenêtre irtt "
--"Iface\n"
-+msgstr "Source          Destination     Passerelle      Indic   MSS Fenêtre irtt Iface\n"
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
--msgstr ""
--"Source          Destination     Passerelle      Indic Metric Ref    Use "
--"Iface    MSS  Fenêtre irtt  HH  Arp\n"
-+msgstr "Source          Destination     Passerelle      Indic Metric Ref    Use Iface    MSS  Fenêtre irtt  HH  Arp\n"
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
--msgstr ""
--"Source          Destination     Passerelle      Flags Metric Ref    Use "
--"Iface    MSS  Fenêtre irtt  TOS HHRef HHUptod     SpecDst\n"
-+msgstr "Source          Destination     Passerelle      Flags Metric Ref    Use Iface    MSS  Fenêtre irtt  TOS HHRef HHUptod     SpecDst\n"
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
-@@ -2201,29 +2468,34 @@
- "Syntaxe: inet_route [-vF] del {-host|-net} Cible[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
- msgstr ""
- "       inet_route [-vF] add {-host|-net} Cible[/prefix] [gw Gw] [metric M]\n"
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
- msgstr ""
- "       inet_route [-vF] add {-host|-net} Cible[/prefix] [metric M] reject\n"
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr "       inet_route [-FC] flush      PAS supporté\n"
- 
-@@ -2233,15 +2505,17 @@
- msgstr "route: %s: ne peut utiliser un RESEAU comme passerelle!\n"
- 
- #: ../lib/inet_sr.c:174
--#, fuzzy
-+#, fuzzy, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr "route: MSS invalide.\n"
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr "route: fenêtre invalide.\n"
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr "route: rtt initial invalide.\n"
- 
-@@ -2256,75 +2530,92 @@
- msgstr "route: netmask bogué %s\n"
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr "route: netmask ne correspond pas à l'adresse de route\n"
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
- msgstr "Flush de table de routage `inet' pas supporté\n"
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
- msgstr "Modification de cache de routage `inet' pas supporté\n"
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr "IPX pas configuré sur ce système.\n"
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
- msgstr "Table de routage IPX du noyau\n"
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
- msgstr "Destination               Réseau Routeur            Noeud Routeur\n"
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
- msgstr "IPX: ceci doit être écrit\n"
- 
--#: ../lib/masq_info.c:197
-+#: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr "Entrées IP Masquerade\n"
- 
--#: ../lib/masq_info.c:200
-+#: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr "prot   expire source               destination          ports\n"
- 
--#: ../lib/masq_info.c:203
-+#: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
--"prot   expire    initseq delta precd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta precd source               "
-+"destination          ports\n"
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr "NET/ROM pas configuré sur ce système.\n"
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
- msgstr "Table de routage NET/ROM du noyau\n"
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr "Destination  Mnemoniq  Qualité  Voisin     Iface\n"
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
- msgstr "utilisation netrom\n"
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
- msgstr "NET/ROM: ceci doit être écrit\n"
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr "Vous ne pouvez démarrer PPP avec ce programme.\n"
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
- msgstr "Désolé, utilisez pppd !\n"
- 
-@@ -2333,49 +2624,314 @@
- msgstr "L'adresse de noeud doit avoir 10 chiffres"
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr "ROSE pas configuré sur ce système.\n"
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
- msgstr "Table de routage ROSE du noyau\n"
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr "in_tr(%s): adresse token-ring invalide !\n"
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr "in_tr(%s): restant : ignoré !\n"
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr "in_tr(%s): restant à la poubelle !\n"
- 
--#: ../lib/interface.c:124
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
- msgstr "attention: pas de socket inet disponible: %s\n"
- 
--#: ../lib/interface.c:270
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr ""
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:504
-+#: ../lib/interface.c:571
- msgid "Device not found"
- msgstr "Périphérique non trouvé"
- 
--#: ../lib/interface.c:508
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
- msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
- 
--#: ../lib/sockets.c:59
-+#: ../lib/interface.c:608
-+msgid "     - no statistics available -"
-+msgstr ""
-+
-+#: ../lib/interface.c:612
-+#, c-format
-+msgid "[NO FLAGS]"
-+msgstr "[PAS INDICATEURS]"
-+
-+#: ../lib/interface.c:688
-+#, c-format
-+msgid "%-9.9s Link encap:%s  "
-+msgstr "%-9.9s Lien encap:%s  "
-+
-+#: ../lib/interface.c:693
-+#, c-format
-+msgid "HWaddr %s  "
-+msgstr "HWaddr %s  "
-+
-+#: ../lib/interface.c:696
-+#, c-format
-+msgid "Media:%s"
-+msgstr "Media:%s"
-+
-+#: ../lib/interface.c:698
-+#, c-format
-+msgid "(auto)"
-+msgstr "(auto)"
-+
-+#: ../lib/interface.c:705
-+#, c-format
-+msgid "          %s addr:%s "
-+msgstr "          %s adr:%s "
-+
-+#: ../lib/interface.c:708
-+#, c-format
-+msgid " P-t-P:%s "
-+msgstr " P-t-P:%s "
-+
-+#: ../lib/interface.c:711
-+#, c-format
-+msgid " Bcast:%s "
-+msgstr " Bcast:%s "
-+
-+#: ../lib/interface.c:713
-+#, c-format
-+msgid " Mask:%s\n"
-+msgstr " Masque:%s\n"
-+
-+#: ../lib/interface.c:730
-+#, c-format
-+msgid "          inet6 addr: %s/%d"
-+msgstr "          adr inet6: %s/%d"
-+
-+#: ../lib/interface.c:732
-+#, c-format
-+msgid " Scope:"
-+msgstr " Scope:"
-+
-+#: ../lib/interface.c:735
-+#, c-format
-+msgid "Global"
-+msgstr "Global"
-+
-+#: ../lib/interface.c:738
-+#, c-format
-+msgid "Link"
-+msgstr "Lien"
-+
-+#: ../lib/interface.c:741
-+#, c-format
-+msgid "Site"
-+msgstr "Site"
-+
-+#: ../lib/interface.c:744
-+#, c-format
-+msgid "Compat"
-+msgstr "Compat"
-+
-+#: ../lib/interface.c:747
-+#, c-format
-+msgid "Host"
-+msgstr "Hôte"
-+
-+#: ../lib/interface.c:750
-+#, c-format
-+msgid "Unknown"
-+msgstr "Inconnu"
-+
-+#: ../lib/interface.c:765
-+#, c-format
-+msgid "          IPX/Ethernet II addr:%s\n"
-+msgstr "          adr IPX/Ethernet II:%s\n"
-+
-+#: ../lib/interface.c:768
-+#, c-format
-+msgid "          IPX/Ethernet SNAP addr:%s\n"
-+msgstr "          adr IPX/Ethernet SNAP:%s\n"
-+
-+#: ../lib/interface.c:771
-+#, c-format
-+msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+msgstr "          adr IPX/Ethernet 802.2:%s\n"
-+
-+#: ../lib/interface.c:774
-+#, c-format
-+msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+msgstr "          adr IPX/Ethernet 802.3:%s\n"
-+
-+#: ../lib/interface.c:784
-+#, c-format
-+msgid "          EtherTalk Phase 2 addr:%s\n"
-+msgstr "          adr EtherTalk Phase 2:%s\n"
-+
-+#: ../lib/interface.c:793
-+#, c-format
-+msgid "          econet addr:%s\n"
-+msgstr "          adr econet:%s\n"
-+
-+#: ../lib/interface.c:800
-+#, c-format
-+msgid "[NO FLAGS] "
-+msgstr "[PAS INDICATEURS] "
-+
-+#: ../lib/interface.c:802
-+#, c-format
-+msgid "UP "
-+msgstr "UP "
-+
-+#: ../lib/interface.c:804
-+#, c-format
-+msgid "BROADCAST "
-+msgstr "BROADCAST "
-+
-+#: ../lib/interface.c:806
-+#, c-format
-+msgid "DEBUG "
-+msgstr "DEBUG "
-+
-+#: ../lib/interface.c:808
-+#, c-format
-+msgid "LOOPBACK "
-+msgstr "LOOPBACK "
-+
-+#: ../lib/interface.c:810
-+#, c-format
-+msgid "POINTOPOINT "
-+msgstr "POINTOPOINT "
-+
-+#: ../lib/interface.c:812
-+#, c-format
-+msgid "NOTRAILERS "
-+msgstr "NOTRAILERS "
-+
-+#: ../lib/interface.c:814
-+#, c-format
-+msgid "RUNNING "
-+msgstr "RUNNING "
-+
-+#: ../lib/interface.c:816
-+#, c-format
-+msgid "NOARP "
-+msgstr "NOARP "
-+
-+#: ../lib/interface.c:818
-+#, c-format
-+msgid "PROMISC "
-+msgstr "PROMISC "
-+
-+#: ../lib/interface.c:820
-+#, c-format
-+msgid "ALLMULTI "
-+msgstr "ALLMULTI "
-+
-+#: ../lib/interface.c:822
-+#, c-format
-+msgid "SLAVE "
-+msgstr "SLAVE "
-+
-+#: ../lib/interface.c:824
-+#, c-format
-+msgid "MASTER "
-+msgstr "MASTER "
-+
-+#: ../lib/interface.c:826
-+#, c-format
-+msgid "MULTICAST "
-+msgstr "MULTICAST "
-+
-+#: ../lib/interface.c:829
-+#, c-format
-+msgid "DYNAMIC "
-+msgstr "DYNAMIC "
-+
-+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-+#: ../lib/interface.c:832
-+#, c-format
-+msgid " MTU:%d  Metric:%d"
-+msgstr " MTU:%d  Metric:%d"
-+
-+#: ../lib/interface.c:836
-+#, c-format
-+msgid "  Outfill:%d  Keepalive:%d"
-+msgstr "  Outfill:%d  Keepalive:%d"
-+
-+#: ../lib/interface.c:850
-+#, fuzzy, c-format
-+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n"
-+
-+#: ../lib/interface.c:855
-+#, c-format
-+msgid "             compressed:%lu\n"
-+msgstr "             compressés:%lu\n"
-+
-+#: ../lib/interface.c:895
-+#, fuzzy, c-format
-+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgstr "Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n"
-+
-+#: ../lib/interface.c:899
-+#, c-format
-+msgid "          collisions:%lu "
-+msgstr "          collisions:%lu "
-+
-+#: ../lib/interface.c:901
-+#, c-format
-+msgid "compressed:%lu "
-+msgstr "compressés:%lu "
-+
-+#: ../lib/interface.c:903
-+#, c-format
-+msgid "txqueuelen:%d "
-+msgstr "lg file transmission:%d "
-+
-+#: ../lib/interface.c:905
-+#, c-format
-+msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-+msgstr ""
-+
-+#: ../lib/interface.c:916
-+#, c-format
-+msgid "Interrupt:%d "
-+msgstr "Interruption:%d "
-+
-+#. Only print devices using it for
-+#. I/O maps
-+#: ../lib/interface.c:919
-+#, c-format
-+msgid "Base address:0x%x "
-+msgstr "Adresse de base:0x%x "
-+
-+#: ../lib/interface.c:921
-+#, c-format
-+msgid "Memory:%lx-%lx "
-+msgstr "Mémoire:%lx-%lx "
-+
-+#: ../lib/interface.c:924
-+#, c-format
-+msgid "DMA chan:%x "
-+msgstr "Canal DMA:%x "
-+
-+#: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr "Pas de famille d'adresses utilisable trouvée.\n"
- 
-@@ -2399,29 +2955,32 @@
- msgid "ip: argument is wrong: %s\n"
- msgstr "ip: argument incorrect: %s\n"
- 
--#: ../ipmaddr.c:56
-+#: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr "Syntaxe: ipmaddr [ add | del ] MULTIADR dev CHAINE\n"
- 
--#: ../ipmaddr.c:57
-+#: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr "       ipmaddr show [ dev CHAINE ] [ ipv4 | ipv6 | link | all ]\n"
- 
--#: ../ipmaddr.c:58
-+#: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr ""
- 
--#: ../ipmaddr.c:258
-+#: ../ipmaddr.c:263
- #, c-format
- msgid "family %d "
- msgstr ""
- 
--#: ../ipmaddr.c:267
-+#: ../ipmaddr.c:272
- #, c-format
- msgid " users %d"
- msgstr ""
- 
--#: ../ipmaddr.c:353
-+#: ../ipmaddr.c:358
- msgid "Cannot create socket"
- msgstr "Ne peut créer une socket"
- 
-@@ -2436,6 +2995,7 @@
- msgstr ""
- 
- #: ../slattach.c:192
-+#, fuzzy, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr "slattach: tty_lock: (%s): %s\n"
- 
-@@ -2454,59 +3014,88 @@
- msgid "slattach: tty_hangup(RAISE): %s\n"
- msgstr "slattach: tty_hangup(RAISE): %s\n"
- 
--#: ../slattach.c:486
-+#: ../slattach.c:468
-+#, fuzzy, c-format
-+msgid "slattach: tty name too long\n"
-+msgstr "%s: nom trop long\n"
-+
-+#: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr "slattach: tty_open: ne peut obtenir l'état courant !\n"
- 
--#: ../slattach.c:493
-+#: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
- msgstr ""
- "slattach: tty_open: ne peut obtenir la discipline de ligne actuelle !\n"
- 
--#: ../slattach.c:501
-+#: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr "slattach: tty_open: ne peut activer le mode RAW !\n"
- 
--#: ../slattach.c:508
-+#: ../slattach.c:520
- #, c-format
- msgid "slattach: tty_open: cannot set %s bps!\n"
- msgstr "slattach: tty_open: ne peut passer à %s bps!\n"
- 
--#: ../slattach.c:518
-+#: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr "slattach: tty_open: ne peut activer le mode 8N1 !\n"
- 
--#: ../slattach.c:686
-+#: ../slattach.c:672
-+#, c-format
-+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+msgstr ""
-+
-+#: ../slattach.c:704
- #, c-format
- msgid "%s started"
- msgstr ""
- 
--#: ../slattach.c:687
-+#: ../slattach.c:705
- #, c-format
- msgid " on %s"
- msgstr ""
- 
--#: ../slattach.c:688
-+#: ../slattach.c:706
- #, fuzzy, c-format
- msgid " interface %s\n"
- msgstr "%s: interface inconnue: %s\n"
- 
- #~ msgid ""
--#~ "   This comand can get or set the hostname or the NIS domainname. You can\n"
--#~ msgstr ""
--#~ "   Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine "
--#~ "NIS. Vous pouvez\n"
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+#~ "<-''-\n"
-+#~ msgstr "  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [netmask <nm>] pub  <-''-\n"
-+
-+#~ msgid "%s: unknown interface: %s\n"
-+#~ msgstr "%s: interface inconnue: %s\n"
-+
-+#~ msgid "address mask replies"
-+#~ msgstr "réponses de masque d'adresses"
-+
-+#~ msgid "unknown title %s\n"
-+#~ msgstr "titre inconnu %s\n"
-+
-+#~ msgid "Routing table for `ddp' not yet supported.\n"
-+#~ msgstr "Table de routage pour `ddp' pas encore supporté.\n"
-+
-+#~ msgid ""
-+#~ "   This comand can get or set the hostname or the NIS domainname. You "
-+#~ "can\n"
-+#~ msgstr "   Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine NIS. Vous pouvez\n"
- 
- #~ msgid ""
- #~ "   also get the DNS domain or the FQDN (fully qualified domain name).\n"
- #~ msgstr ""
--#~ "   aussi obtenir le domaine DNS ou le FQDN (fully qualified domain name).\n"
-+#~ "   aussi obtenir le domaine DNS ou le FQDN (fully qualified domain "
-+#~ "name).\n"
- 
- #~ msgid ""
- #~ "   Unless you are using bind or NIS for host lookups you can change the\n"
--#~ msgstr ""
--#~ "   Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous "
--#~ "pouvez changer le\n"
-+#~ msgstr "   Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n"
- 
- #~ msgid ""
- #~ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
---- net-tools-1.60.orig/po/net-tools.pot
-+++ net-tools-1.60/po/net-tools.pot
-@@ -1,253 +1,275 @@
- # SOME DESCRIPTIVE TITLE.
--# Copyright (C) YEAR Free Software Foundation, Inc.
-+# 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"
--"POT-Creation-Date: 2001-04-15 15:40+0100\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\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: ENCODING\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:111 ../arp.c:270
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
- msgstr ""
- 
--#: ../arp.c:208 ../arp.c:222
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
- msgstr ""
- 
--#: ../arp.c:240
-+#: ../arp.c:248
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr ""
- 
--#: ../arp.c:244
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr ""
- 
--#: ../arp.c:253
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
- msgstr ""
- 
--#: ../arp.c:283
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
- msgstr ""
- 
--#: ../arp.c:291
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr ""
- 
--#: ../arp.c:388
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr ""
- 
--#: ../arp.c:404
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr ""
- 
--#: ../arp.c:417
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr ""
- 
--#: ../arp.c:438
-+#: ../arp.c:448
-+#, c-format
- msgid ""
- "Address                  HWtype  HWaddress           Flags Mask            "
- "Iface\n"
- msgstr ""
- 
--#: ../arp.c:468
-+#: ../arp.c:476
-+msgid "<from_interface>"
-+msgstr ""
-+
-+#: ../arp.c:478
- msgid "(incomplete)"
- msgstr ""
- 
--#: ../arp.c:485
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr ""
- 
--#: ../arp.c:491
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
- msgstr ""
- 
--#: ../arp.c:497
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
- msgstr ""
- 
--#: ../arp.c:514
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr ""
- 
--#: ../arp.c:593
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr ""
- 
--#: ../arp.c:597
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr ""
- 
--#: ../arp.c:599
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
- msgstr ""
- 
--#: ../arp.c:614
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
- "cache\n"
- msgstr ""
- 
--#: ../arp.c:615
-+#: ../arp.c:627
-+#, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
- msgstr ""
- 
--#: ../arp.c:616
-+#: ../arp.c:628
-+#, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
- msgstr ""
- 
--#: ../arp.c:617
-+#: ../arp.c:629
-+#, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
- msgstr ""
- 
--#: ../arp.c:618
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--
--#: ../arp.c:619
-+#: ../arp.c:630
-+#, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
- msgstr ""
- 
--#: ../arp.c:621
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
- msgstr ""
- 
--#: ../arp.c:622
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr ""
- 
--#: ../arp.c:623
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr ""
- 
--#: ../arp.c:624 ../netstat.c:1490 ../route.c:86
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr ""
- 
--#: ../arp.c:625 ../netstat.c:1491 ../route.c:87
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, c-format
- msgid "        -n, --numeric            don't resolve names\n"
- msgstr ""
- 
--#: ../arp.c:626
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
- msgstr ""
- 
--#: ../arp.c:627
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
- msgstr ""
- 
--#: ../arp.c:628
-+#: ../arp.c:639
-+#, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr ""
- 
--#: ../arp.c:629
-+#: ../arp.c:640
-+#, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:642 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
- msgstr ""
- 
--#: ../arp.c:632 ../rarp.c:183
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr ""
- 
--#: ../arp.c:666 ../arp.c:751
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr ""
- 
--#: ../arp.c:670
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr ""
- 
--#: ../arp.c:705
-+#: ../arp.c:716
-+#, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr ""
- 
--#: ../arp.c:715
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr ""
- 
--#: ../arp.c:724
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr ""
- 
--#: ../arp.c:743
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
- msgstr ""
- 
--#: ../arp.c:756
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr ""
- 
--#: ../hostname.c:70
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
- msgstr ""
- 
--#: ../hostname.c:75
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr ""
- 
--#: ../hostname.c:78 ../hostname.c:98 ../hostname.c:117
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr ""
- 
--#: ../hostname.c:90
-+#: ../hostname.c:91
- #, c-format
- msgid "Setting hostname to `%s'\n"
- msgstr ""
- 
--#: ../hostname.c:95
-+#: ../hostname.c:96
- #, c-format
- msgid "%s: you must be root to change the host name\n"
- msgstr ""
-@@ -262,103 +284,119 @@
- msgid "%s: you must be root to change the domain name\n"
- msgstr ""
- 
--#: ../hostname.c:132
-+#: ../hostname.c:131
- #, c-format
- msgid "Resolving `%s' ...\n"
- msgstr ""
- 
--#: ../hostname.c:138
-+#: ../hostname.c:137
- #, c-format
- msgid "Result: h_name=`%s'\n"
- msgstr ""
- 
--#: ../hostname.c:143
-+#: ../hostname.c:142
- #, c-format
- msgid "Result: h_aliases=`%s'\n"
- msgstr ""
- 
--#: ../hostname.c:148
-+#: ../hostname.c:147
- #, c-format
- msgid "Result: h_addr_list=`%s'\n"
- msgstr ""
- 
--#: ../hostname.c:210
-+#: ../hostname.c:208
- #, c-format
- msgid "%s: can't open `%s'\n"
- msgstr ""
- 
--#: ../hostname.c:224
-+#: ../hostname.c:222
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
- msgstr ""
- 
--#: ../hostname.c:225
-+#: ../hostname.c:223
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
- 
--#: ../hostname.c:227
-+#: ../hostname.c:225
-+#, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
- msgstr ""
- 
--#: ../hostname.c:229
-+#: ../hostname.c:227
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr ""
- 
--#: ../hostname.c:230
-+#: ../hostname.c:228
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
- msgstr ""
- 
--#: ../hostname.c:231
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
- msgstr ""
- 
--#: ../hostname.c:232
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- msgstr ""
- 
--#: ../hostname.c:233
-+#: ../hostname.c:231
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr ""
- 
--#: ../hostname.c:234
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr ""
- 
--#: ../hostname.c:235
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr ""
- 
--#: ../hostname.c:236
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr ""
- 
--#: ../hostname.c:237
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
- msgstr ""
- 
--#: ../hostname.c:238
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
- msgstr ""
- 
--#: ../hostname.c:240
-+#: ../hostname.c:238
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
- msgstr ""
- 
--#: ../hostname.c:242
-+#: ../hostname.c:240
-+#, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
- msgstr ""
- 
--#: ../hostname.c:244
-+#: ../hostname.c:242
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -367,587 +405,706 @@
- "   part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
- 
--#: ../hostname.c:340
-+#: ../hostname.c:338
- #, c-format
- msgid "%s: You can't change the DNS domain name with this command\n"
- msgstr ""
- 
--#: ../hostname.c:341
-+#: ../hostname.c:339
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
- msgstr ""
- 
--#: ../hostname.c:342
-+#: ../hostname.c:340
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
- 
--#: ../hostname.c:359
-+#: ../hostname.c:357
- #, c-format
- msgid "gethostname()=`%s'\n"
- msgstr ""
- 
--#: ../hostname.c:376
-+#: ../hostname.c:374
- #, c-format
- msgid "getdomainname()=`%s'\n"
- msgstr ""
- 
--#: ../hostname.c:391
-+#: ../hostname.c:389
- #, c-format
- msgid "getnodename()=`%s'\n"
- msgstr ""
- 
--#: ../ifconfig.c:108
-+#: ../ifconfig.c:107
-+#, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
- 
--#: ../ifconfig.c:130 ../ifconfig.c:162
-+#: ../ifconfig.c:129 ../ifconfig.c:161
- #, c-format
--msgid "%s: unknown interface: %s\n"
-+msgid "%s: ERROR while getting interface flags: %s\n"
- msgstr ""
- 
--#: ../ifconfig.c:154 ../ifconfig.c:734 ../ifconfig.c:825 ../ifconfig.c:936
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
-+#, c-format
- msgid "No support for INET on this system.\n"
- msgstr ""
- 
--#: ../ifconfig.c:177
-+#: ../ifconfig.c:193
-+#, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:202
-+#, c-format
- msgid ""
- "Usage:\n"
--"  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:204
-+#, c-format
- msgid "  [add <address>[/<prefixlen>]]\n"
- msgstr ""
- 
--#: ../ifconfig.c:180
-+#: ../ifconfig.c:205
-+#, c-format
- msgid "  [del <address>[/<prefixlen>]]\n"
- msgstr ""
- 
--#: ../ifconfig.c:181
-+#: ../ifconfig.c:206
-+#, c-format
- msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
- msgstr ""
- 
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:207
-+#, c-format
- msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:185
-+#: ../ifconfig.c:210
-+#, c-format
- msgid "  [outfill <NN>] [keepalive <NN>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:187
-+#: ../ifconfig.c:212
-+#, c-format
- msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:188
-+#: ../ifconfig.c:213
-+#, c-format
- msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- msgstr ""
- 
--#: ../ifconfig.c:189
-+#: ../ifconfig.c:214
-+#, c-format
- msgid "  [multicast]  [[-]promisc]\n"
- msgstr ""
- 
--#: ../ifconfig.c:190
-+#: ../ifconfig.c:215
-+#, c-format
- msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:192
-+#: ../ifconfig.c:217
-+#, c-format
- msgid "  [txqueuelen <NN>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:195
-+#: ../ifconfig.c:220
-+#, c-format
- msgid "  [[-]dynamic]\n"
- msgstr ""
- 
--#: ../ifconfig.c:197
-+#: ../ifconfig.c:222
-+#, c-format
- msgid ""
- "  [up|down] ...\n"
- "\n"
- msgstr ""
- 
--#: ../ifconfig.c:199
-+#: ../ifconfig.c:224
-+#, c-format
- msgid "  <HW>=Hardware Type.\n"
- msgstr ""
- 
--#: ../ifconfig.c:200
-+#: ../ifconfig.c:225
-+#, c-format
- msgid "  List of possible hardware types:\n"
- msgstr ""
- 
- #. 1 = ARPable
--#: ../ifconfig.c:202
-+#: ../ifconfig.c:227
- #, c-format
- msgid "  <AF>=Address family. Default: %s\n"
- msgstr ""
- 
--#: ../ifconfig.c:203
-+#: ../ifconfig.c:228
-+#, c-format
- msgid "  List of possible address families:\n"
- msgstr ""
- 
--#: ../ifconfig.c:278
-+#: ../ifconfig.c:303
- #, c-format
- msgid "ifconfig: option `%s' not recognised.\n"
- msgstr ""
- 
--#: ../ifconfig.c:280 ../ifconfig.c:925
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
- msgid "ifconfig: `--help' gives usage information.\n"
- msgstr ""
- 
--#: ../ifconfig.c:355
-+#: ../ifconfig.c:380
-+#, c-format
- msgid "Unknown media type.\n"
- msgstr ""
- 
--#: ../ifconfig.c:647
-+#: ../ifconfig.c:417
-+#, c-format
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:429
-+#, c-format
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:441
-+#, c-format
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:465
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:523
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:652
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:684
- #, c-format
- msgid "hw address type `%s' has no handler to set address. failed.\n"
- msgstr ""
- 
--#: ../ifconfig.c:656
-+#: ../ifconfig.c:693
- #, c-format
- msgid "%s: invalid %s address.\n"
- msgstr ""
- 
--#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-+#, c-format
- msgid "No support for INET6 on this system.\n"
- msgstr ""
- 
--#: ../ifconfig.c:743 ../ifconfig.c:834
-+#: ../ifconfig.c:780 ../ifconfig.c:871
- #, c-format
- msgid "Interface %s not initialized\n"
- msgstr ""
- 
--#: ../ifconfig.c:755 ../ifconfig.c:845
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, c-format
- msgid "Bad address.\n"
- msgstr ""
- 
--#: ../ifconfig.c:848
-+#: ../ifconfig.c:885
-+#, c-format
- msgid "Address deletion not supported on this system.\n"
- msgstr ""
- 
--#: ../ifconfig.c:920
-+#: ../ifconfig.c:957
-+#, c-format
- msgid "ifconfig: Cannot set address for this protocol family.\n"
- msgstr ""
- 
--#: ../ifconfig.c:946
-+#: ../ifconfig.c:983
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr ""
- 
--#: ../ifconfig.c:954
-+#: ../ifconfig.c:991
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr ""
- 
--#: ../netstat.c:430
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
- msgstr ""
- 
--#: ../netstat.c:434
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
- msgstr ""
- 
--#: ../netstat.c:441 ../netstat.c:1176 ../netstat.c:1253
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr ""
- 
--#: ../netstat.c:442
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr ""
- 
--#: ../netstat.c:443 ../netstat.c:1255
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr ""
- 
--#: ../netstat.c:444 ../netstat.c:511 ../netstat.c:894 ../netstat.c:1256
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr ""
- 
--#: ../netstat.c:466
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr ""
- 
--#: ../netstat.c:467
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
- msgstr ""
- 
--#: ../netstat.c:477 ../netstat.c:1295
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr ""
- 
--#: ../netstat.c:512
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr ""
- 
--#: ../netstat.c:513
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr ""
- 
--#: ../netstat.c:514
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr ""
- 
--#: ../netstat.c:515
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr ""
- 
--#: ../netstat.c:516
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr ""
- 
--#: ../netstat.c:517
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr ""
- 
--#: ../netstat.c:518
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr ""
- 
--#: ../netstat.c:519
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr ""
- 
--#: ../netstat.c:520
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr ""
- 
--#: ../netstat.c:521
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr ""
- 
--#: ../netstat.c:592
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr ""
- 
--#: ../netstat.c:597 ../netstat.c:635 ../netstat.c:756 ../netstat.c:888
--#: ../netstat.c:1019 ../netstat.c:1024
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr ""
- 
--#: ../netstat.c:610 ../netstat.c:615 ../netstat.c:623 ../netstat.c:630
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr ""
- 
--#: ../netstat.c:673
-+#: ../netstat.c:677
-+#, c-format
- msgid "Active X.25 sockets\n"
- msgstr ""
- 
- #. IMHO, Vr/Vs is not very usefull --SF
--#: ../netstat.c:675
-+#: ../netstat.c:679
-+#, c-format
- msgid ""
--"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  "
--"Recv-Q\n"
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
- msgstr ""
- 
--#: ../netstat.c:752
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr ""
- 
--#: ../netstat.c:793 ../netstat.c:943 ../netstat.c:1062
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:797
-+#: ../netstat.c:804
- #, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:802
-+#: ../netstat.c:809
- #, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:807
-+#: ../netstat.c:814
- #, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:812 ../netstat.c:952 ../netstat.c:1072
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:884
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr ""
- 
--#: ../netstat.c:902 ../netstat.c:1162 ../netstat.c:1195
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr ""
- 
--#: ../netstat.c:948 ../netstat.c:1067
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:1033
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr ""
- 
--#: ../netstat.c:1115
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr ""
- 
--#: ../netstat.c:1142
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr ""
- 
--#: ../netstat.c:1146
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr ""
- 
--#: ../netstat.c:1150
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr ""
- 
--#: ../netstat.c:1154
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr ""
- 
--#: ../netstat.c:1158
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
- msgstr ""
- 
--#: ../netstat.c:1167
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr ""
- 
--#: ../netstat.c:1183
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr ""
- 
--#: ../netstat.c:1187
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr ""
- 
--#: ../netstat.c:1191
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr ""
- 
--#: ../netstat.c:1222
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
- msgstr ""
- 
--#: ../netstat.c:1224 ../netstat.c:1735
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr ""
- 
--#: ../netstat.c:1227 ../netstat.c:1738
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr ""
- 
--#: ../netstat.c:1229 ../netstat.c:1740
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr ""
- 
--#: ../netstat.c:1232
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
- msgstr ""
- 
--#: ../netstat.c:1234
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr ""
- 
--#: ../netstat.c:1254
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr ""
- 
--#: ../netstat.c:1257
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr ""
- 
--#: ../netstat.c:1271
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr ""
- 
--#: ../netstat.c:1272
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr ""
- 
--#: ../netstat.c:1315
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr ""
- 
--#: ../netstat.c:1366
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
- "State"
- msgstr ""
- 
--#: ../netstat.c:1368
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr ""
- 
--#: ../netstat.c:1402
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr ""
- 
--#: ../netstat.c:1410
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr ""
- 
--#: ../netstat.c:1448
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
- msgstr ""
- 
--#: ../netstat.c:1452
-+#: ../netstat.c:1465
-+#, c-format
- msgid ""
--"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
- 
--#: ../netstat.c:1456
-+#: ../netstat.c:1469
- msgid "missing interface information"
- msgstr ""
- 
--#: ../netstat.c:1479
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
- 
--#: ../netstat.c:1480
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr ""
- 
--#: ../netstat.c:1481
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- msgstr ""
- 
--#: ../netstat.c:1483
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr ""
- 
--#: ../netstat.c:1484
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr ""
- 
--#: ../netstat.c:1485
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr ""
- 
--#: ../netstat.c:1486
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr ""
- 
--#: ../netstat.c:1488
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
- msgstr ""
- 
--#: ../netstat.c:1492
-+#: ../netstat.c:1505
-+#, c-format
- msgid "        --numeric-hosts          don't resolve host names\n"
- msgstr ""
- 
--#: ../netstat.c:1493
-+#: ../netstat.c:1506
-+#, c-format
- msgid "        --numeric-ports          don't resolve port names\n"
- msgstr ""
- 
--#: ../netstat.c:1494
-+#: ../netstat.c:1507
-+#, c-format
- msgid "        --numeric-users          don't resolve user names\n"
- msgstr ""
- 
--#: ../netstat.c:1495
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr ""
- 
--#: ../netstat.c:1496 ../route.c:88
-+#: ../netstat.c:1509 ../route.c:88
-+#, c-format
- msgid "        -e, --extend             display other/more information\n"
- msgstr ""
- 
--#: ../netstat.c:1497
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr ""
- 
--#: ../netstat.c:1498
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
- msgstr ""
- 
--#: ../netstat.c:1499
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr ""
- 
--#: ../netstat.c:1500
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr ""
- 
--#: ../netstat.c:1501
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr ""
- 
--#: ../netstat.c:1502 ../route.c:89
-+#: ../netstat.c:1515 ../route.c:89
-+#, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
- msgstr ""
- 
--#: ../netstat.c:1503 ../route.c:90
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
- msgstr ""
- 
--#: ../netstat.c:1505
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
- 
--#: ../netstat.c:1506 ../route.c:92
-+#: ../netstat.c:1519
- #, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr ""
- 
--#: ../netstat.c:1507 ../route.c:93
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
- msgstr ""
- 
--#: ../netstat.c:1732
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr ""
- 
--#: ../netstat.c:1742
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- 
--#: ../netstat.c:1744
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr ""
- 
--#: ../netstat.c:1747
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr ""
- 
--#: ../netstat.c:1777
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
- msgstr ""
- 
--#: ../netstat.c:1778
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr ""
- 
-@@ -986,23 +1143,28 @@
- msgstr ""
- 
- #: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
- msgstr ""
- 
- #: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
- msgstr ""
- 
- #: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
- msgstr ""
- 
- #: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
- msgstr ""
- 
- #: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
-@@ -1019,38 +1181,50 @@
- msgstr ""
- 
- #: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
- 
- #: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
- msgstr ""
- 
- #: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
- msgstr ""
- 
- #: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
- "\n"
- msgstr ""
- 
-+#: ../route.c:92
-+#, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr ""
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr ""
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr ""
- 
- #: ../plipconfig.c:68
-+#, c-format
- msgid "       plipconfig -V | --version\n"
- msgstr ""
- 
-@@ -1060,61 +1234,75 @@
- msgstr ""
- 
- #: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr ""
- 
- #: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr ""
- 
- #: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr ""
- 
- #: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
- msgstr ""
- 
- #: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
- msgstr ""
- 
- #: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr ""
- 
- #: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr ""
- 
- #: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr ""
- 
- #: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr ""
- 
- #: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr ""
- 
- #: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr ""
- 
- #: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr ""
- 
- #: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr ""
- 
- #: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr ""
- 
-@@ -1128,22 +1316,27 @@
- msgstr ""
- 
- #: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr ""
- 
- #: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr ""
- 
- #: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr ""
- 
- #: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr ""
- 
- #: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
- msgstr ""
- 
-@@ -1153,10 +1346,12 @@
- msgstr ""
- 
- #: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr ""
- 
- #: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr ""
- 
-@@ -1563,12 +1758,12 @@
- 
- #: ../statistics.c:178
- #, c-format
--msgid "%u packets directly received from backlog"
-+msgid "%u of bytes directly received from backlog"
- msgstr ""
- 
- #: ../statistics.c:180
- #, c-format
--msgid "%u packets directly received from prequeue"
-+msgid "%u of bytes directly received from prequeue"
- msgstr ""
- 
- #: ../statistics.c:182
-@@ -1578,7 +1773,7 @@
- 
- #: ../statistics.c:183
- #, c-format
--msgid "%u packets header predicted"
-+msgid "%u packet headers predicted"
- msgstr ""
- 
- #: ../statistics.c:184
-@@ -1591,19 +1786,209 @@
- msgid "Ran %u times out of system memory during packet sending"
- msgstr ""
- 
--#: ../statistics.c:253
-+#: ../statistics.c:188
-+#, c-format
-+msgid "%u acknowledgments not containing data received"
-+msgstr ""
-+
-+#: ../statistics.c:189
-+#, c-format
-+msgid "%u predicted acknowledgments"
-+msgstr ""
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr ""
-+
-+#: ../statistics.c:192
-+#, c-format
-+msgid "%u bad SACKs received"
-+msgstr ""
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr ""
-+
-+#: ../statistics.c:194
-+#, c-format
-+msgid "Detected reordering %u times using SACK"
-+msgstr ""
-+
-+#: ../statistics.c:195
-+#, c-format
-+msgid "Detected reordering %u times using time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:196
-+#, c-format
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:197
-+#, c-format
-+msgid "%u congestion windows fully recovered"
-+msgstr ""
-+
-+#: ../statistics.c:198
-+#, c-format
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr ""
-+
-+#: ../statistics.c:199
-+#, c-format
-+msgid "%u congestion window recovered using DSACK"
-+msgstr ""
-+
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr ""
-+
-+#: ../statistics.c:201
-+#, c-format
-+msgid "%u retransmits lost"
-+msgstr ""
-+
-+#: ../statistics.c:202
-+#, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr ""
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr ""
-+
-+#: ../statistics.c:205
-+#, c-format
-+msgid "%u fast retransmits"
-+msgstr ""
-+
-+#: ../statistics.c:206
-+#, c-format
-+msgid "%u forward retransmits"
-+msgstr ""
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr ""
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr ""
-+
-+#: ../statistics.c:209
-+#, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr ""
-+
-+#: ../statistics.c:210
-+#, c-format
-+msgid "%u sack retransmits failed"
-+msgstr ""
-+
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr ""
-+
-+#: ../statistics.c:212
-+#, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr ""
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr ""
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr ""
-+
-+#: ../statistics.c:215
-+#, c-format
-+msgid "%u DSACKs received"
-+msgstr ""
-+
-+#: ../statistics.c:216
-+#, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr ""
-+
-+#: ../statistics.c:217
-+#, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr ""
-+
-+#: ../statistics.c:218
-+#, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr ""
-+
-+#: ../statistics.c:219
-+#, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr ""
-+
-+#: ../statistics.c:220
-+#, c-format
-+msgid "%u connections aborted due to memory pressure"
-+msgstr ""
-+
-+#: ../statistics.c:221
-+#, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr ""
-+
-+#: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr ""
-+
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr ""
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr ""
-+
-+#: ../statistics.c:292
- msgid "enabled"
- msgstr ""
- 
--#: ../statistics.c:253
-+#: ../statistics.c:292
- msgid "disabled"
- msgstr ""
- 
--#: ../statistics.c:336
-+#: ../statistics.c:375
- msgid "error parsing /proc/net/snmp"
- msgstr ""
- 
--#: ../statistics.c:349
-+#: ../statistics.c:388
- msgid "cannot open /proc/net/snmp"
- msgstr ""
- 
-@@ -1617,7 +2002,7 @@
- msgid "Cannot change line discipline to `%s'.\n"
- msgstr ""
- 
--#: ../lib/af.c:153 ../lib/hw.c:156
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr ""
- 
-@@ -1633,11 +2018,11 @@
- msgid "IPv6"
- msgstr ""
- 
--#: ../lib/af.c:164 ../lib/hw.c:177
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr ""
- 
--#: ../lib/af.c:167 ../lib/hw.c:183
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr ""
- 
-@@ -1649,7 +2034,7 @@
- msgid "Appletalk DDP"
- msgstr ""
- 
--#: ../lib/af.c:176 ../lib/hw.c:218
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr ""
- 
-@@ -1657,19 +2042,21 @@
- msgid "CCITT X.25"
- msgstr ""
- 
--#: ../lib/af.c:182 ../lib/hw.c:180
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr ""
- 
--#: ../lib/af.c:185 ../lib/hw.c:168
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr ""
- 
- #: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr ""
- 
- #: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr ""
- 
-@@ -1694,6 +2081,7 @@
- msgstr ""
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
- msgstr ""
- 
-@@ -1712,22 +2100,21 @@
- msgstr ""
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr ""
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr ""
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr ""
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1783,90 +2170,94 @@
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr ""
- 
--#: ../lib/hw.c:155
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr ""
- 
--#: ../lib/hw.c:158
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:159
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:160
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:161
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:162
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:165
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr ""
- 
--#: ../lib/hw.c:171
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr ""
- 
--#: ../lib/hw.c:174
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr ""
- 
--#: ../lib/hw.c:186
-+#: ../lib/hw.c:191
- msgid "generic X.25"
- msgstr ""
- 
--#: ../lib/hw.c:189
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr ""
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
- msgstr ""
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr ""
- 
--#: ../lib/hw.c:196
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr ""
- 
--#: ../lib/hw.c:199
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr ""
- 
--#: ../lib/hw.c:202
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr ""
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr ""
- 
--#: ../lib/hw.c:206
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr ""
- 
--#: ../lib/hw.c:209
-+#: ../lib/hw.c:214
- msgid "IrLAP"
- msgstr ""
- 
--#: ../lib/hw.c:212
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr ""
- 
--#: ../lib/hw.c:214
-+#: ../lib/hw.c:219
- msgid "16/4 Mbps Token Ring (New)"
- msgstr ""
- 
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
- #: ../lib/inet.c:153 ../lib/inet6.c:79
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
-@@ -1877,131 +2268,157 @@
- msgstr ""
- 
- #: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/inet6_gr.c:74
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
- msgstr ""
- 
- #: ../lib/inet6_gr.c:76
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
- msgstr ""
- 
- #: ../lib/inet6_gr.c:150
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr ""
- 
- #: ../lib/inet6_gr.c:153
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
- msgstr ""
- 
- #: ../lib/inet6_gr.c:157
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
- msgstr ""
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr ""
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr ""
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr ""
- 
- #: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr ""
- 
-@@ -2011,14 +2428,17 @@
- msgstr ""
- 
- #: ../lib/inet_sr.c:174
-+#, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr ""
- 
-@@ -2033,73 +2453,90 @@
- msgstr ""
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
- msgstr ""
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
- msgstr ""
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
- msgstr ""
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
- msgstr ""
- 
- #: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr ""
- 
- #: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr ""
- 
- #: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
- msgstr ""
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr ""
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
- msgstr ""
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
- msgstr ""
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr ""
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
- msgstr ""
- 
-@@ -2108,287 +2545,314 @@
- msgstr ""
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
- msgstr ""
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr ""
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr ""
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr ""
- 
--#: ../lib/interface.c:164
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
- msgstr ""
- 
--#: ../lib/interface.c:316
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr ""
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:556
-+#: ../lib/interface.c:571
- msgid "Device not found"
- msgstr ""
- 
--#: ../lib/interface.c:560
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
- msgstr ""
- 
--#: ../lib/interface.c:593
-+#: ../lib/interface.c:608
- msgid "     - no statistics available -"
- msgstr ""
- 
--#: ../lib/interface.c:597
-+#: ../lib/interface.c:612
-+#, c-format
- msgid "[NO FLAGS]"
- msgstr ""
- 
--#: ../lib/interface.c:673
-+#: ../lib/interface.c:688
- #, c-format
- msgid "%-9.9s Link encap:%s  "
- msgstr ""
- 
--#: ../lib/interface.c:678
-+#: ../lib/interface.c:693
- #, c-format
- msgid "HWaddr %s  "
- msgstr ""
- 
--#: ../lib/interface.c:681
-+#: ../lib/interface.c:696
- #, c-format
- msgid "Media:%s"
- msgstr ""
- 
--#: ../lib/interface.c:683
-+#: ../lib/interface.c:698
-+#, c-format
- msgid "(auto)"
- msgstr ""
- 
--#: ../lib/interface.c:690
-+#: ../lib/interface.c:705
- #, c-format
- msgid "          %s addr:%s "
- msgstr ""
- 
--#: ../lib/interface.c:693
-+#: ../lib/interface.c:708
- #, c-format
- msgid " P-t-P:%s "
- msgstr ""
- 
--#: ../lib/interface.c:696
-+#: ../lib/interface.c:711
- #, c-format
- msgid " Bcast:%s "
- msgstr ""
- 
--#: ../lib/interface.c:698
-+#: ../lib/interface.c:713
- #, c-format
- msgid " Mask:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:715
-+#: ../lib/interface.c:730
- #, c-format
- msgid "          inet6 addr: %s/%d"
- msgstr ""
- 
--#: ../lib/interface.c:717
-+#: ../lib/interface.c:732
-+#, c-format
- msgid " Scope:"
- msgstr ""
- 
--#: ../lib/interface.c:720
-+#: ../lib/interface.c:735
-+#, c-format
- msgid "Global"
- msgstr ""
- 
--#: ../lib/interface.c:723
-+#: ../lib/interface.c:738
-+#, c-format
- msgid "Link"
- msgstr ""
- 
--#: ../lib/interface.c:726
-+#: ../lib/interface.c:741
-+#, c-format
- msgid "Site"
- msgstr ""
- 
--#: ../lib/interface.c:729
-+#: ../lib/interface.c:744
-+#, c-format
- msgid "Compat"
- msgstr ""
- 
--#: ../lib/interface.c:732
-+#: ../lib/interface.c:747
-+#, c-format
- msgid "Host"
- msgstr ""
- 
--#: ../lib/interface.c:735
-+#: ../lib/interface.c:750
-+#, c-format
- msgid "Unknown"
- msgstr ""
- 
--#: ../lib/interface.c:750
-+#: ../lib/interface.c:765
- #, c-format
- msgid "          IPX/Ethernet II addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:753
-+#: ../lib/interface.c:768
- #, c-format
- msgid "          IPX/Ethernet SNAP addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:756
-+#: ../lib/interface.c:771
- #, c-format
- msgid "          IPX/Ethernet 802.2 addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:759
-+#: ../lib/interface.c:774
- #, c-format
- msgid "          IPX/Ethernet 802.3 addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:769
-+#: ../lib/interface.c:784
- #, c-format
- msgid "          EtherTalk Phase 2 addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:778
-+#: ../lib/interface.c:793
- #, c-format
- msgid "          econet addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:785
-+#: ../lib/interface.c:800
-+#, c-format
- msgid "[NO FLAGS] "
- msgstr ""
- 
--#: ../lib/interface.c:787
-+#: ../lib/interface.c:802
-+#, c-format
- msgid "UP "
- msgstr ""
- 
--#: ../lib/interface.c:789
-+#: ../lib/interface.c:804
-+#, c-format
- msgid "BROADCAST "
- msgstr ""
- 
--#: ../lib/interface.c:791
-+#: ../lib/interface.c:806
-+#, c-format
- msgid "DEBUG "
- msgstr ""
- 
--#: ../lib/interface.c:793
-+#: ../lib/interface.c:808
-+#, c-format
- msgid "LOOPBACK "
- msgstr ""
- 
--#: ../lib/interface.c:795
-+#: ../lib/interface.c:810
-+#, c-format
- msgid "POINTOPOINT "
- msgstr ""
- 
--#: ../lib/interface.c:797
-+#: ../lib/interface.c:812
-+#, c-format
- msgid "NOTRAILERS "
- msgstr ""
- 
--#: ../lib/interface.c:799
-+#: ../lib/interface.c:814
-+#, c-format
- msgid "RUNNING "
- msgstr ""
- 
--#: ../lib/interface.c:801
-+#: ../lib/interface.c:816
-+#, c-format
- msgid "NOARP "
- msgstr ""
- 
--#: ../lib/interface.c:803
-+#: ../lib/interface.c:818
-+#, c-format
- msgid "PROMISC "
- msgstr ""
- 
--#: ../lib/interface.c:805
-+#: ../lib/interface.c:820
-+#, c-format
- msgid "ALLMULTI "
- msgstr ""
- 
--#: ../lib/interface.c:807
-+#: ../lib/interface.c:822
-+#, c-format
- msgid "SLAVE "
- msgstr ""
- 
--#: ../lib/interface.c:809
-+#: ../lib/interface.c:824
-+#, c-format
- msgid "MASTER "
- msgstr ""
- 
--#: ../lib/interface.c:811
-+#: ../lib/interface.c:826
-+#, c-format
- msgid "MULTICAST "
- msgstr ""
- 
--#: ../lib/interface.c:814
-+#: ../lib/interface.c:829
-+#, c-format
- msgid "DYNAMIC "
- msgstr ""
- 
- #. DONT FORGET TO ADD THE FLAGS IN ife_print_short
--#: ../lib/interface.c:817
-+#: ../lib/interface.c:832
- #, c-format
- msgid " MTU:%d  Metric:%d"
- msgstr ""
- 
--#: ../lib/interface.c:821
-+#: ../lib/interface.c:836
- #, c-format
- msgid "  Outfill:%d  Keepalive:%d"
- msgstr ""
- 
--#: ../lib/interface.c:835
-+#: ../lib/interface.c:850
- #, c-format
- msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
- msgstr ""
- 
--#: ../lib/interface.c:840
-+#: ../lib/interface.c:855
- #, c-format
- msgid "             compressed:%lu\n"
- msgstr ""
- 
--#: ../lib/interface.c:852
-+#: ../lib/interface.c:895
- #, c-format
- msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
- msgstr ""
- 
--#: ../lib/interface.c:856
-+#: ../lib/interface.c:899
- #, c-format
- msgid "          collisions:%lu "
- msgstr ""
- 
--#: ../lib/interface.c:858
-+#: ../lib/interface.c:901
- #, c-format
- msgid "compressed:%lu "
- msgstr ""
- 
--#: ../lib/interface.c:860
-+#: ../lib/interface.c:903
- #, c-format
- msgid "txqueuelen:%d "
- msgstr ""
- 
--#: ../lib/interface.c:862
-+#: ../lib/interface.c:905
- #, c-format
- msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
- msgstr ""
- 
--#: ../lib/interface.c:873
-+#: ../lib/interface.c:916
- #, c-format
- msgid "Interrupt:%d "
- msgstr ""
- 
- #. Only print devices using it for
- #. I/O maps
--#: ../lib/interface.c:876
-+#: ../lib/interface.c:919
- #, c-format
- msgid "Base address:0x%x "
- msgstr ""
- 
--#: ../lib/interface.c:878
-+#: ../lib/interface.c:921
- #, c-format
- msgid "Memory:%lx-%lx "
- msgstr ""
- 
--#: ../lib/interface.c:881
-+#: ../lib/interface.c:924
- #, c-format
- msgid "DMA chan:%x "
- msgstr ""
- 
- #: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr ""
- 
-@@ -2413,14 +2877,17 @@
- msgstr ""
- 
- #: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr ""
- 
- #: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr ""
- 
- #: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr ""
- 
-@@ -2449,6 +2916,7 @@
- msgstr ""
- 
- #: ../slattach.c:192
-+#, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr ""
- 
-@@ -2468,18 +2936,22 @@
- msgstr ""
- 
- #: ../slattach.c:468
-+#, c-format
- msgid "slattach: tty name too long\n"
- msgstr ""
- 
- #: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr ""
- 
- #: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
- msgstr ""
- 
- #: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr ""
- 
-@@ -2489,6 +2961,7 @@
- msgstr ""
- 
- #: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr ""
- 
---- net-tools-1.60.orig/po/cs.po
-+++ net-tools-1.60/po/cs.po
-@@ -5,7 +5,8 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: net-tools-1.51\n"
--"POT-Creation-Date: 2000-02-14 02:31+0100\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
- "PO-Revision-Date: 1999-08-29 23:20+0200\n"
- "Last-Translator: Jiøí Pavlovský <pavlovsk@ff.cuni.cz>\n"
- "Language-Team: Czech <cs@li.org>\n"
-@@ -13,96 +14,110 @@
- "Content-Type: text/plain; charset=iso-8859-2\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:110 ../arp.c:269
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
- msgstr "arp: je tøeba jméno poèítaèe\n"
- 
--#: ../arp.c:207 ../arp.c:221
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
- msgstr "Pro %s neexistuje ARP polo¾ka\n"
- 
--#: ../arp.c:239
-+#: ../arp.c:248
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr "arp: HW adresu `%s' nelze zjistit: %s\n"
- 
--#: ../arp.c:243
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr "arp: chybnì zadaný typ protokolu\n"
- 
--#: ../arp.c:252
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
- msgstr "arp: zaøízení `%s' má Hw adresu %s `%s'.\n"
- 
--#: ../arp.c:282
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
- msgstr "arp: je tøeba hardwarová adresa\n"
- 
--#: ../arp.c:290
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr "arp: nesprávná hardwarová adresa\n"
- 
--#: ../arp.c:387
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr "arp: databázi ethernetových adres %s nelze otevøít!\n"
- 
--#: ../arp.c:403
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr "arp: syntaktická chyba na øádku %u databáze ethernetových adres %s!\n"
- 
--#: ../arp.c:416
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr ""
- "arp: polo¾ku na øádku %u databáze ethernetových adres %s nelze nastavit!\n"
- 
--#: ../arp.c:437
--msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
-+#: ../arp.c:448
-+#, fuzzy, c-format
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
- msgstr "Adresa\t\t\t HWtyp\t HWadresa\t     Pøíz  Maska\t\t   Rozhraní\n"
- 
--#: ../arp.c:467
-+#: ../arp.c:476
-+#, fuzzy
-+msgid "<from_interface>"
-+msgstr " rozhraní %s\n"
-+
-+#: ../arp.c:478
- msgid "(incomplete)"
- msgstr "(nekompletní)"
- 
--#: ../arp.c:484
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr "%s (%s) na "
- 
--#: ../arp.c:490
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
- msgstr "<nekompletní>"
- 
--#: ../arp.c:496
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
- msgstr "sí»ová maska %s "
- 
--#: ../arp.c:513
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr "na %s\n"
- 
--#: ../arp.c:592
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr "Polo¾ky: %d\tVynecháno: %d\tNalezeno: %d\n"
- 
--#: ../arp.c:596
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr "%s (%s) -- ¾ádná polo¾ka\n"
- 
--#: ../arp.c:598
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
- msgstr "arp: ¾ádná z polo¾ek (%d) nevyhovuje.\n"
- 
--#: ../arp.c:613
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-@@ -112,49 +127,46 @@
- "  arp [-vn]  [<HW>] [-i <if> [-a] [<poèítaè>]             <-Zobrazí ARP "
- "cache\n"
- 
--#: ../arp.c:614
-+#: ../arp.c:627
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
- msgstr ""
- "  arp [-v]          [-i <if>] -d <poèítaè> [pub][nopub]   <-Sma¾e polo¾ku "
- "ARP\n"
- 
--#: ../arp.c:615
--#, fuzzy
-+#: ../arp.c:628
-+#, fuzzy, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
- msgstr ""
- "  arp [-vnD] [<HW>] [-i <if>] -f <soubor>                 <-Pøidá polo¾ku "
- "ze\n"
- "                                                          souboru\n"
- 
--#: ../arp.c:616
-+#: ../arp.c:629
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
- msgstr ""
- "  arp [-v]   [<HW> [-i <if> -s   <poèítaè> <hwadr> [temp][nopub] <-Pøidá "
- "polo¾ku\n"
- 
--#: ../arp.c:617
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--"  arp [-v]   [<HW>] [-i <if>] -s <soubor> <hwadr> [sí»mask <èís>]  <-''-\n"
--
--#: ../arp.c:618
-+#: ../arp.c:630
-+#, fuzzy, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
- msgstr ""
- "  arp [-v]   [<HW> [-i <if> -Ds  <poèítaè> <if> [sí»mask <èís>] pub      "
- "<-''-\n"
- 
--#: ../arp.c:620
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
-@@ -162,126 +174,134 @@
- "        -a                       zobrazí jmna v¹ech poèítaèù alternativním\n"
- "                                 (BSD) zpùsobem\n"
- 
--#: ../arp.c:621
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr "        -s, --set                nastaví novou ARP polo¾ku\n"
- 
--#: ../arp.c:622
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr "        -d, --delete             sma¾e zadanou ARP polo¾ku\n"
- 
--#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr ""
- "        -v, --verbose            bude vypisovat podrobné zprávy\n"
- "                                 o èinnosti\n"
- 
--#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
--msgid "        -n, --numeric            dont resolve names\n"
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, fuzzy, c-format
-+msgid "        -n, --numeric            don't resolve names\n"
- msgstr ""
- "        -n, --numeric            nebude pøevádìt èíselné adresy\n"
- "                                 na kanonická jména\n"
- 
--#: ../arp.c:625
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
- msgstr "        -i, --device             zadává sí»ové rozhraní (napø. eth0)\n"
- 
--#: ../arp.c:626
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
- msgstr "        -D, --use-device         ète <hwadr> ze zadaného zaøízení\n"
- 
--#: ../arp.c:627
--#, fuzzy
-+#: ../arp.c:639
-+#, fuzzy, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr "         -r, --route              vypí¹e smìrovací tabulku\n"
- 
--#: ../arp.c:628
--#, fuzzy
-+#: ../arp.c:640
-+#, fuzzy, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
- "        -f, --file               ète nové polo¾ky ze souboru\n"
- "\n"
- 
--#: ../arp.c:630 ../rarp.c:181
-+#: ../arp.c:642 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
- msgstr ""
- "  <HW>=Pou¾ijte '-H <hw> pro zadání hardwarového typu adresy.\n"
- "  Implicitnì: %s\n"
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr "  Seznam mo¾ných hardwarových typù (podporujících ARP):\n"
- 
--#: ../arp.c:664
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr "hardwarový typ %s není podporován!\n"
- 
--#: ../arp.c:668
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr "tøída adres %s není podporována!\n"
- 
--#: ../arp.c:703
-+#: ../arp.c:716
-+#, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr "arp: pøepínaè -N není zatím podporován\n"
- 
--#: ../arp.c:713
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr "arp: neznámá tøída adres %s.\n"
- 
--#: ../arp.c:722
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr "arp: neznámý hardwarový typ %s.\n"
- 
--#: ../arp.c:741
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
- msgstr "arp: %s: jádro podporuje pouze 'inet'.\n"
- 
--#: ../arp.c:746
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr "arp: hardwarový typ %s nepodporuje ARP.\n"
- 
--#: ../hostname.c:69
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
- msgstr "Nastavuji jméno uzlu na `%s'\n"
- 
--#: ../hostname.c:74
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr "%s: jméno uzlu mù¾e zmìnit pouze superu¾ivatel\n"
- 
--#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr "jméno %s je pøíli¹ dlouhé\n"
- 
--#: ../hostname.c:89
-+#: ../hostname.c:91
- #, c-format
- msgid "Setting hostname to `%s'\n"
- msgstr "Nastavuji jméno poèítaèe na `%s'\n"
- 
--#: ../hostname.c:94
-+#: ../hostname.c:96
- #, c-format
- msgid "%s: you must be root to change the host name\n"
- msgstr "%s: jméno poèítaèe mù¾e zmìnit pouze superu¾ivatel\n"
- 
--#: ../hostname.c:108
-+#: ../hostname.c:109
- #, c-format
- msgid "Setting domainname to `%s'\n"
- msgstr "Nastavuji jméno domény na `%s'\n"
- 
--#: ../hostname.c:113
-+#: ../hostname.c:114
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
- msgstr "%s: jméno domény mù¾e zmìnit pouze superu¾ivatel\n"
-@@ -306,26 +326,29 @@
- msgid "Result: h_addr_list=`%s'\n"
- msgstr "Výsledek: h_addr_list=`%s'\n"
- 
--#: ../hostname.c:209
-+#: ../hostname.c:208
- #, c-format
- msgid "%s: can't open `%s'\n"
- msgstr "%s: `%s' nelze otevøít\n"
- 
--#: ../hostname.c:223
-+#: ../hostname.c:222
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
- msgstr ""
- "Pou¾ití:\n"
- "    hostname [-v] {jméno|-F soubor}       nastaví jméno poèítaèe (ze "
- "souboru)\n"
- 
--#: ../hostname.c:224
-+#: ../hostname.c:223
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
- "    domainname [-v] {jméno|-F soubor}     nastaví jméno NIS domény (ze\n"
- "                                          souboru)\n"
- 
--#: ../hostname.c:226
-+#: ../hostname.c:225
-+#, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
-@@ -333,11 +356,13 @@
- "    nodename [-v] {jméno|-F soubor}       nastaví jméno DECnet uzlu (ze\n"
- "                                          souboru)\n"
- 
--#: ../hostname.c:228
-+#: ../hostname.c:227
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr "    hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  vypí¹e formátované jméno\n"
- 
--#: ../hostname.c:229
-+#: ../hostname.c:228
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
-@@ -345,7 +370,8 @@
- "    hostname [-v]                         vypí¹e jméno poèítaèe\n"
- "\n"
- 
--#: ../hostname.c:230
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
-@@ -353,7 +379,8 @@
- "    hostname -V|--version|-h|--help       vypí¹e informace a skonèí\n"
- "\n"
- 
--#: ../hostname.c:231
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
-@@ -361,35 +388,43 @@
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- 
--#: ../hostname.c:232
-+#: ../hostname.c:231
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr "    -s, --short           krátké jméno poèítaèe\n"
- 
--#: ../hostname.c:233
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr "    -a, --alias           pøezdívky\n"
- 
--#: ../hostname.c:234
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr "    -i, --ip-address      adresy odpovídající jménu poèítaèe\n"
- 
--#: ../hostname.c:235
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr "    -f, --fqdn, --long    dlouhé jméno poèítaèe (kanonické)\n"
- 
--#: ../hostname.c:236
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
- msgstr "    -d, --domain          jméno DNS domény\n"
- 
--#: ../hostname.c:237
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
- msgstr "    -y, --yp, --nis       jméno NIS/YP domény\n"
- 
--#: ../hostname.c:239
-+#: ../hostname.c:238
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
- msgstr "    -n, --node            jméno DECnet uzlu\n"
- 
--#: ../hostname.c:241
-+#: ../hostname.c:240
-+#, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
-@@ -397,7 +432,8 @@
- "    -F, --file            ète jméno poèítaèe èi nis domény ze souboru\n"
- "\n"
- 
--#: ../hostname.c:243
-+#: ../hostname.c:242
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -412,6 +448,7 @@
- msgstr "%s: Tímto pøíkazem nelze DNS jméno domény zmìnit\n"
- 
- #: ../hostname.c:339
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
-@@ -421,6 +458,7 @@
- "zmìnit\n"
- 
- #: ../hostname.c:340
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
- "DNS jméno domény (je souèástí kanonického jména poèítaèe) v souboru\n"
-@@ -441,349 +479,223 @@
- msgid "getnodename()=`%s'\n"
- msgstr "getnodename()=`%s'\n"
- 
--#: ../ifconfig.c:159
--#, c-format
--msgid "%-9.9s Link encap:%s  "
--msgstr "%-9.9s Zapouzdøení:%s  "
-+#: ../ifconfig.c:107
-+#, fuzzy, c-format
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr ""
-+"Rozhr   MTU Met    PØ-OK PØ-CHYB PØ-ZAH PØ-PØT   OD-OK OD-CHYB OD-ZAH OD-PØT "
-+"PØZ\n"
- 
--#: ../ifconfig.c:164
--#, c-format
--msgid "HWaddr %s  "
--msgstr "HWadr %s  "
-+#: ../ifconfig.c:129 ../ifconfig.c:161
-+#, fuzzy, c-format
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr "%s: chyba pøi získávání informací o rozhraní %s\n"
- 
--#: ../ifconfig.c:167
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
- #, c-format
--msgid "Media:%s"
--msgstr "Médium:%s"
-+msgid "No support for INET on this system.\n"
-+msgstr "Tento systém nepodporuje INET.\n"
- 
--#: ../ifconfig.c:169
--msgid "(auto)"
--msgstr "(auto)"
-+#: ../ifconfig.c:193
-+#, fuzzy, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr "%s: chyba pøi získávání informací o rozhraní %s\n"
- 
--#: ../ifconfig.c:176
--#, c-format
--msgid "          %s addr:%s "
--msgstr "          %s adr:%s "
-+#: ../ifconfig.c:202
-+#, fuzzy, c-format
-+msgid ""
-+"Usage:\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+msgstr ""
-+"Pou¾ití:\n"
-+"  ifconfig [-a] [-i] [-v] <rozhraní> [[<AF>] <adresa>]\n"
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:204
- #, c-format
--msgid " P-t-P:%s "
--msgstr " P-t-P:%s "
-+msgid "  [add <address>[/<prefixlen>]]\n"
-+msgstr "  [add <adresa>[/<délka prefixu>]]\n"
- 
--# V ostatních katalozích se pøekládá Broadcast -> v¹esmìrové vysílání.
--# Tudi¾ bcast -> V¹esmìr :)
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:205
- #, c-format
--msgid " Bcast:%s "
--msgstr " V¹esmìr:%s "
-+msgid "  [del <address>[/<prefixlen>]]\n"
-+msgstr "  [del <adresa>[/<délka prefixu>]]\n"
- 
--#: ../ifconfig.c:184
-+#: ../ifconfig.c:206
- #, c-format
--msgid " Mask:%s\n"
--msgstr "Maska:%s\n"
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<adresa>]]  [[-]pointopoint [<adresa>]]\n"
- 
--#: ../ifconfig.c:201
-+#: ../ifconfig.c:207
- #, c-format
--msgid "          inet6 addr: %s/%d"
--msgstr "          inet6-adr: %s/%d"
-+msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+msgstr "  [netmask <adresa>]  [dstaddr <adresa>]  [tunnel <adresa>]\n"
- 
--#: ../ifconfig.c:203
--msgid " Scope:"
--msgstr " Rozsah:"
-+#: ../ifconfig.c:210
-+#, c-format
-+msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
--#: ../ifconfig.c:206
--msgid "Global"
--msgstr "Globál"
-+#: ../ifconfig.c:212
-+#, c-format
-+msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+msgstr "  [hw <HW> <adresa>]  [metric <NN>]  [mtu <NN>]\n"
- 
--#: ../ifconfig.c:209
--msgid "Link"
--msgstr "Linka"
-+#: ../ifconfig.c:213
-+#, c-format
-+msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
--#: ../ifconfig.c:212
--msgid "Site"
--msgstr "Stanovi¹tì"
-+#: ../ifconfig.c:214
-+#, c-format
-+msgid "  [multicast]  [[-]promisc]\n"
-+msgstr "  [multicast]  [[-]promisc]\n"
- 
- #: ../ifconfig.c:215
--msgid "Compat"
--msgstr "Kompatibilita"
-+#, c-format
-+msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <typ>]\n"
- 
--#: ../ifconfig.c:218
--msgid "Host"
--msgstr "Poèítaè"
-+#: ../ifconfig.c:217
-+#, c-format
-+msgid "  [txqueuelen <NN>]\n"
-+msgstr "  [txqueuelen délka]\n"
- 
--#: ../ifconfig.c:221
--msgid "Unknown"
--msgstr "Neznám."
-+#: ../ifconfig.c:220
-+#, c-format
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
- 
--#: ../ifconfig.c:236
-+#: ../ifconfig.c:222
- #, c-format
--msgid "          IPX/Ethernet II addr:%s\n"
--msgstr "          IPX/Ethernet II adr: %s\n"
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr ""
-+"  [up|down] ...\n"
-+"\n"
- 
--#: ../ifconfig.c:239
-+#: ../ifconfig.c:224
- #, c-format
--msgid "          IPX/Ethernet SNAP addr:%s\n"
--msgstr "          IPX/Ethernet SNAP adr:%s\n"
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "   <HW>=Hardwarový Typ.\n"
- 
--#: ../ifconfig.c:242
-+#: ../ifconfig.c:225
- #, c-format
--msgid "          IPX/Ethernet 802.2 addr:%s\n"
--msgstr "          IPX/Ethernet 802.2 adr:%s\n"
-+msgid "  List of possible hardware types:\n"
-+msgstr "  Seznam mo¾ných hardwarových typù:\n"
- 
--#: ../ifconfig.c:245
-+#. 1 = ARPable
-+#: ../ifconfig.c:227
- #, c-format
--msgid "          IPX/Ethernet 802.3 addr:%s\n"
--msgstr "          IPX/Ethernet 802.3 adr:%s\n"
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "   <AF>=tøída adres. Implicitní: %s\n"
- 
--#: ../ifconfig.c:255
-+#: ../ifconfig.c:228
- #, c-format
--msgid "          EtherTalk Phase 2 addr:%s\n"
--msgstr "          EtherTalk Phase 2 adr:%s\n"
-+msgid "  List of possible address families:\n"
-+msgstr "  Seznam mo¾ných tøíd adres:\n"
- 
--#: ../ifconfig.c:264
-+#: ../ifconfig.c:303
- #, c-format
--msgid "          econet addr:%s\n"
--msgstr "          econet adr:%s\n"
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
- 
--# Hic sunt leones ...
--#: ../ifconfig.c:270
--msgid "[NO FLAGS] "
--msgstr "[®ÁDNÉ PØÍZNAKY]"
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:272
--msgid "UP "
--msgstr "AKTIVOVÁNO "
-+#: ../ifconfig.c:380
-+#, c-format
-+msgid "Unknown media type.\n"
-+msgstr "Neznámý typ média.\n"
- 
--#: ../ifconfig.c:274
--msgid "BROADCAST "
--msgstr "V©ESMÌROVÉ_VYSÍLÁNÍ "
-+#: ../ifconfig.c:417
-+#, c-format
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
- 
--#: ../ifconfig.c:276
--msgid "DEBUG "
--msgstr "DEBUG "
-+#: ../ifconfig.c:429
-+#, c-format
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:278
--msgid "LOOPBACK "
--msgstr "SMYÈKA "
-+#: ../ifconfig.c:441
-+#, c-format
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:280
--msgid "POINTOPOINT "
--msgstr "POINTOPOINT "
-+#: ../ifconfig.c:465
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr ""
- 
--# ??
--#: ../ifconfig.c:282
--msgid "NOTRAILERS "
--msgstr "NOTRAILERS "
-+#: ../ifconfig.c:523
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:284
--msgid "RUNNING "
--msgstr "BÌ®Í "
-+#: ../ifconfig.c:652
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:286
--msgid "NOARP "
--msgstr "NEARP "
-+#: ../ifconfig.c:684
-+#, c-format
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr ""
- 
--#: ../ifconfig.c:288
--msgid "PROMISC "
--msgstr "PROMISK "
-+#: ../ifconfig.c:693
-+#, c-format
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: adresa %s je nesprávná.\n"
- 
--#: ../ifconfig.c:290
--msgid "ALLMULTI "
--msgstr "ALLMULTI "
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-+#, c-format
-+msgid "No support for INET6 on this system.\n"
-+msgstr "Tento systém nepodporuje INET6.\n"
- 
--#: ../ifconfig.c:292
--msgid "SLAVE "
--msgstr "SLAVE "
-+#: ../ifconfig.c:780 ../ifconfig.c:871
-+#, c-format
-+msgid "Interface %s not initialized\n"
-+msgstr ""
- 
--#: ../ifconfig.c:294
--msgid "MASTER "
--msgstr "MASTER "
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, fuzzy, c-format
-+msgid "Bad address.\n"
-+msgstr "%s: adresa %s je nesprávná.\n"
- 
--#: ../ifconfig.c:296
--msgid "MULTICAST "
--msgstr "MULTICAST "
--
--#: ../ifconfig.c:299
--msgid "DYNAMIC "
--msgstr "DYNAMIC "
--
--#: ../ifconfig.c:302
--#, c-format
--msgid " MTU:%d  Metric:%d"
--msgstr " MTU:%d  Metrika:%d"
--
--#: ../ifconfig.c:306
--#, c-format
--msgid "  Outfill:%d  Keepalive:%d"
--msgstr "  Outfill:%d  Keepalive:%d"
--
--#: ../ifconfig.c:320
--#, c-format
--msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
--msgstr "pøijmutých paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu rámcù:%lu\n"
--
--#: ../ifconfig.c:325
--#, c-format
--msgid "             compressed:%lu\n"
--msgstr "             komprimováno:%lu\n"
--
--# carrier?
--#: ../ifconfig.c:329
--#, c-format
--msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
--msgstr "odeslaných paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu pøenos:%lu\n"
--
--#: ../ifconfig.c:333
--#, c-format
--msgid "          collisions:%lu "
--msgstr "          kolizí:%lu "
--
--#: ../ifconfig.c:335
--#, c-format
--msgid "compressed:%lu "
--msgstr "komprimováno:%lu "
--
--#: ../ifconfig.c:337
--#, c-format
--msgid "txqueuelen:%d "
--msgstr "délka odchozí fronty:%d "
--
--#: ../ifconfig.c:345
--#, c-format
--msgid "Interrupt:%d "
--msgstr "Pøeru¹ení:%d "
--
--#. Only print devices using it for
--#. I/O maps
--#: ../ifconfig.c:348
--#, c-format
--msgid "Base address:0x%x "
--msgstr "Vstupnì/Výstupní port:0x%x "
--
--#: ../ifconfig.c:350
--#, c-format
--msgid "Memory:%lx-%lx "
--msgstr "Pamì»:%lx-%lx "
--
--#: ../ifconfig.c:353
--#, c-format
--msgid "DMA chan:%x "
--msgstr "Kanál DMA:%x "
--
--#: ../ifconfig.c:384 ../ifconfig.c:405
--#, c-format
--msgid "%s: unknown interface: %s\n"
--msgstr "%s: rozhraní %s není známo\n"
--
--#: ../ifconfig.c:421
--msgid ""
--"Usage:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
--msgstr ""
--"Pou¾ití:\n"
--"  ifconfig [-a] [-i] [-v] <rozhraní> [[<AF>] <adresa>]\n"
--
--#: ../ifconfig.c:425
--msgid "  [add <address>[/<prefixlen>]]\n"
--msgstr "  [add <adresa>[/<délka prefixu>]]\n"
--
--#: ../ifconfig.c:427
--msgid "  [del <address>[/<prefixlen>]]\n"
--msgstr "  [del <adresa>[/<délka prefixu>]]\n"
--
--#: ../ifconfig.c:432
--msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
--msgstr "  [[-]broadcast [<adresa>]]  [[-]pointopoint [<adresa>]]\n"
--
--#: ../ifconfig.c:433
--msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
--msgstr "  [netmask <adresa>]  [dstaddr <adresa>]  [tunnel <adresa>]\n"
--
--#: ../ifconfig.c:436
--msgid "  [outfill <NN>] [keepalive <NN>]\n"
--msgstr "  [outfill <NN>] [keepalive <NN>]\n"
--
--#: ../ifconfig.c:438
--msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
--msgstr "  [hw <HW> <adresa>]  [metric <NN>]  [mtu <NN>]\n"
--
--#: ../ifconfig.c:439
--msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--
--#: ../ifconfig.c:440
--msgid "  [multicast]  [[-]promisc]\n"
--msgstr "  [multicast]  [[-]promisc]\n"
--
--#: ../ifconfig.c:441
--msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
--msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <typ>]\n"
--
--#: ../ifconfig.c:443
--msgid "  [txqueuelen <NN>]\n"
--msgstr "  [txqueuelen délka]\n"
--
--#: ../ifconfig.c:446
--msgid "  [[-]dynamic]\n"
--msgstr "  [[-]dynamic]\n"
--
--#: ../ifconfig.c:448
--msgid ""
--"  [up|down] ...\n"
--"\n"
--msgstr ""
--"  [up|down] ...\n"
--"\n"
--
--#: ../ifconfig.c:450
--msgid "  <HW>=Hardware Type.\n"
--msgstr "   <HW>=Hardwarový Typ.\n"
--
--#: ../ifconfig.c:451
--msgid "  List of possible hardware types:\n"
--msgstr "  Seznam mo¾ných hardwarových typù:\n"
--
--#. 1 = ARPable
--#: ../ifconfig.c:453
--#, c-format
--msgid "  <AF>=Address family. Default: %s\n"
--msgstr "   <AF>=tøída adres. Implicitní: %s\n"
--
--#: ../ifconfig.c:454
--msgid "  List of possible address families:\n"
--msgstr "  Seznam mo¾ných tøíd adres:\n"
--
--#: ../ifconfig.c:593
--msgid "Unknown media type.\n"
--msgstr "Neznámý typ média.\n"
--
--#: ../ifconfig.c:881
-+#: ../ifconfig.c:885
- #, c-format
--msgid "%s: invalid %s address.\n"
--msgstr "%s: adresa %s je nesprávná.\n"
--
--#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
--msgid "No support for INET6 on this system.\n"
--msgstr "Tento systém nepodporuje INET6.\n"
--
--#: ../ifconfig.c:983
- msgid "Address deletion not supported on this system.\n"
- msgstr "Tento systém nepodporuje mazání adres.\n"
- 
--#: ../ifconfig.c:1066
--msgid "No support for INET on this system.\n"
--msgstr "Tento systém nepodporuje INET.\n"
-+#: ../ifconfig.c:957
-+#, fuzzy, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "Nevím, jak nastavit adresu tøídy %d.\n"
- 
--#: ../ifconfig.c:1076
-+#: ../ifconfig.c:983
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr "Tento systém nepodporuje ECONET.\n"
- 
--#: ../ifconfig.c:1084
-+#: ../ifconfig.c:991
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr "Nevím, jak nastavit adresu tøídy %d.\n"
- 
--#: ../netstat.c:383
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
-@@ -792,7 +704,8 @@
- "jste\n"
- "byl superu¾ivatelem)\n"
- 
--#: ../netstat.c:387
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
-@@ -801,199 +714,223 @@
- "pouze o procesech, jich¾ jste vlastníkem. Aby jste mohl vidìt v¹e, musel\n"
- "byste být superu¾ivatelem.)\n"
- 
--#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr "NASLOUCHÁ"
- 
--#: ../netstat.c:395
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr "CONN ODESLÁN"
- 
--#: ../netstat.c:396 ../netstat.c:1168
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr "DISC ODESLÁN"
- 
--#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr "SPOJENO"
- 
--#: ../netstat.c:419
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr "Aktivní NET/ROM sokety\n"
- 
--#: ../netstat.c:420
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
- msgstr ""
--"U¾ivatel   Cíl        Zdroj      Zaøízení Stav        Vr/Vs    Odch-F "
--"Pøích-F\n"
-+"U¾ivatel   Cíl        Zdroj      Zaøízení Stav        Vr/Vs    Odch-F Pøích-"
-+"F\n"
- 
--#: ../netstat.c:430 ../netstat.c:1208
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr "Chyba pøi ètení dat z %s\n"
- 
- # následující radìji ponechat v originále ?!
--#: ../netstat.c:465
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr "SYN_SENT"
- 
--#: ../netstat.c:466
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr "SYN_RECV"
- 
--#: ../netstat.c:467
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr "FIN_WAIT1"
- 
--#: ../netstat.c:468
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr "FIN_WAIT2"
- 
--#: ../netstat.c:469
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr "TIME_WAIT"
- 
--#: ../netstat.c:470
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr "ZAVØEN"
- 
--#: ../netstat.c:471
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr "CLOSE_WAIT"
- 
--#: ../netstat.c:472
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr "POSLEDNÍ ACK"
- 
--#: ../netstat.c:473
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr "LISTEN"
- 
--#: ../netstat.c:474
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr "ZAVíRÁ"
- 
--#: ../netstat.c:544
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr "varování, nesmyslný igmp6 øádek %d.\n"
- 
--#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
--#: ../netstat.c:935 ../netstat.c:940
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr "netstat: tøída adres %d není podporována !\n"
- 
--#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr "varování, nesmyslný igmp øádek %d.\n"
- 
--#: ../netstat.c:666
-+#: ../netstat.c:677
-+#, fuzzy, c-format
-+msgid "Active X.25 sockets\n"
-+msgstr "Aktivní AX.25 sokety\n"
-+
-+#. IMHO, Vr/Vs is not very usefull --SF
-+#: ../netstat.c:679
-+#, fuzzy, c-format
-+msgid ""
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
-+msgstr "Cíl        Zdroj      Zaøíz   Stav         Vr/Vs    Odhod-F Pøích-F\n"
-+
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr "varování, nesmyslný tcp øádek.\n"
- 
--#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr "vyp (0.00/%ld/%d)"
- 
--#: ../netstat.c:708
-+#: ../netstat.c:804
- #, fuzzy, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr "zap%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:713
-+#: ../netstat.c:809
- #, fuzzy, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr "zap%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:718
-+#: ../netstat.c:814
- #, fuzzy, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr "zap%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr "nezn-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:799
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr "varování, nesmyslný udp øádek.\n"
- 
--#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr "NEZNÁM"
- 
--#: ../netstat.c:860 ../netstat.c:980
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr "zap%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:949
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr "varování, nesmyslný 'raw' øádek.\n"
- 
--#: ../netstat.c:1028
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr "varování, netstat 'unix' øádek.\n"
- 
--#: ../netstat.c:1055
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr "STREAM"
- 
--#: ../netstat.c:1059
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr "DGRAM"
- 
--#: ../netstat.c:1063
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr "RAW"
- 
--#: ../netstat.c:1067
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr "RDM"
- 
--#: ../netstat.c:1071
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
- msgstr "SEQPACKET"
- 
--#: ../netstat.c:1080
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr "NEALOKOVÁN"
- 
--#: ../netstat.c:1096
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr "SPOJUJE"
- 
--#: ../netstat.c:1100
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr "SPOJEN"
- 
--#: ../netstat.c:1104
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr "ODPOJUJE"
- 
--#: ../netstat.c:1135
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
- msgstr "Aktivní sokety domény UNIX "
- 
--#: ../netstat.c:1137 ../netstat.c:1666
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr "(servery a navázaná spojení)"
- 
--#: ../netstat.c:1140 ../netstat.c:1669
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr "(pouze servery)"
- 
--#: ../netstat.c:1142 ../netstat.c:1671
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr "(w/o servery)"
- 
--#: ../netstat.c:1145
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
-@@ -1001,90 +938,92 @@
- "\n"
- "Proto Èítaè  Pøíznaky    Typ        Stav          I-Uzel"
- 
--#: ../netstat.c:1147
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr " Cesta\n"
- 
--#: ../netstat.c:1167
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr "SABM ODESLÁN"
- 
--#: ../netstat.c:1170
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr "OBNOVA"
- 
--#: ../netstat.c:1184
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr "Aktivní AX.25 sokety\n"
- 
--#: ../netstat.c:1185
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr "Cíl        Zdroj      Zaøíz   Stav         Vr/Vs    Odhod-F Pøích-F\n"
- 
--#: ../netstat.c:1228
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr "chyba pøi ètení dat z %s\n"
- 
--#: ../netstat.c:1279
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
- "State"
- msgstr ""
- "Aktivní IPX sokety\n"
--"Proto Pøích-F Odch-F Lokál adresa              Vzdálená adresa               "
--" Stav"
-+"Proto Pøích-F Odch-F Lokál adresa              Vzdálená "
-+"adresa                Stav"
- 
--#: ../netstat.c:1281
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr " U¾ivatel"
- 
--#: ../netstat.c:1315
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr "SPOJEN"
- 
--#: ../netstat.c:1323
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr "NEZ."
- 
--#: ../netstat.c:1367
--msgid "     - no statistics available -"
--msgstr "     - statistická data nejsou dostupná -"
--
--#: ../netstat.c:1370
--msgid "[NO FLAGS]"
--msgstr "[®ÁDNÉ PØÍZNAKY]"
--
--#: ../netstat.c:1400
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
- msgstr "Tabulka rozhraní v jádru\n"
- 
--#: ../netstat.c:1401
-+#: ../netstat.c:1465
-+#, fuzzy, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
- "Rozhr   MTU Met    PØ-OK PØ-CHYB PØ-ZAH PØ-PØT   OD-OK OD-CHYB OD-ZAH OD-PØT "
- "PØZ\n"
- 
--#: ../netstat.c:1404
-+#: ../netstat.c:1469
- msgid "missing interface information"
- msgstr "chybí informace o rozhraní"
- 
--#: ../netstat.c:1425
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
--"Pou¾ití: netstat [--veenNcCF] [<TA>] -r       netstat "
--"{-V|--version|-h|--help}\n"
-+"Pou¾ití: netstat [--veenNcCF] [<TA>] -r       netstat {-V|--version|-h|--"
-+"help}\n"
- 
--#: ../netstat.c:1426
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr "         netstat [-vnNcaeol] [<Soket> ...]\n"
- 
--#: ../netstat.c:1427
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
-@@ -1092,27 +1031,32 @@
- "         netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- 
--#: ../netstat.c:1429
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr "         -r, --route              vypí¹e smìrovací tabulku\n"
- 
--#: ../netstat.c:1430
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr "         -i, --interfaces         vypí¹e tabulku rozhraní\n"
- 
--#: ../netstat.c:1431
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr ""
- "         -g, --groups             vypí¹e èlenství v multicast skupinách\n"
- 
--#: ../netstat.c:1432
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr ""
- "         -s, --statistics         vypí¹e statistiku sí»ové aktivity (jako "
- "SNMP)\n"
- 
--#: ../netstat.c:1434
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
-@@ -1120,20 +1064,45 @@
- "         -M, --masquerade         vypí¹e maskovaná spojení\n"
- "\n"
- 
--#: ../netstat.c:1438 ../route.c:87
-+#: ../netstat.c:1505
-+#, fuzzy, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
-+msgstr ""
-+"        -n, --numeric            nebude pøevádìt èíselné adresy\n"
-+"                                 na kanonická jména\n"
-+
-+#: ../netstat.c:1506
-+#, fuzzy, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
-+msgstr ""
-+"        -n, --numeric            nebude pøevádìt èíselné adresy\n"
-+"                                 na kanonická jména\n"
-+
-+#: ../netstat.c:1507
-+#, fuzzy, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
-+msgstr ""
-+"        -n, --numeric            nebude pøevádìt èíselné adresy\n"
-+"                                 na kanonická jména\n"
-+
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr "         -N, --symbolic           pøevede hw jména\n"
- 
--#: ../netstat.c:1439 ../route.c:88
-+#: ../netstat.c:1509 ../route.c:88
-+#, c-format
- msgid "        -e, --extend             display other/more information\n"
- msgstr "         -e, --extend             vypí¹e podrobnìj¹í informace\n"
- 
--#: ../netstat.c:1440
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr ""
- "         -p, --programs           vypí¹e PID/jméno programu pro sokety\n"
- 
--#: ../netstat.c:1441
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
-@@ -1141,23 +1110,27 @@
- "         -c, --continuous         nepøeru¹ovaný výpis\n"
- "\n"
- 
--#: ../netstat.c:1442
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr ""
- "         -l, --listening          vypí¹e sokety, na nich¾ je nasloucháno\n"
- 
--#: ../netstat.c:1443
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr ""
- "         -a, --all, --listening   vypí¹e v¹echny sokety (implicitnì: "
- "spojené)\n"
- 
--#: ../netstat.c:1444
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr "         -o, --timers             zobrazí èasovaèe\n"
- 
--#: ../netstat.c:1445 ../route.c:89
-+#: ../netstat.c:1515 ../route.c:89
-+#, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
-@@ -1165,112 +1138,126 @@
- "         -F, --fib                zobrazí Forwarding Infomation Base\n"
- "                                  (implicitní)\n"
- 
--#: ../netstat.c:1446 ../route.c:90
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
- msgstr "         -C, --cache              místo FIB zobrazí smìrovací cache\n"
- 
--#: ../netstat.c:1448
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
--"  <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- 
--#: ../netstat.c:1449 ../route.c:92
--#, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
-+#: ../netstat.c:1519
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr "   <AF>=Pou¾ijte '-A <af>' or '--<af>' Implicitní: %s\n"
- 
--#: ../netstat.c:1450 ../route.c:93
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
- msgstr "  Seznam mo¾ných tøíd adres (podporujících smìrování):\n"
- 
--#: ../netstat.c:1663
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr "Aktivní Internetová spojení "
- 
--#: ../netstat.c:1673
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- "\n"
- "Proto Pøích-F Odch-F Místní Adresa          Vzdálená Adresa         Stav     "
- 
--#: ../netstat.c:1675
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr " U¾ivatel   I-uzel    "
- 
--#: ../netstat.c:1678
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr " Èasovaè"
- 
--#: ../netstat.c:1708
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
- msgstr "Èlenství v IPv4 skupinách\n"
- 
--#: ../netstat.c:1709
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr "Rozhraní        Èítaè  Skupina\n"
- 
--#: ../rarp.c:43
-+#: ../rarp.c:44
- msgid "This kernel does not support RARP.\n"
- msgstr "Toto jádro nepodporuje RARP.\n"
- 
--#: ../rarp.c:82
-+#: ../rarp.c:83
- #, c-format
- msgid "no RARP entry for %s.\n"
- msgstr "pro %s neexistuje RARP polo¾ka.\n"
- 
--#: ../rarp.c:95
-+#: ../rarp.c:96
- #, c-format
- msgid "%s: bad hardware address\n"
- msgstr "hardwarová adresa %s je nesprávná\n"
- 
--#: ../rarp.c:127
-+#: ../rarp.c:128
- #, c-format
- msgid "rarp: cannot open file %s:%s.\n"
- msgstr "rarp: soubor %s:%s nelze otevøít.\n"
- 
--#: ../rarp.c:139
-+#: ../rarp.c:140
- #, c-format
- msgid "rarp: format error at %s:%u\n"
- msgstr "rarp: syntaktická chyba na øádku %2$u souboru %1$s\n"
- 
--#: ../rarp.c:143 ../rarp.c:287
-+#: ../rarp.c:144 ../rarp.c:289
- #, c-format
- msgid "rarp: %s: unknown host\n"
- msgstr "rarp: poèítaè %s není znám\n"
- 
--#: ../rarp.c:146
-+#: ../rarp.c:147
- #, c-format
- msgid "rarp: cannot set entry from %s:%u\n"
- msgstr "rarp: nelze nastavit polo¾ku z øádku %2$u souboru %1$s\n"
- 
--#: ../rarp.c:175
-+#: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
- msgstr "Pou¾ití: rarp -a                            vypí¹e polo¾ky z cache.\n"
- 
--#: ../rarp.c:176
-+#: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
- msgstr "         rarp -d <jméno>                    sma¾e polo¾ku z cache.\n"
- 
--#: ../rarp.c:177
-+#: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
- msgstr ""
- "         rarp [<HW>] -s <jméno> <hwadr>       pøidá polo¾ku do cache.\n"
- 
--#: ../rarp.c:178
-+#: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
- msgstr ""
- "         rarp -f                               pøidá polo¾ky z /etc/ethers.\n"
- 
--#: ../rarp.c:179
-+#: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
-@@ -1279,24 +1266,26 @@
- "programu.\n"
- "\n"
- 
--#: ../rarp.c:236
-+#: ../rarp.c:238
- #, c-format
- msgid "%s: illegal option mix.\n"
- msgstr "Kombinace pøepínaèù %s je nesprávná.\n"
- 
--#: ../rarp.c:267
-+#: ../rarp.c:269
- #, c-format
- msgid "rarp: %s: unknown hardware type.\n"
- msgstr "rarp: hardwarový typ %s není znám.\n"
- 
--#: ../route.c:79
-+#: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
- "Pou¾ití: route [-nNvee] [-FC] [<AF>]         Zobrazí smìrovací tabulky v "
- "jádru\n"
- 
--#: ../route.c:80
-+#: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
-@@ -1305,14 +1294,16 @@
- "AF.\n"
- "\n"
- 
--#: ../route.c:82
-+#: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
- msgstr ""
- "       route {-h|--help [<AF>]               Nápovìda pro pou¾ití s AF.\n"
- 
--#: ../route.c:83
-+#: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
-@@ -1321,15 +1312,23 @@
- "       route {-V|--version}                  Vypí¹e oznaèení verze a autora\n"
- "                                             programu.\n"
- 
-+#: ../route.c:92
-+#, fuzzy, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "   <AF>=Pou¾ijte '-A <af>' or '--<af>' Implicitní: %s\n"
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr "Pou¾ití: plipconfig [-a] [-i] [-v] rozhraní\n"
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr "                  [nibble NN] [trigger NN]\n"
- 
- #: ../plipconfig.c:68
-+#, c-format
- msgid "       plipconfig -V | --version\n"
- msgstr "       plipconfig -V | --version\n"
- 
-@@ -1338,25 +1337,30 @@
- msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr "%s\tnibble %lu  trigger %lu\n"
- 
--#: ../iptunnel.c:79
-+#: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr "Pou¾ití: iptunnel { add | change | del | show } [ JMÉNO ]\n"
- 
--#: ../iptunnel.c:80
-+#: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr ""
- "          [ mode { ipip | gre | sit } ] [ vzdálená ADR ] [ místní ADR ]\n"
- 
--#: ../iptunnel.c:81
-+#: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr "          [ [i|o]seq ] [ [i|o]key KLÍÈ ] [ [i|o]csum ]\n"
- 
--#: ../iptunnel.c:82
-+#: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
- msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev ZAØÍZENÍ ]\n"
- 
--#: ../iptunnel.c:83
-+#: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
-@@ -1364,450 +1368,737 @@
- "       iptunnel -V | --version\n"
- "\n"
- 
--#: ../iptunnel.c:84
-+#: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr "Kde: JMÉNO := ØETÌZEC\n"
- 
--#: ../iptunnel.c:85
-+#: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr "       ADR := { IP-ADRESA | any }\n"
- 
--#: ../iptunnel.c:86
-+#: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr "       TOS  := { ÈÍSLO | inherit }\n"
- 
--#: ../iptunnel.c:87
-+#: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr "       TTL  := { 1..255 | inherit }\n"
- 
--#: ../iptunnel.c:88
-+#: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr "       KLÍÈ  := { DOTTED_QUAD | ÈÍSLO }\n"
- 
--#: ../iptunnel.c:326
-+#: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr "S ipip a sit nejsou klíèe povoleny.\n"
- 
--#: ../iptunnel.c:346
-+#: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr "Tunel se v¹esmìrovým vysíláním vy¾aduje zdrojovou adresu.\n"
- 
--#: ../iptunnel.c:361
-+#: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr "ttl != 0 a noptmudisc se navzájem vyluèují\n"
- 
--#: ../iptunnel.c:373
-+#: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr "re¾im tunelu (ipip, gre èi sit) nelze zjistit\n"
- 
--#: ../iptunnel.c:411
-+#: ../iptunnel.c:417
- #, c-format
- msgid "%s: %s/ip  remote %s  local %s "
- msgstr "%s: %s/ip  vzdálený %s  místní %s "
- 
--#: ../iptunnel.c:415
-+#: ../iptunnel.c:421
- msgid "unknown"
- msgstr "Neznám."
- 
--#: ../iptunnel.c:447
-+#: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr "  Zahazuje pakety mimo poøadí.\n"
- 
--#: ../iptunnel.c:449
-+#: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr "  Pøijímané pakety musí mít kontrolní souèet.\n"
- 
- # ???
--#: ../iptunnel.c:451
-+#: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr "  Øadí odchozí pakety.\n"
- 
--#: ../iptunnel.c:453
-+#: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr "  Odchozí pakety budou mít kontrolní souèet.\n"
- 
--#: ../iptunnel.c:481
-+#: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
- msgstr "Lituji, formát /proc/net/dev je chybný.\n"
- 
--#: ../iptunnel.c:494
-+#: ../iptunnel.c:500
- #, c-format
- msgid "Failed to get type of [%s]\n"
- msgstr "Typ [%s] se nepodaøilo zjistit.\n"
- 
--#: ../iptunnel.c:510
-+#: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr "RX: Pakety     Bajty        Chyby  CsumChyb MimoPoø  Mcasts\n"
- 
--#: ../iptunnel.c:513
-+#: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr "TX: Pakety     Bajty        Chyby  DeadLoop NoRoute  NoBufs\n"
- 
--#: ../statistics.c:45
-+#: ../statistics.c:47
- msgid "ICMP input histogram:"
- msgstr "histogram ICMP vstupu:"
- 
--#: ../statistics.c:46
-+#: ../statistics.c:48
- msgid "ICMP output histogram:"
- msgstr "histogram ICMP výstupu:"
- 
--#: ../statistics.c:63
-+#: ../statistics.c:65
- #, c-format
- msgid "Forwarding is %s"
- msgstr "Pøedávání je %s"
- 
--#: ../statistics.c:64
--#, c-format
--msgid "Default TTL is %d"
-+#: ../statistics.c:66
-+#, fuzzy, c-format
-+msgid "Default TTL is %u"
- msgstr "Implicitní TTL je %d"
- 
--#: ../statistics.c:65
--#, c-format
--msgid "%d total packets received"
-+#: ../statistics.c:67
-+#, fuzzy, c-format
-+msgid "%u total packets received"
- msgstr "celkem pøijmutých paketù: %d"
- 
--#: ../statistics.c:66
--#, c-format
--msgid "%d with invalid headers"
-+#: ../statistics.c:68
-+#, fuzzy, c-format
-+msgid "%u with invalid headers"
- msgstr "s nesprávnými hlavièkami: %d"
- 
--#: ../statistics.c:67
--#, c-format
--msgid "%d with invalid addresses"
-+#: ../statistics.c:69
-+#, fuzzy, c-format
-+msgid "%u with invalid addresses"
- msgstr "s nesprávnými adresami: %d"
- 
--#: ../statistics.c:68
--#, c-format
--msgid "%d forwarded"
-+#: ../statistics.c:70
-+#, fuzzy, c-format
-+msgid "%u forwarded"
- msgstr "pøedáno: %d"
- 
--#: ../statistics.c:69
--#, c-format
--msgid "%d with unknown protocol"
-+#: ../statistics.c:71
-+#, fuzzy, c-format
-+msgid "%u with unknown protocol"
- msgstr "s neznámým protokolem: %d"
- 
--#: ../statistics.c:70
--#, c-format
--msgid "%d incoming packets discarded"
-+#: ../statistics.c:72
-+#, fuzzy, c-format
-+msgid "%u incoming packets discarded"
- msgstr "poèet zahozených pøíchozích paketù: %d"
- 
--#: ../statistics.c:71
--#, c-format
--msgid "%d incoming packets delivered"
-+#: ../statistics.c:73
-+#, fuzzy, c-format
-+msgid "%u incoming packets delivered"
- msgstr "poèet doruèených pøíchozích paketù: %d"
- 
--#: ../statistics.c:72
--#, c-format
--msgid "%d requests sent out"
-+#: ../statistics.c:74
-+#, fuzzy, c-format
-+msgid "%u requests sent out"
- msgstr "poèet odeslaných po¾adavkù: %d"
- 
- #. ?
--#: ../statistics.c:73
--#, c-format
--msgid "%d outgoing packets dropped"
-+#: ../statistics.c:75
-+#, fuzzy, c-format
-+msgid "%u outgoing packets dropped"
- msgstr "poèet zahozených odchozích paketù: %d"
- 
--#: ../statistics.c:74
--#, c-format
--msgid "%d dropped because of missing route"
-+#: ../statistics.c:76
-+#, fuzzy, c-format
-+msgid "%u dropped because of missing route"
- msgstr "zahozeno kvùli chybìjící cestì: %d"
- 
--#: ../statistics.c:75
--#, c-format
--msgid "%d fragments dropped after timeout"
-+#: ../statistics.c:77
-+#, fuzzy, c-format
-+msgid "%u fragments dropped after timeout"
- msgstr "poèet fragmentù zahozených po vypr¹ení èasu: %d"
- 
--#: ../statistics.c:76
--#, c-format
--msgid "%d reassemblies required"
-+#: ../statistics.c:78
-+#, fuzzy, c-format
-+msgid "%u reassemblies required"
- msgstr "poèet nutných znovusestavení: %d"
- 
- #. ?
--#: ../statistics.c:77
--#, c-format
--msgid "%d packets reassembled ok"
-+#: ../statistics.c:79
-+#, fuzzy, c-format
-+msgid "%u packets reassembled ok"
- msgstr "poèet v poøádku znovu sestavených paketù: %d"
- 
--#: ../statistics.c:78
--#, c-format
--msgid "%d packet reassembles failed"
-+#: ../statistics.c:80
-+#, fuzzy, c-format
-+msgid "%u packet reassembles failed"
- msgstr "poèet paketù, je¾ se nepodaøilo znovu sestavit: %d"
- 
--#: ../statistics.c:79
--#, c-format
--msgid "%d fragments received ok"
-+#: ../statistics.c:81
-+#, fuzzy, c-format
-+msgid "%u fragments received ok"
- msgstr "poèet v poøádku pøijmutých fragmentù: %d"
- 
--#: ../statistics.c:80
--#, c-format
--msgid "%d fragments failed"
-+#: ../statistics.c:82
-+#, fuzzy, c-format
-+msgid "%u fragments failed"
- msgstr "poèet chybných fragmentù: %d"
- 
--#: ../statistics.c:81
--#, c-format
--msgid "%d fragments created"
-+#: ../statistics.c:83
-+#, fuzzy, c-format
-+msgid "%u fragments created"
- msgstr "poèet vytvoøených fragmentù: %d"
- 
--#: ../statistics.c:86
--#, c-format
--msgid "%d ICMP messages received"
-+#: ../statistics.c:88
-+#, fuzzy, c-format
-+msgid "%u ICMP messages received"
- msgstr "poèet pøijmutých ICMP zpráv: %d"
- 
--#: ../statistics.c:87
--#, c-format
--msgid "%d input ICMP message failed."
-+#: ../statistics.c:89
-+#, fuzzy, c-format
-+msgid "%u input ICMP message failed."
- msgstr "poèet chybných pøíchozích ICMP zpráv: %d"
- 
--#: ../statistics.c:88 ../statistics.c:101
--#, c-format
--msgid "destination unreachable: %d"
-+#: ../statistics.c:90 ../statistics.c:103
-+#, fuzzy, c-format
-+msgid "destination unreachable: %u"
- msgstr "adresát nedostupný: %d"
- 
--#: ../statistics.c:89
--#, c-format
--msgid "timeout in transit: %d"
-+#: ../statistics.c:91
-+#, fuzzy, c-format
-+msgid "timeout in transit: %u"
- msgstr "vypr¹el èas pøi pøenosu: %d"
- 
--#: ../statistics.c:90 ../statistics.c:103
--#, c-format
--msgid "wrong parameters: %d"
-+#: ../statistics.c:92 ../statistics.c:105
-+#, fuzzy, c-format
-+msgid "wrong parameters: %u"
- msgstr "chybné parametry: %d"
- 
- #. ?
--#: ../statistics.c:91
--#, c-format
--msgid "source quenchs: %d"
-+#: ../statistics.c:93
-+#, fuzzy, c-format
-+msgid "source quenches: %u"
- msgstr "øízení toku dat: %d"
- 
--#: ../statistics.c:92
--#, c-format
--msgid "redirects: %d"
-+#: ../statistics.c:94
-+#, fuzzy, c-format
-+msgid "redirects: %u"
- msgstr "zmìna cesty: %d"
- 
--#: ../statistics.c:93
--#, c-format
--msgid "echo requests: %d"
-+#: ../statistics.c:95
-+#, fuzzy, c-format
-+msgid "echo requests: %u"
- msgstr "¾ádost o echo: %d"
- 
--#: ../statistics.c:94 ../statistics.c:107
--#, c-format
--msgid "echo replies: %d"
-+#: ../statistics.c:96 ../statistics.c:109
-+#, fuzzy, c-format
-+msgid "echo replies: %u"
- msgstr "odpovìï na ¾ádost o echo: %d"
- 
--#: ../statistics.c:95
--#, c-format
--msgid "timestamp request: %d"
-+#: ../statistics.c:97
-+#, fuzzy, c-format
-+msgid "timestamp request: %u"
- msgstr "¾ádost o èas: %d"
- 
--#: ../statistics.c:96
--#, c-format
--msgid "timestamp reply: %d"
-+#: ../statistics.c:98
-+#, fuzzy, c-format
-+msgid "timestamp reply: %u"
- msgstr "odpovìï na ¾ádost o èas: %d"
- 
--#: ../statistics.c:97
--#, c-format
--msgid "address mask request: %d"
-+#: ../statistics.c:99
-+#, fuzzy, c-format
-+msgid "address mask request: %u"
- msgstr "¾ádost o masku podsítì: %d"
- 
- #. ?
--#: ../statistics.c:98
--msgid "address mask replies"
--msgstr "odpovìdi na ¾ádost o masku podsítì"
-+#: ../statistics.c:100 ../statistics.c:113
-+#, fuzzy, c-format
-+msgid "address mask replies: %u"
-+msgstr "odpovìï na ¾ádost o masku podsítì: %d"
- 
- #. ?
--#: ../statistics.c:99
--#, c-format
--msgid "%d ICMP messages sent"
-+#: ../statistics.c:101
-+#, fuzzy, c-format
-+msgid "%u ICMP messages sent"
- msgstr "poèet odeslaných ICMP zpráv: %d"
- 
--#: ../statistics.c:100
--#, c-format
--msgid "%d ICMP messages failed"
-+#: ../statistics.c:102
-+#, fuzzy, c-format
-+msgid "%u ICMP messages failed"
- msgstr "poèet chybných ICMP zpráv: %d"
- 
--#: ../statistics.c:102
--#, c-format
--msgid "time exceeded: %d"
-+#: ../statistics.c:104
-+#, fuzzy, c-format
-+msgid "time exceeded: %u"
- msgstr "vypr¹ení ¾ivotnosti: %d"
- 
- #. ?
--#: ../statistics.c:104
--#, c-format
--msgid "source quench: %d"
-+#: ../statistics.c:106
-+#, fuzzy, c-format
-+msgid "source quench: %u"
- msgstr "øízení toku dat: %d"
- 
--#: ../statistics.c:105
--#, c-format
--msgid "redirect: %d"
-+#: ../statistics.c:107
-+#, fuzzy, c-format
-+msgid "redirect: %u"
- msgstr "zmìna cesty: %d"
- 
--#: ../statistics.c:106
--#, c-format
--msgid "echo request: %d"
-+#: ../statistics.c:108
-+#, fuzzy, c-format
-+msgid "echo request: %u"
- msgstr "¾ádost o echo: %d"
- 
--#: ../statistics.c:108
--#, c-format
--msgid "timestamp requests: %d"
-+#: ../statistics.c:110
-+#, fuzzy, c-format
-+msgid "timestamp requests: %u"
- msgstr "¾ádost o èas: %d"
- 
--#: ../statistics.c:109
--#, c-format
--msgid "timestamp replies: %d"
-+#: ../statistics.c:111
-+#, fuzzy, c-format
-+msgid "timestamp replies: %u"
- msgstr "odpovìï na ¾ádost o èas: %d"
- 
--#: ../statistics.c:110
--#, c-format
--msgid "address mask requests: %d"
-+#: ../statistics.c:112
-+#, fuzzy, c-format
-+msgid "address mask requests: %u"
- msgstr "¾ádost o masku podsítì: %d"
- 
--#: ../statistics.c:111
--#, c-format
--msgid "address mask replies: %d"
--msgstr "odpovìï na ¾ádost o masku podsítì: %d"
--
--#: ../statistics.c:116
-+#: ../statistics.c:118
- #, c-format
- msgid "RTO algorithm is %s"
- msgstr "RTO algoritmus je %s"
- 
--#: ../statistics.c:120
--#, c-format
--msgid "%d active connections openings"
-+#: ../statistics.c:122
-+#, fuzzy, c-format
-+msgid "%u active connections openings"
- msgstr "poèet aktivnì navázaných spojení: %d"
- 
--#: ../statistics.c:121
--#, c-format
--msgid "%d passive connection openings"
-+#: ../statistics.c:123
-+#, fuzzy, c-format
-+msgid "%u passive connection openings"
- msgstr "poèet pasivnì navázaných spojení: %d"
- 
--#: ../statistics.c:122
--#, c-format
--msgid "%d failed connection attempts"
-+#: ../statistics.c:124
-+#, fuzzy, c-format
-+msgid "%u failed connection attempts"
- msgstr "poèet neúspì¹ných pokusù o spojení: %d"
- 
--#: ../statistics.c:123
--#, c-format
--msgid "%d connection resets received"
-+#: ../statistics.c:125
-+#, fuzzy, c-format
-+msgid "%u connection resets received"
- msgstr "poèet pøijmutých resetù: %d"
- 
--#: ../statistics.c:124
--#, c-format
--msgid "%d connections established"
-+#: ../statistics.c:126
-+#, fuzzy, c-format
-+msgid "%u connections established"
- msgstr "poèet navázaných spojení: %d"
- 
--#: ../statistics.c:125
--#, c-format
--msgid "%d segments received"
-+#: ../statistics.c:127
-+#, fuzzy, c-format
-+msgid "%u segments received"
- msgstr "poèet pøijmutých segmentù: %d"
- 
--#: ../statistics.c:126
--#, c-format
--msgid "%d segments send out"
-+#: ../statistics.c:128
-+#, fuzzy, c-format
-+msgid "%u segments send out"
- msgstr "poèet odeslaných segmentù: %d"
- 
--#: ../statistics.c:127
--#, c-format
--msgid "%d segments retransmited"
-+#: ../statistics.c:129
-+#, fuzzy, c-format
-+msgid "%u segments retransmited"
- msgstr "poèet pøenesených segmentù: %d"
- 
--#: ../statistics.c:128
--#, c-format
--msgid "%d bad segments received."
-+#: ../statistics.c:130
-+#, fuzzy, c-format
-+msgid "%u bad segments received."
- msgstr "poèet chybných pøíchozích segmentù: %d."
- 
--#: ../statistics.c:129
--#, c-format
--msgid "%d resets sent"
-+#: ../statistics.c:131
-+#, fuzzy, c-format
-+msgid "%u resets sent"
- msgstr "poèet odeslaných resetù: %d"
- 
--#: ../statistics.c:134
--#, c-format
--msgid "%d packets received"
-+#: ../statistics.c:136
-+#, fuzzy, c-format
-+msgid "%u packets received"
- msgstr "poèet pøijmutých paketù: %d"
- 
--#: ../statistics.c:135
--#, c-format
--msgid "%d packets to unknown port received."
-+#: ../statistics.c:137
-+#, fuzzy, c-format
-+msgid "%u packets to unknown port received."
- msgstr "poèet paketù pøijmutých pro neznámý port: %d."
- 
--#: ../statistics.c:136
--#, c-format
--msgid "%d packet receive errors"
-+#: ../statistics.c:138
-+#, fuzzy, c-format
-+msgid "%u packet receive errors"
- msgstr "poèet chyb pøi pøíjmu paketù: %d"
- 
--#: ../statistics.c:137
--#, c-format
--msgid "%d packets sent"
-+#: ../statistics.c:139
-+#, fuzzy, c-format
-+msgid "%u packets sent"
- msgstr "poèet odeslaných paketù: %d"
- 
--#: ../statistics.c:142
--#, c-format
--msgid "%d SYN cookies sent"
-+#: ../statistics.c:144
-+#, fuzzy, c-format
-+msgid "%u SYN cookies sent"
- msgstr "poèet odeslaných SYN cookies: %d"
- 
--#: ../statistics.c:143
--#, c-format
--msgid "%d SYN cookies received"
-+#: ../statistics.c:145
-+#, fuzzy, c-format
-+msgid "%u SYN cookies received"
- msgstr "poèet pøijmutých SYN cookies: %d"
- 
--#: ../statistics.c:144
--#, c-format
--msgid "%d invalid SYN cookies received"
-+#: ../statistics.c:146
-+#, fuzzy, c-format
-+msgid "%u invalid SYN cookies received"
- msgstr "poèet chybných pøíchozích SYN cookies: %d"
- 
--#: ../statistics.c:146
--#, c-format
--msgid "%d resets received for embryonic SYN_RECV sockets"
-+#: ../statistics.c:148
-+#, fuzzy, c-format
-+msgid "%u resets received for embryonic SYN_RECV sockets"
- msgstr "poèet resetù pøijmutých pro sokety ve stavu SYN_PØÍCH: %d"
- 
--#: ../statistics.c:148
--#, c-format
--msgid "%d packets pruned from receive queue because of socket buffer overrun"
-+#: ../statistics.c:150
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue because of socket buffer overrun"
- msgstr "poèet paketù odstranìných z fronty kvùli pøeteèení bufferu soketu: %d"
- 
- #. obsolete: 2.2.0 doesn't do that anymore
--#: ../statistics.c:151
--#, c-format
--msgid "%d packets pruned from out-of-order queue"
-+#: ../statistics.c:153
-+#, fuzzy, c-format
-+msgid "%u packets pruned from receive queue"
- msgstr "poèet paketù odstranìných z fronty mimo-poøadí: %d"
- 
--#: ../statistics.c:152
--#, c-format
-+#: ../statistics.c:154
-+#, fuzzy, c-format
- msgid ""
--"%d packets dropped from out-of-order queue because of socket buffer overrun"
-+"%u packets dropped from out-of-order queue because of socket buffer overrun"
- msgstr ""
- "poèet paketù zahozených z fronty mimo-poøadí kvùli pøeteèení bufferu soketu: "
- "%d"
- 
--#: ../statistics.c:154
--#, c-format
--msgid "%d ICMP packets dropped because they were out-of-window"
-+#: ../statistics.c:156
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because they were out-of-window"
- msgstr "poèet ICMP paketù zahozených, proto¾e byly mimo-okno: %d"
- 
--#: ../statistics.c:156
--#, c-format
--msgid "%d ICMP packets dropped because socket was locked"
-+#: ../statistics.c:158
-+#, fuzzy, c-format
-+msgid "%u ICMP packets dropped because socket was locked"
- msgstr "poèet ICMP paketù zahozených kvùli zamèenému soketu: %d"
- 
-+#: ../statistics.c:160
-+#, c-format
-+msgid "%u TCP sockets finished time wait in fast timer"
-+msgstr ""
-+
-+#: ../statistics.c:161
-+#, c-format
-+msgid "%u time wait sockets recycled by time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:162
-+#, c-format
-+msgid "%u TCP sockets finished time wait in slow timer"
-+msgstr ""
-+
-+#: ../statistics.c:163
-+#, c-format
-+msgid "%u passive connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:165
-+#, c-format
-+msgid "%u active connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:167
-+#, c-format
-+msgid "%u packets rejects in established connections because of timestamp"
-+msgstr ""
-+
-+#: ../statistics.c:169
-+#, fuzzy, c-format
-+msgid "%u delayed acks sent"
-+msgstr "poèet odeslaných paketù: %d"
-+
-+#: ../statistics.c:170
-+#, c-format
-+msgid "%u delayed acks further delayed because of locked socket"
-+msgstr ""
-+
-+#: ../statistics.c:172
-+#, c-format
-+msgid "Quick ack mode was activated %u times"
-+msgstr ""
-+
-+#: ../statistics.c:173
-+#, c-format
-+msgid "%u times the listen queue of a socket overflowed"
-+msgstr ""
-+
-+#: ../statistics.c:175
-+#, c-format
-+msgid "%u SYNs to LISTEN sockets ignored"
-+msgstr ""
-+
-+#: ../statistics.c:176
-+#, c-format
-+msgid "%u packets directly queued to recvmsg prequeue."
-+msgstr ""
-+
-+#: ../statistics.c:178
-+#, c-format
-+msgid "%u of bytes directly received from backlog"
-+msgstr ""
-+
-+#: ../statistics.c:180
-+#, c-format
-+msgid "%u of bytes directly received from prequeue"
-+msgstr ""
-+
-+#: ../statistics.c:182
-+#, fuzzy, c-format
-+msgid "%u packets dropped from prequeue"
-+msgstr "poèet paketù odstranìných z fronty mimo-poøadí: %d"
-+
-+#: ../statistics.c:183
-+#, fuzzy, c-format
-+msgid "%u packet headers predicted"
-+msgstr "poèet pøijmutých paketù: %d"
-+
-+#: ../statistics.c:184
-+#, c-format
-+msgid "%u packets header predicted and directly queued to user"
-+msgstr ""
-+
-+#: ../statistics.c:186
-+#, c-format
-+msgid "Ran %u times out of system memory during packet sending"
-+msgstr ""
-+
-+#: ../statistics.c:188
-+#, fuzzy, c-format
-+msgid "%u acknowledgments not containing data received"
-+msgstr "poèet paketù pøijmutých pro neznámý port: %d."
-+
-+#: ../statistics.c:189
-+#, c-format
-+msgid "%u predicted acknowledgments"
-+msgstr ""
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr ""
-+
-+#: ../statistics.c:192
-+#, fuzzy, c-format
-+msgid "%u bad SACKs received"
-+msgstr "poèet chybných pøíchozích segmentù: %d."
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr ""
-+
-+#: ../statistics.c:194
-+#, c-format
-+msgid "Detected reordering %u times using SACK"
-+msgstr ""
-+
-+#: ../statistics.c:195
-+#, c-format
-+msgid "Detected reordering %u times using time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:196
-+#, c-format
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:197
-+#, c-format
-+msgid "%u congestion windows fully recovered"
-+msgstr ""
-+
-+#: ../statistics.c:198
-+#, c-format
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr ""
-+
-+#: ../statistics.c:199
-+#, c-format
-+msgid "%u congestion window recovered using DSACK"
-+msgstr ""
-+
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr ""
-+
-+#: ../statistics.c:201
-+#, fuzzy, c-format
-+msgid "%u retransmits lost"
-+msgstr "poèet odeslaných resetù: %d"
-+
-+#: ../statistics.c:202
-+#, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr ""
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr ""
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr ""
-+
-+#: ../statistics.c:205
-+#, fuzzy, c-format
-+msgid "%u fast retransmits"
-+msgstr "poèet pøenesených segmentù: %d"
-+
-+#: ../statistics.c:206
-+#, c-format
-+msgid "%u forward retransmits"
-+msgstr ""
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr ""
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr ""
-+
-+#: ../statistics.c:209
-+#, fuzzy, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr "poèet pøenesených segmentù: %d"
-+
-+#: ../statistics.c:210
-+#, fuzzy, c-format
-+msgid "%u sack retransmits failed"
-+msgstr "poèet paketù, je¾ se nepodaøilo znovu sestavit: %d"
-+
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr ""
-+
-+#: ../statistics.c:212
-+#, fuzzy, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr "poèet paketù odstranìných z fronty kvùli pøeteèení bufferu soketu: %d"
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr ""
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr ""
-+
-+#: ../statistics.c:215
-+#, fuzzy, c-format
-+msgid "%u DSACKs received"
-+msgstr "poèet pøijmutých paketù: %d"
-+
-+#: ../statistics.c:216
-+#, fuzzy, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "celkem pøijmutých paketù: %d"
-+
-+#: ../statistics.c:217
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "poèet pøijmutých resetù: %d"
-+
-+#: ../statistics.c:218
-+#, fuzzy, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr "poèet pøijmutých resetù: %d"
-+
-+#: ../statistics.c:219
-+#, fuzzy, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr "poèet pøijmutých resetù: %d"
-+
-+#: ../statistics.c:220
-+#, c-format
-+msgid "%u connections aborted due to memory pressure"
-+msgstr ""
-+
-+#: ../statistics.c:221
-+#, fuzzy, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr "poèet pøijmutých resetù: %d"
-+
- #: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr ""
-+
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr ""
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr ""
-+
-+#: ../statistics.c:292
- msgid "enabled"
- msgstr "zapnuto"
- 
--#: ../statistics.c:222
-+#: ../statistics.c:292
- msgid "disabled"
- msgstr "vypnuto"
- 
--#: ../statistics.c:272
--#, c-format
--msgid "unknown title %s\n"
--msgstr "titulek %s je neznámý\n"
--
--#: ../statistics.c:298
-+#: ../statistics.c:375
- msgid "error parsing /proc/net/snmp"
- msgstr "chyba pøi zpracování /proc/net/snmp"
- 
--#: ../statistics.c:311
-+#: ../statistics.c:388
- msgid "cannot open /proc/net/snmp"
- msgstr "/proc/net/snmp nelze otevøít"
- 
-@@ -1821,89 +2112,95 @@
- msgid "Cannot change line discipline to `%s'.\n"
- msgstr "Linkovou disciplínu nelze na `%s' zmìnit.\n"
- 
--#: ../lib/af.c:145 ../lib/hw.c:148
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr "NEZNÁM"
- 
--#: ../lib/af.c:147
-+#: ../lib/af.c:155
- msgid "UNIX Domain"
- msgstr "Doména UNIX"
- 
--#: ../lib/af.c:150
-+#: ../lib/af.c:158
- msgid "DARPA Internet"
- msgstr "DARPA Internet"
- 
--#: ../lib/af.c:153
-+#: ../lib/af.c:161
- msgid "IPv6"
- msgstr "IPv6"
- 
--#: ../lib/af.c:156 ../lib/hw.c:169
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr "AMPR AX.25"
- 
--#: ../lib/af.c:159 ../lib/hw.c:175
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr "AMPR NET/ROM"
- 
--#: ../lib/af.c:162
-+#: ../lib/af.c:170
- msgid "Novell IPX"
- msgstr "Novell IPX"
- 
--#: ../lib/af.c:165
-+#: ../lib/af.c:173
- msgid "Appletalk DDP"
- msgstr "Appletalk DDP"
- 
--#: ../lib/af.c:168 ../lib/hw.c:207
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr "Econet"
- 
--#: ../lib/af.c:171 ../lib/hw.c:172
-+#: ../lib/af.c:179
-+msgid "CCITT X.25"
-+msgstr ""
-+
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr "AMPR ROSE"
- 
--#: ../lib/af.c:174 ../lib/hw.c:160
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr "Ash"
- 
--#: ../lib/af.c:232
-+#: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr "Nezadávejte více ne¾ jednu tøídu adres.\n"
- 
--#: ../lib/af.c:293
-+#: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr "Bylo zadáno pøíli¹ mnoho tøíd adres.\n"
- 
--#: ../lib/af.c:304
-+#: ../lib/af.c:315
- #, c-format
- msgid "Unknown address family `%s'.\n"
- msgstr "Tøída adres `%s' není známa.\n"
- 
--#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
--#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
--#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
--#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
--msgid "[NONE SET]"
--msgstr "[NENASTAVENO]"
--
--#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
- #, c-format
- msgid "in_arcnet(%s): invalid arcnet address!\n"
- msgstr "in_arcnet(%s): chybná arcnet adresa!\n"
- 
--#: ../lib/arcnet.c:108
-+#: ../lib/arcnet.c:97
- #, c-format
- msgid "in_arcnet(%s): trailing : ignored!\n"
- msgstr "in_arcnet(%s): nadbyteèné : ignorováno!\n"
- 
--#: ../lib/arcnet.c:120
-+#: ../lib/arcnet.c:109
- #, c-format
- msgid "in_arcnet(%s): trailing junk!\n"
- msgstr "in_arcnet(%s): nadbyteèné znaky!\n"
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
- msgstr "Chybná Ash adresa"
- 
-+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-+msgid "[NONE SET]"
-+msgstr "[NENASTAVENO]"
-+
- #: ../lib/ax25.c:97 ../lib/netrom.c:100
- msgid "Invalid callsign"
- msgstr "Nesprávný volací znak"
-@@ -1913,22 +2210,21 @@
- msgstr "Volací znak je pøíli¹ dlouhý."
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr "AX.25 není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr "Smìrovací tabulka v jádru pro AX.25\n"
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr "Adresát      Rozhraní U¾ití\n"
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr "Smìrovací tabulka pro `ddp' není zatím podporována.\n"
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1944,153 +2240,171 @@
- msgid "in_ether(%s): trailing junk!\n"
- msgstr "in_ether(%s): nadbyteèné znaky!\n"
- 
--#: ../lib/fddi.c:95 ../lib/fddi.c:110
-+#: ../lib/fddi.c:84 ../lib/fddi.c:99
- #, c-format
- msgid "in_fddi(%s): invalid fddi address!\n"
- msgstr "in_fddi(%s): chybná fddi adresa!\n"
- 
--#: ../lib/fddi.c:122
-+#: ../lib/fddi.c:111
- #, c-format
- msgid "in_fddi(%s): trailing : ignored!\n"
- msgstr "in_fddi(%s): nadbyteèné : ignorováno!\n"
- 
--#: ../lib/fddi.c:134
-+#: ../lib/fddi.c:123
- #, c-format
- msgid "in_fddi(%s): trailing junk!\n"
- msgstr "in_fddi(%s): nadbyteèné znaky!\n"
- 
--#: ../lib/getroute.c:97 ../lib/setroute.c:76
-+#: ../lib/getroute.c:101 ../lib/setroute.c:80
- #, c-format
- msgid "Address family `%s' not supported.\n"
- msgstr "Tøída adres `%s' není podporována.\n"
- 
--#: ../lib/getroute.c:103 ../lib/setroute.c:80
-+#: ../lib/getroute.c:107 ../lib/setroute.c:84
- #, c-format
- msgid "No routing for address family `%s'.\n"
- msgstr "Pro tøídu adres `%s' není ¾ádné smìrování.\n"
- 
--#: ../lib/hippi.c:96 ../lib/hippi.c:111
-+#: ../lib/hippi.c:84 ../lib/hippi.c:99
- #, c-format
- msgid "in_hippi(%s): invalid hippi address!\n"
- msgstr "in_hippi(%s): chybná hippi adresa!\n"
- 
--#: ../lib/hippi.c:123
-+#: ../lib/hippi.c:111
- #, c-format
- msgid "in_hippi(%s): trailing : ignored!\n"
- msgstr "in_hippi(%s): nadbyteèné : ignorováno!\n"
- 
--#: ../lib/hippi.c:134
-+#: ../lib/hippi.c:122
- #, c-format
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr "in_hippi(%s): nadbyteèné znaky!\n"
- 
--#: ../lib/hw.c:147
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr "Místní smyèka"
- 
--#: ../lib/hw.c:150
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr "IP po sériové lince"
- 
--#: ../lib/hw.c:151
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr "Vj IP po sériové lince"
- 
--#: ../lib/hw.c:152
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr "6bitový IP po sériové lince"
- 
--#: ../lib/hw.c:153
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr "6bitový VJ IP po sériové lince"
- 
--#: ../lib/hw.c:154
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr "Adaptivní IP po sériové lince"
- 
--#: ../lib/hw.c:157
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr "Ethernet"
- 
--#: ../lib/hw.c:163
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr "Fiber Distributed Data Interface"
- 
--#: ../lib/hw.c:166
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr "HIPPI"
- 
--#: ../lib/hw.c:178
-+#: ../lib/hw.c:191
-+msgid "generic X.25"
-+msgstr ""
-+
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr "IPIP Tunnel"
- 
--#: ../lib/hw.c:181
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
- msgstr "Point-to-Point Protokol"
- 
--#: ../lib/hw.c:184
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr "(Cisco)-HDLC"
- 
--#: ../lib/hw.c:185
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:188
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr "ARCnet"
- 
--#: ../lib/hw.c:191
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr "Frame Relay DLCI"
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr "Pøístupové zaøízení Frame Relay"
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr "IPv6-in-IPv4"
- 
--#: ../lib/hw.c:198
-+#: ../lib/hw.c:214
- msgid "IrLAP"
- msgstr "IrLAP"
- 
--#: ../lib/hw.c:201
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr "Token Ring 16/4 Mb/s"
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:219
- #, fuzzy
- msgid "16/4 Mbps Token Ring (New)"
- msgstr "Token Ring 16/4 Mb/s"
- 
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
- #: ../lib/inet.c:153 ../lib/inet6.c:79
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
- msgstr "rresolve: tøída adres %d není podporována!\n"
- 
--#: ../lib/inet6_gr.c:79
-+#: ../lib/inet6.c:131
-+#, fuzzy
-+msgid "[UNKNOWN]"
-+msgstr "NEZNÁM"
-+
-+#: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr "INET6 (IPv6) není na tomto systému nakonfigurováno.\n"
- 
--#: ../lib/inet6_gr.c:82
-+#: ../lib/inet6_gr.c:74
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
- msgstr "Smìrovací tabulka v jádru pro IPv6\n"
- 
--#: ../lib/inet6_gr.c:84
-+#: ../lib/inet6_gr.c:76
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
- msgstr ""
--"Adresát                                     Dal¹í Smìrovaè                   "
--"       Pøízn Metrika Odkaz U¾it Rozhraní\n"
-+"Adresát                                     Dal¹í "
-+"Smìrovaè                          Pøízn Metrika Odkaz U¾it Rozhraní\n"
- 
--#: ../lib/inet6_gr.c:158
-+#: ../lib/inet6_gr.c:150
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr "Cache sousedù v jádru pro IPv6\n"
- 
--#: ../lib/inet6_gr.c:161
-+#: ../lib/inet6_gr.c:153
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
-@@ -2098,7 +2412,8 @@
- "Soused                                      HW Adresa         Rozhraní Pøízn "
- "Odkazy Stav\n"
- 
--#: ../lib/inet6_gr.c:165
-+#: ../lib/inet6_gr.c:157
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
-@@ -2107,30 +2422,37 @@
- "Pøíznaky Odkazy Stav          Pro¹lý(sec) Smazat(sec)\n"
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr "Pou¾ití: inet6_route [-vF] del Cíl\n"
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr "       inet6_route [-vF] add Cíl [gw Gw] [metrika M] [[dev] If]\n"
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr "       inet6_route [-FC] flush      NENÍ podporováno\n"
- 
--#: ../lib/inet6_sr.c:182
-+#: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
- msgstr "Smìrovací tabulku `inet6' nelze vyprazdòovat\n"
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr "INET (IPv4) není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
- msgstr "Smìrovací tabulka v jádru pro IP\n"
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2139,6 +2461,7 @@
- "Rozhraní\n"
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
-@@ -2147,6 +2470,7 @@
- "Rozhraní\n"
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
-@@ -2155,10 +2479,12 @@
- "Rozhraní MSS   Okno   irtt\n"
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
- msgstr "Smìrovací cache v jádru pro IP\n"
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
-@@ -2167,6 +2493,7 @@
- "Rozhraní\n"
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
-@@ -2175,6 +2502,7 @@
- "Rozhraní\n"
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
-@@ -2183,6 +2511,7 @@
- "Rozhraní MSS   Okno   irtt HH   Arp\n"
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-@@ -2190,7 +2519,8 @@
- "Odesílatel      Adresát         Maska           Pøízn Metrik Odkazy U¾t "
- "Rozhraní MSS    Okno irtt   TOS HHOdk HHAktuál    Zvlá¹tCíl\n"
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
-@@ -2198,29 +2528,34 @@
- "Pou¾ití: inet_route [-vF] del {-host|-net} Cíl[/prefix] [gw Gw] [metrika M] "
- "[[dev] If]\n"
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
- msgstr ""
- "       inet_route [-vF] add {-host|-net} Cíl[/prefix] [gw Gw] [metrika M]\n"
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
- msgstr ""
- "       inet_route [-vF] add {-host|-net} Cíl/[prefix] [metrika M] reject\n"
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr "       inet_route [-FC] flush      NENÍ podporováno\n"
- 
-@@ -2230,15 +2565,17 @@
- msgstr "route: %s: sí» nelze pou¾ít jako bránu!\n"
- 
- #: ../lib/inet_sr.c:174
--#, fuzzy
-+#, fuzzy, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr "route: Nesprávné NSS.\n"
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr "route: Nesprávné okno.\n"
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr "route: Nesprávné zahajovací rtt.\n"
- 
-@@ -2253,75 +2590,92 @@
- msgstr "route: sí»ová maska %s je nesprávná\n"
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr "route: sí»ová maska nevyhovuje adrese cesty\n"
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
- msgstr "Smìrovací cache `inet' nelze vyprazdòovat\n"
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
- msgstr "Smìrovací cache `inet' nelze mìnit\n"
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr "IPX není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
- msgstr "Smìrovací tabulka v jádru pro IPX\n"
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
- msgstr "Cíl                       Smìrovaè Sí»              Smìrovaè Uzel\n"
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
- msgstr "IPX: toto je tøeba ulo¾it\n"
- 
--#: ../lib/masq_info.c:197
-+#: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr "IP maskovací polo¾ky\n"
- 
--#: ../lib/masq_info.c:200
-+#: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr "prot   ¾ivot  zdroj                cíl                  porty\n"
- 
--#: ../lib/masq_info.c:203
-+#: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
--"prot   ¾ivot     zahajsek delta pøedchd zdroj             cíl                "
--"   porty\n"
-+"prot   ¾ivot     zahajsek delta pøedchd zdroj             "
-+"cíl                   porty\n"
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr "NET/ROM není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
- msgstr "Smìrovací tabulka v jádru pro NET/ROM\n"
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr "Cíl          Mnemonika Kvalita  Soused     Rozhraní\n"
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
- msgstr "pou¾ití netrom\n"
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
- msgstr "NET/ROM: toto je potøeba ulo¾it\n"
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr "Tímto programem nelze PPP spustit.\n"
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
- msgstr "Lituji, pou¾ijte pppd!\n"
- 
-@@ -2330,49 +2684,319 @@
- msgstr "Adresa uzlu musí mít 10 èíslic"
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr "ROSE není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
- msgstr "Smìrovací tabulka v jádru pro ROSE\n"
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr "in_tr(%s): nesprávná token ring adresa!\n"
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr "in_tr(%s): nadbyteèné: ignorováno!\n"
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr "in_tr(%s): nadbyteèné znaky!\n"
- 
--#: ../lib/interface.c:124
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
- msgstr "varování: není dostupný ¾ádný inet soket: %s\n"
- 
--#: ../lib/interface.c:270
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr ""
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:504
-+#: ../lib/interface.c:571
- msgid "Device not found"
- msgstr "Zaøízení nebylo nalezeno"
- 
--#: ../lib/interface.c:508
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
- msgstr "%s: chyba pøi získávání informací o rozhraní %s\n"
- 
--#: ../lib/sockets.c:59
-+#: ../lib/interface.c:608
-+msgid "     - no statistics available -"
-+msgstr "     - statistická data nejsou dostupná -"
-+
-+#: ../lib/interface.c:612
-+#, c-format
-+msgid "[NO FLAGS]"
-+msgstr "[®ÁDNÉ PØÍZNAKY]"
-+
-+#: ../lib/interface.c:688
-+#, c-format
-+msgid "%-9.9s Link encap:%s  "
-+msgstr "%-9.9s Zapouzdøení:%s  "
-+
-+#: ../lib/interface.c:693
-+#, c-format
-+msgid "HWaddr %s  "
-+msgstr "HWadr %s  "
-+
-+#: ../lib/interface.c:696
-+#, c-format
-+msgid "Media:%s"
-+msgstr "Médium:%s"
-+
-+#: ../lib/interface.c:698
-+#, c-format
-+msgid "(auto)"
-+msgstr "(auto)"
-+
-+#: ../lib/interface.c:705
-+#, c-format
-+msgid "          %s addr:%s "
-+msgstr "          %s adr:%s "
-+
-+#: ../lib/interface.c:708
-+#, c-format
-+msgid " P-t-P:%s "
-+msgstr " P-t-P:%s "
-+
-+# V ostatních katalozích se pøekládá Broadcast -> v¹esmìrové vysílání.
-+# Tudi¾ bcast -> V¹esmìr :)
-+#: ../lib/interface.c:711
-+#, c-format
-+msgid " Bcast:%s "
-+msgstr " V¹esmìr:%s "
-+
-+#: ../lib/interface.c:713
-+#, c-format
-+msgid " Mask:%s\n"
-+msgstr "Maska:%s\n"
-+
-+#: ../lib/interface.c:730
-+#, c-format
-+msgid "          inet6 addr: %s/%d"
-+msgstr "          inet6-adr: %s/%d"
-+
-+#: ../lib/interface.c:732
-+#, c-format
-+msgid " Scope:"
-+msgstr " Rozsah:"
-+
-+#: ../lib/interface.c:735
-+#, c-format
-+msgid "Global"
-+msgstr "Globál"
-+
-+#: ../lib/interface.c:738
-+#, c-format
-+msgid "Link"
-+msgstr "Linka"
-+
-+#: ../lib/interface.c:741
-+#, c-format
-+msgid "Site"
-+msgstr "Stanovi¹tì"
-+
-+#: ../lib/interface.c:744
-+#, c-format
-+msgid "Compat"
-+msgstr "Kompatibilita"
-+
-+#: ../lib/interface.c:747
-+#, c-format
-+msgid "Host"
-+msgstr "Poèítaè"
-+
-+#: ../lib/interface.c:750
-+#, c-format
-+msgid "Unknown"
-+msgstr "Neznám."
-+
-+#: ../lib/interface.c:765
-+#, c-format
-+msgid "          IPX/Ethernet II addr:%s\n"
-+msgstr "          IPX/Ethernet II adr: %s\n"
-+
-+#: ../lib/interface.c:768
-+#, c-format
-+msgid "          IPX/Ethernet SNAP addr:%s\n"
-+msgstr "          IPX/Ethernet SNAP adr:%s\n"
-+
-+#: ../lib/interface.c:771
-+#, c-format
-+msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+msgstr "          IPX/Ethernet 802.2 adr:%s\n"
-+
-+#: ../lib/interface.c:774
-+#, c-format
-+msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+msgstr "          IPX/Ethernet 802.3 adr:%s\n"
-+
-+#: ../lib/interface.c:784
-+#, c-format
-+msgid "          EtherTalk Phase 2 addr:%s\n"
-+msgstr "          EtherTalk Phase 2 adr:%s\n"
-+
-+#: ../lib/interface.c:793
-+#, c-format
-+msgid "          econet addr:%s\n"
-+msgstr "          econet adr:%s\n"
-+
-+# Hic sunt leones ...
-+#: ../lib/interface.c:800
-+#, c-format
-+msgid "[NO FLAGS] "
-+msgstr "[®ÁDNÉ PØÍZNAKY]"
-+
-+#: ../lib/interface.c:802
-+#, c-format
-+msgid "UP "
-+msgstr "AKTIVOVÁNO "
-+
-+#: ../lib/interface.c:804
-+#, c-format
-+msgid "BROADCAST "
-+msgstr "V©ESMÌROVÉ_VYSÍLÁNÍ "
-+
-+#: ../lib/interface.c:806
-+#, c-format
-+msgid "DEBUG "
-+msgstr "DEBUG "
-+
-+#: ../lib/interface.c:808
-+#, c-format
-+msgid "LOOPBACK "
-+msgstr "SMYÈKA "
-+
-+#: ../lib/interface.c:810
-+#, c-format
-+msgid "POINTOPOINT "
-+msgstr "POINTOPOINT "
-+
-+# ??
-+#: ../lib/interface.c:812
-+#, c-format
-+msgid "NOTRAILERS "
-+msgstr "NOTRAILERS "
-+
-+#: ../lib/interface.c:814
-+#, c-format
-+msgid "RUNNING "
-+msgstr "BÌ®Í "
-+
-+#: ../lib/interface.c:816
-+#, c-format
-+msgid "NOARP "
-+msgstr "NEARP "
-+
-+#: ../lib/interface.c:818
-+#, c-format
-+msgid "PROMISC "
-+msgstr "PROMISK "
-+
-+#: ../lib/interface.c:820
-+#, c-format
-+msgid "ALLMULTI "
-+msgstr "ALLMULTI "
-+
-+#: ../lib/interface.c:822
-+#, c-format
-+msgid "SLAVE "
-+msgstr "SLAVE "
-+
-+#: ../lib/interface.c:824
-+#, c-format
-+msgid "MASTER "
-+msgstr "MASTER "
-+
-+#: ../lib/interface.c:826
-+#, c-format
-+msgid "MULTICAST "
-+msgstr "MULTICAST "
-+
-+#: ../lib/interface.c:829
-+#, c-format
-+msgid "DYNAMIC "
-+msgstr "DYNAMIC "
-+
-+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-+#: ../lib/interface.c:832
-+#, c-format
-+msgid " MTU:%d  Metric:%d"
-+msgstr " MTU:%d  Metrika:%d"
-+
-+#: ../lib/interface.c:836
-+#, c-format
-+msgid "  Outfill:%d  Keepalive:%d"
-+msgstr "  Outfill:%d  Keepalive:%d"
-+
-+#: ../lib/interface.c:850
-+#, fuzzy, c-format
-+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgstr "pøijmutých paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu rámcù:%lu\n"
-+
-+#: ../lib/interface.c:855
-+#, c-format
-+msgid "             compressed:%lu\n"
-+msgstr "             komprimováno:%lu\n"
-+
-+# carrier?
-+#: ../lib/interface.c:895
-+#, fuzzy, c-format
-+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgstr "odeslaných paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu pøenos:%lu\n"
-+
-+#: ../lib/interface.c:899
-+#, c-format
-+msgid "          collisions:%lu "
-+msgstr "          kolizí:%lu "
-+
-+#: ../lib/interface.c:901
-+#, c-format
-+msgid "compressed:%lu "
-+msgstr "komprimováno:%lu "
-+
-+#: ../lib/interface.c:903
-+#, c-format
-+msgid "txqueuelen:%d "
-+msgstr "délka odchozí fronty:%d "
-+
-+#: ../lib/interface.c:905
-+#, c-format
-+msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-+msgstr ""
-+
-+#: ../lib/interface.c:916
-+#, c-format
-+msgid "Interrupt:%d "
-+msgstr "Pøeru¹ení:%d "
-+
-+#. Only print devices using it for
-+#. I/O maps
-+#: ../lib/interface.c:919
-+#, c-format
-+msgid "Base address:0x%x "
-+msgstr "Vstupnì/Výstupní port:0x%x "
-+
-+#: ../lib/interface.c:921
-+#, c-format
-+msgid "Memory:%lx-%lx "
-+msgstr "Pamì»:%lx-%lx "
-+
-+#: ../lib/interface.c:924
-+#, c-format
-+msgid "DMA chan:%x "
-+msgstr "Kanál DMA:%x "
-+
-+#: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr "Nebyla nalezena ¾ádná pou¾itelná tøída adres.\n"
- 
-@@ -2396,29 +3020,32 @@
- msgid "ip: argument is wrong: %s\n"
- msgstr "ip: argument %s je nesprávný\n"
- 
--#: ../ipmaddr.c:56
-+#: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr " Usage: ipmaddr [ add | del ] MULTIADR dev ØETÌZEC\n"
- 
--#: ../ipmaddr.c:57
-+#: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr "       ipmaddr show [ dev ØETÌZEC ] [ ipv4 | ipv6 | link | all ]\n"
- 
--#: ../ipmaddr.c:58
-+#: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr "       ipmaddr -V | -version\n"
- 
--#: ../ipmaddr.c:258
-+#: ../ipmaddr.c:263
- #, c-format
- msgid "family %d "
- msgstr "tøída %d "
- 
--#: ../ipmaddr.c:267
-+#: ../ipmaddr.c:272
- #, c-format
- msgid " users %d"
- msgstr " u¾ivatelé %d"
- 
--#: ../ipmaddr.c:353
-+#: ../ipmaddr.c:358
- msgid "Cannot create socket"
- msgstr "Soket nelze vytvoøit"
- 
-@@ -2433,6 +3060,7 @@
- msgstr "slattach: tty_lock: (%s): %s\n"
- 
- #: ../slattach.c:192
-+#, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr "slattach: do PID souboru nelze zapisovat\n"
- 
-@@ -2451,44 +3079,77 @@
- msgid "slattach: tty_hangup(RAISE): %s\n"
- msgstr "slattach: tty_hangup(RAISE): %s\n"
- 
--#: ../slattach.c:486
-+#: ../slattach.c:468
-+#, fuzzy, c-format
-+msgid "slattach: tty name too long\n"
-+msgstr "jméno %s je pøíli¹ dlouhé\n"
-+
-+#: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr "slattach: tty_open: aktuální stav nelze zjistit!\n"
- 
--#: ../slattach.c:493
-+#: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
- msgstr "slattach: tty_open: aktuální linkovou disciplínu nelze zjistit!\n"
- 
--#: ../slattach.c:501
-+#: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr "slattach: tty_open: re¾im RAW nelze nastavit!\n"
- 
--#: ../slattach.c:508
-+#: ../slattach.c:520
- #, c-format
- msgid "slattach: tty_open: cannot set %s bps!\n"
- msgstr "slattach: tty_open: %s bps nelze nastavit!\n"
- 
--#: ../slattach.c:518
-+#: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr "slattach: tty_open: re¾im 8N1 nelze nastavit!\n"
- 
--#: ../slattach.c:686
-+#: ../slattach.c:672
-+#, c-format
-+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+msgstr ""
-+
-+#: ../slattach.c:704
- #, c-format
- msgid "%s started"
- msgstr "protokol %s spu¹tìn"
- 
--#: ../slattach.c:687
-+#: ../slattach.c:705
- #, c-format
- msgid " on %s"
- msgstr " na %s"
- 
--#: ../slattach.c:688
-+#: ../slattach.c:706
- #, c-format
- msgid " interface %s\n"
- msgstr " rozhraní %s\n"
- 
- #~ msgid ""
--#~ "   This comand can read or set the hostname or the NIS domainname. You can\n"
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+#~ "<-''-\n"
-+#~ msgstr ""
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s <soubor> <hwadr> [sí»mask <èís>]  <-''-\n"
-+
-+#~ msgid "%s: unknown interface: %s\n"
-+#~ msgstr "%s: rozhraní %s není známo\n"
-+
-+#~ msgid "address mask replies"
-+#~ msgstr "odpovìdi na ¾ádost o masku podsítì"
-+
-+#~ msgid "unknown title %s\n"
-+#~ msgstr "titulek %s je neznámý\n"
-+
-+#~ msgid "Routing table for `ddp' not yet supported.\n"
-+#~ msgstr "Smìrovací tabulka pro `ddp' není zatím podporována.\n"
-+
-+#~ msgid ""
-+#~ "   This comand can read or set the hostname or the NIS domainname. You "
-+#~ "can\n"
- #~ msgstr ""
- #~ "   Tento program zji¹»uje a nastavuje jméno poèítaèe èi NIS domény. Mù¾e "
- #~ "také\n"
-@@ -2500,7 +3161,8 @@
- #~ msgid ""
- #~ "   Unless you are using bind or NIS for host lookups you can change the\n"
- #~ msgstr ""
--#~ "   Pokud nepou¾íváte bind èi NIS pro vyhledávání jmen poèítaèù, pak mù¾ete\n"
-+#~ "   Pokud nepou¾íváte bind èi NIS pro vyhledávání jmen poèítaèù, pak "
-+#~ "mù¾ete\n"
- 
- #~ msgid ""
- #~ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
---- net-tools-1.60.orig/po/ja.po
-+++ net-tools-1.60/po/ja.po
-@@ -0,0 +1,3133 @@
-+# Net-tool Japanese locale data
-+# Kenshi Muto <kmuto@debian.org>, 2007.
-+# Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>, 1999.
-+#
-+msgid ""
-+msgstr ""
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-30 12:28+0900\n"
-+"PO-Revision-Date: 2007-07-04 20:47+0900\n"
-+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
-+"Language-Team: Japanese\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8-bit\n"
-+
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
-+msgid "arp: need host name\n"
-+msgstr "arp: ホスト��必���\n"
-+
-+#: ../arp.c:215 ../arp.c:230
-+#, c-format
-+msgid "No ARP entry for %s\n"
-+msgstr "%s�ARPエントリ��り��ん\n"
-+
-+#: ../arp.c:248
-+#, c-format
-+msgid "arp: cant get HW-Address for `%s': %s.\n"
-+msgstr "arp: '%s'��ードウェアアドレスを�得����ん: %s.\n"
-+
-+#: ../arp.c:252
-+#, c-format
-+msgid "arp: protocol type mismatch.\n"
-+msgstr "arp: プロトコルタイプ������ん.\n"
-+
-+#: ../arp.c:261
-+#, c-format
-+msgid "arp: device `%s' has HW address %s `%s'.\n"
-+msgstr "arp: デ�イス`%s'��ードウェアアドレス%s `%s'��.\n"
-+
-+#: ../arp.c:293
-+#, c-format
-+msgid "arp: need hardware address\n"
-+msgstr "arp: �ードウェアアドレス�必���\n"
-+
-+#: ../arp.c:301
-+#, c-format
-+msgid "arp: invalid hardware address\n"
-+msgstr "arp: �ードウェアアドレス���当��\n"
-+
-+#: ../arp.c:398
-+#, c-format
-+msgid "arp: cannot open etherfile %s !\n"
-+msgstr "arp: etherファイル%s�開���ん!\n"
-+
-+#: ../arp.c:414
-+#, c-format
-+msgid "arp: format error on line %u of etherfile %s !\n"
-+msgstr "arp: %u行(ファイル%s)�フォーマットエラー��り��!\n"
-+
-+#: ../arp.c:427
-+#, c-format
-+msgid "arp: cannot set entry on line %u of etherfile %s !\n"
-+msgstr "arp: etherファイル%u行(%s)�エントリを設定����ん!\n"
-+
-+#: ../arp.c:448
-+#, c-format
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
-+msgstr "アドレス               HWタイプ  HWアドレス         フラグ マスク インタフェース\n"
-+
-+#: ../arp.c:476
-+msgid "<from_interface>"
-+msgstr "<起点インタフェース>"
-+
-+#: ../arp.c:478
-+msgid "(incomplete)"
-+msgstr "(�完全)"
-+
-+# translatable?
-+#: ../arp.c:495
-+#, c-format
-+msgid "%s (%s) at "
-+msgstr "%s (%s) at "
-+
-+#: ../arp.c:501
-+#, c-format
-+msgid "<incomplete> "
-+msgstr "<�完全> "
-+
-+#: ../arp.c:507
-+#, c-format
-+msgid "netmask %s "
-+msgstr "�ットマスク %s "
-+
-+# translatable?
-+#: ../arp.c:524
-+#, c-format
-+msgid "on %s\n"
-+msgstr "on %s\n"
-+
-+#: ../arp.c:605
-+#, c-format
-+msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
-+msgstr "エントリ: %d\tスキップ: %d\t発見: %d\n"
-+
-+#: ../arp.c:609
-+#, c-format
-+msgid "%s (%s) -- no entry\n"
-+msgstr "%s (%s) -- エントリ��\n"
-+
-+#: ../arp.c:611
-+#, c-format
-+msgid "arp: in %d entries no match found.\n"
-+msgstr "arp: %d�エントリ中, 一致�るも��見��り��ん.\n"
-+
-+#: ../arp.c:626
-+#, c-format
-+msgid ""
-+"Usage:\n"
-+"  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-+"cache\n"
-+msgstr ""
-+"使用法:\n"
-+"  arp [-vn]  [<HW>] [-i <インタフェース>]\n"
-+"                                [-a] [<ホスト�>]   ‥‥ ARPキャッシュ�表"
-+"示\n"
-+
-+#: ../arp.c:627
-+#, c-format
-+msgid ""
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
-+"entry\n"
-+msgstr "  arp [-v]    [-i <インタフェース>]  -d  <ホスト�> [pub] ‥‥ARPエントリを削除\n"
-+
-+#: ../arp.c:628
-+#, c-format
-+msgid ""
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
-+"file\n"
-+msgstr ""
-+"  arp [-vnD] [<HW>] [-i <インタフェース>] \n"
-+"                              -f  <ファイル�>  ‥‥ファイル�らエントリを追加\n"
-+
-+#: ../arp.c:629
-+#, c-format
-+msgid ""
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
-+"entry\n"
-+msgstr ""
-+"  arp [-v]   [<HW>] [-i <インタフェース>]\n"
-+"             -s <ホスト�> <�ードウェアアドレス> [temp] ‥‥エントリを追加\n"
-+
-+# FIXME:What does '' mean?
-+#: ../arp.c:630
-+#, c-format
-+msgid ""
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
-+"<-''-\n"
-+"\n"
-+msgstr ""
-+"  arp [-v]   [<HW>] [-i <インタフェース>] -Ds <ホスト�>\n"
-+"              <インタフェース> [netmask <�ットマスク>] pub     ‥‥     〃\n"
-+
-+#: ../arp.c:632
-+#, c-format
-+msgid ""
-+"        -a                       display (all) hosts in alternative (BSD) "
-+"style\n"
-+msgstr ""
-+"        -a                 新��(BSD)スタイル�エントリ�れ�全ホストを表示"
-+"�る\n"
-+
-+#: ../arp.c:633
-+#, c-format
-+msgid "        -s, --set                set a new ARP entry\n"
-+msgstr "        -s, --set          新�ARPエントリを設定�る\n"
-+
-+#: ../arp.c:634
-+#, c-format
-+msgid "        -d, --delete             delete a specified entry\n"
-+msgstr "        -d, --delete       指定エントリを削除�る\n"
-+
-+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
-+#, c-format
-+msgid "        -v, --verbose            be verbose\n"
-+msgstr "        -v, --verbose            詳細表示を行��\n"
-+
-+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
-+#, c-format
-+msgid "        -n, --numeric            don't resolve names\n"
-+msgstr "        -n, --numeric            ���レゾルブを���\n"
-+
-+#: ../arp.c:637
-+#, c-format
-+msgid ""
-+"        -i, --device             specify network interface (e.g. eth0)\n"
-+msgstr "        -i, --device       �ットワークインタフェース�指定(例 eth0)\n"
-+
-+#: ../arp.c:638
-+#, c-format
-+msgid "        -D, --use-device         read <hwaddr> from given device\n"
-+msgstr ""
-+"        -D, --use-device   与�られ�デ�イス�ら\n"
-+"                                    <HWアドレス>を読�込む\n"
-+
-+#: ../arp.c:639
-+#, c-format
-+msgid "        -A, -p, --protocol       specify protocol family\n"
-+msgstr "        -A, -p, --protocol       プロトコルファミリを指定�る\n"
-+
-+#: ../arp.c:640
-+#, c-format
-+msgid ""
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
-+"\n"
-+msgstr "        -f, --file         /etc/ethersファイル�ら新�エントリを読�込む\n\n"
-+
-+#: ../arp.c:642 ../rarp.c:182
-+#, c-format
-+msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
-+msgstr "  <HW>=�ードウェアアドレスタイプを指定�る��'-H <hw>'を使��下��。標準: %s\n"
-+
-+#: ../arp.c:643 ../rarp.c:183
-+#, c-format
-+msgid "  List of possible hardware types (which support ARP):\n"
-+msgstr "  (ARPをサ�ート��)指定�能��ードウェアタイプ�リスト:\n"
-+
-+#: ../arp.c:677 ../arp.c:762
-+#, c-format
-+msgid "%s: hardware type not supported!\n"
-+msgstr "%s: �ードウェアタイプ�サ�ート�れ����ん!\n"
-+
-+#: ../arp.c:681
-+#, c-format
-+msgid "%s: address family not supported!\n"
-+msgstr "%s: アドレスファミリ�サ�ート�れ����ん!\n"
-+
-+#: ../arp.c:716
-+#, c-format
-+msgid "arp: -N not yet supported.\n"
-+msgstr "arp: -N���サ�ート�����ん.\n"
-+
-+#: ../arp.c:726
-+#, c-format
-+msgid "arp: %s: unknown address family.\n"
-+msgstr "arp: %s: �明�アドレスファミリ��.\n"
-+
-+#: ../arp.c:735
-+#, c-format
-+msgid "arp: %s: unknown hardware type.\n"
-+msgstr "arp: %s: �明��ードウェアタイプ��.\n"
-+
-+#: ../arp.c:754
-+#, c-format
-+msgid "arp: %s: kernel only supports 'inet'.\n"
-+msgstr "arp: %s: カー�ル�'inet'以外�サ�ート�����ん.\n"
-+
-+#: ../arp.c:767
-+#, c-format
-+msgid "arp: %s: hardware type without ARP support.\n"
-+msgstr "arp: %s: ARPサ�ート����ードウェアタイプ��.\n"
-+
-+#: ../hostname.c:71
-+#, c-format
-+msgid "Setting nodename to `%s'\n"
-+msgstr "ノード�を`%s'�設定����\n"
-+
-+#: ../hostname.c:76
-+#, c-format
-+msgid "%s: you must be root to change the node name\n"
-+msgstr "%s: ノード��変更�ルート���れ��り��ん\n"
-+
-+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
-+#, c-format
-+msgid "%s: name too long\n"
-+msgstr "%s: ���長����\n"
-+
-+#: ../hostname.c:91
-+#, c-format
-+msgid "Setting hostname to `%s'\n"
-+msgstr "ホスト�を`%s'�設定����\n"
-+
-+#: ../hostname.c:96
-+#, c-format
-+msgid "%s: you must be root to change the host name\n"
-+msgstr "%s: ホスト��変更�ルート���れ��り��ん\n"
-+
-+#: ../hostname.c:109
-+#, c-format
-+msgid "Setting domainname to `%s'\n"
-+msgstr "ドメインを`%s'�設定����\n"
-+
-+#: ../hostname.c:114
-+#, c-format
-+msgid "%s: you must be root to change the domain name\n"
-+msgstr "%s: ドメイン��変更�ルート���れ��り��ん\n"
-+
-+#: ../hostname.c:131
-+#, c-format
-+msgid "Resolving `%s' ...\n"
-+msgstr "`%s'をレゾルブ中 ...\n"
-+
-+#: ../hostname.c:137
-+#, c-format
-+msgid "Result: h_name=`%s'\n"
-+msgstr "�果: h_name=`%s'\n"
-+
-+#: ../hostname.c:142
-+#, c-format
-+msgid "Result: h_aliases=`%s'\n"
-+msgstr "�果: h_aliases=`%s'\n"
-+
-+#: ../hostname.c:147
-+#, c-format
-+msgid "Result: h_addr_list=`%s'\n"
-+msgstr "�果: h_addr_list=`%s'\n"
-+
-+#: ../hostname.c:208
-+#, c-format
-+msgid "%s: can't open `%s'\n"
-+msgstr "%s: `%s'を開���ん\n"
-+
-+#: ../hostname.c:222
-+#, c-format
-+msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
-+msgstr "使用法: hostname   [-v] {ホスト�|-F ファイル}    (ファイル�よる)ホスト��設定\n"
-+
-+#: ../hostname.c:223
-+#, c-format
-+msgid ""
-+"       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
-+msgstr "        domainname [-v] {NISドメイン|-F ファイル} (ファイル�よる)NISドメイン��設定\n"
-+
-+#: ../hostname.c:225
-+#, c-format
-+msgid ""
-+"       nodename [-v] {nodename|-F file}      set DECnet node name (from "
-+"file)\n"
-+msgstr ""
-+"nodename [-v] {ノード�|-F ファイル}  (ファイル�よる)DECnetノード��設定\n"
-+
-+#: ../hostname.c:227
-+#, c-format
-+msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
-+msgstr "        hostname [-v] [-d|-f|-s|-a|-i|-y]     形�を指定��表示\n"
-+
-+#: ../hostname.c:228
-+#, c-format
-+msgid ""
-+"       hostname [-v]                         display hostname\n"
-+"\n"
-+msgstr ""
-+"        hostname [-v]                         ホスト��出力\n"
-+"\n"
-+
-+#: ../hostname.c:229
-+#, c-format
-+msgid ""
-+"       hostname -V|--version|-h|--help       print info and exit\n"
-+"\n"
-+msgstr ""
-+"        hostname -V|--version|-h|--help       諸情報を出力��終了\n"
-+"\n"
-+"\n"
-+
-+#: ../hostname.c:230
-+#, c-format
-+msgid ""
-+"    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
-+"\n"
-+msgstr "    dnsdomainname=ホスト� -d, {yp,nis,}domainname=ホスト� -y\n\n"
-+
-+#: ../hostname.c:231
-+#, c-format
-+msgid "    -s, --short           short host name\n"
-+msgstr "    -s, --short           短縮ホスト�\n"
-+
-+#: ../hostname.c:232
-+#, c-format
-+msgid "    -a, --alias           alias names\n"
-+msgstr "    -a, --alias           エイリアス�\n"
-+
-+#: ../hostname.c:233
-+#, c-format
-+msgid "    -i, --ip-address      addresses for the hostname\n"
-+msgstr "    -i, --ip-address      ホスト��対�るアドレス\n"
-+
-+#: ../hostname.c:234
-+#, c-format
-+msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
-+msgstr "    -f, --fqdn, --long    ロングホスト�(FQDN)\n"
-+
-+#: ../hostname.c:235
-+#, c-format
-+msgid "    -d, --domain          DNS domain name\n"
-+msgstr "    -d, --domain          DNSドメイン�\n"
-+
-+#: ../hostname.c:236
-+#, c-format
-+msgid "    -y, --yp, --nis       NIS/YP domainname\n"
-+msgstr "    -y, --yp, --nis       NIS/YPドメイン�\n"
-+
-+#: ../hostname.c:238
-+#, c-format
-+msgid "    -n, --node            DECnet node name\n"
-+msgstr "    -n, --node            DECnetノード�\n"
-+
-+#: ../hostname.c:240
-+#, c-format
-+msgid ""
-+"    -F, --file            read hostname or NIS domainname from given file\n"
-+"\n"
-+msgstr "    -F, --file            指定�ファイル�らホスト��NISドメイン�を読�込む\n\n"
-+
-+#: ../hostname.c:242
-+#, c-format
-+msgid ""
-+"   This command can read or set the hostname or the NIS domainname. You can\n"
-+"   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-+"   Unless you are using bind or NIS for host lookups you can change the\n"
-+"   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
-+"   part of the FQDN) in the /etc/hosts file.\n"
-+msgstr ""
-+"   ��コマンド���ホスト����NISドメイン�を読�込����設定����。\n"
-+"   DNSドメイン���FDN(完全修飾ドメイン�)を読�込む��も����。\n"
-+"   ホスト���照�Bind�よ�, NISも使���場�, /etc/hostsファイル��る\n"
-+"   FQDNや, (FQDN�一部分�)ドメイン�を変更����.\n"
-+
-+#: ../hostname.c:338
-+#, c-format
-+msgid "%s: You can't change the DNS domain name with this command\n"
-+msgstr "%s: ��コマンド��DNSドメイン��変更����ん.\n"
-+
-+#: ../hostname.c:339
-+#, c-format
-+msgid ""
-+"\n"
-+"Unless you are using bind or NIS for host lookups you can change the DNS\n"
-+msgstr ""
-+"\n"
-+"ホスト���照�Bind�よ�, NISも使���場��/etc/hostsファイル\n"
-+
-+#: ../hostname.c:340
-+#, c-format
-+msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
-+msgstr "��るFQDNや, (FQDN�一部分�)ドメイン�を変更����.\n"
-+
-+#: ../hostname.c:357
-+#, c-format
-+msgid "gethostname()=`%s'\n"
-+msgstr "gethostname()=`%s'\n"
-+
-+#: ../hostname.c:374
-+#, c-format
-+msgid "getdomainname()=`%s'\n"
-+msgstr "getdomainname()=`%s'\n"
-+
-+#: ../hostname.c:389
-+#, c-format
-+msgid "getnodename()=`%s'\n"
-+msgstr "getnodename()=`%s'\n"
-+
-+#: ../ifconfig.c:107
-+#, c-format
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr "Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR フラグ\n"
-+
-+#: ../ifconfig.c:129 ../ifconfig.c:161
-+#, c-format
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr "%s: インタフェースフラグ��得中�エラー�発生����:%s\n"
-+
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
-+#: ../ifconfig.c:973
-+#, c-format
-+msgid "No support for INET on this system.\n"
-+msgstr "INET���システム��サ�ート�れ����ん.\n"
-+
-+#: ../ifconfig.c:193
-+#, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr "%s: インタフェースフラグ�テスト中�エラー�発生����: %s\n"
-+
-+#: ../ifconfig.c:202
-+#, c-format
-+msgid ""
-+"Usage:\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+msgstr ""
-+"使用法:\n"
-+"  ifconfig [-a] [-v] [-s] <インタフェース> [[<AF>] <アドレス>]\n"
-+
-+#: ../ifconfig.c:204
-+#, c-format
-+msgid "  [add <address>[/<prefixlen>]]\n"
-+msgstr "  [add <アドレス>[/<プレフィックス長>]]\n"
-+
-+#: ../ifconfig.c:205
-+#, c-format
-+msgid "  [del <address>[/<prefixlen>]]\n"
-+msgstr "   [del <アドレス>[/<プレフィックス長>]]\n"
-+
-+#: ../ifconfig.c:206
-+#, c-format
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<アドレス>]]  [[-]pointopoint [<アドレス>]]\n"
-+
-+#: ../ifconfig.c:207
-+#, c-format
-+msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+msgstr "  [netmask <アドレス>]  [dstaddr <アドレス>]  [tunnel <アドレス>]\n"
-+
-+#: ../ifconfig.c:210
-+#, c-format
-+msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+msgstr "  [outfill <数値>] [keepalive <数値>]\n"
-+
-+#: ../ifconfig.c:212
-+#, c-format
-+msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+msgstr "  [hw <HW> <アドレス>]  [metric <数値>]  [mtu <数値>]\n"
-+
-+#: ../ifconfig.c:213
-+#, c-format
-+msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+
-+#: ../ifconfig.c:214
-+#, c-format
-+msgid "  [multicast]  [[-]promisc]\n"
-+msgstr "  [multicast]  [[-]promisc]\n"
-+
-+#: ../ifconfig.c:215
-+#, c-format
-+msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+msgstr "  [mem_start <開始アドレス>] [io_addr <IOアドレス>] [irq <番�>] [media <タイプ>]\n"
-+
-+#: ../ifconfig.c:217
-+#, c-format
-+msgid "  [txqueuelen <NN>]\n"
-+msgstr "   [txqueuelen <TXキュー長>]\n"
-+
-+#: ../ifconfig.c:220
-+#, c-format
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
-+
-+#: ../ifconfig.c:222
-+#, c-format
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr "  [up|down] ...\n\n"
-+
-+#: ../ifconfig.c:224
-+#, c-format
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "  <HW>=�ードウェアタイプ.\n"
-+
-+#: ../ifconfig.c:225
-+#, c-format
-+msgid "  List of possible hardware types:\n"
-+msgstr "  利用�能��ードウェアタイプ�リスト:\n"
-+
-+#. 1 = ARPable
-+#: ../ifconfig.c:227
-+#, c-format
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "  <AF>=アドレスファミリ. 標準: %s\n"
-+
-+#: ../ifconfig.c:228
-+#, c-format
-+msgid "  List of possible address families:\n"
-+msgstr "  利用�能�アドレスファミリ�リスト:\n"
-+
-+#: ../ifconfig.c:303
-+#, c-format
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr "ifconfig: オプション`%s'を解釈����ん.\n"
-+
-+#: ../ifconfig.c:305 ../ifconfig.c:962
-+#, c-format
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr "ifconfig: `--help'�使用法を見られ��.\n"
-+
-+#: ../ifconfig.c:380
-+#, c-format
-+msgid "Unknown media type.\n"
-+msgstr "�明�メディアタイプ��.\n"
-+
-+#: ../ifconfig.c:417
-+#, c-format
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr "警告: インタフェース%s���promiscモード��...�ら�他�アプリケーション�実行中���り��ん�?\n"
-+
-+#: ../ifconfig.c:429
-+#, c-format
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr "警告: インタフェース%s���MULTICASTモード��.\n"
-+
-+#: ../ifconfig.c:441
-+#, c-format
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr "警告: インタフェース%s���ALLMULTIモード��.\n"
-+
-+#: ../ifconfig.c:465
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr "警告: インタフェース%s���DYNAMICモード��.\n"
-+
-+#: ../ifconfig.c:523
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr "警告: インタフェース%s���BROADCASTモード��.\n"
-+
-+#: ../ifconfig.c:652
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr "警告: インタフェース%s���POINTOPOINTモード��.\n"
-+
-+#: ../ifconfig.c:684
-+#, c-format
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr "�ードウェアアドレスタイプ`%s'�アドレスを設定�る�ンドラを������ん. 失敗����.\n"
-+
-+#: ../ifconfig.c:693
-+#, c-format
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: ��切�アドレス��(%s).\n"
-+
-+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
-+#, c-format
-+msgid "No support for INET6 on this system.\n"
-+msgstr "INET6���システム��サ�ート�れ����ん.\n"
-+
-+#: ../ifconfig.c:780 ../ifconfig.c:871
-+#, c-format
-+msgid "Interface %s not initialized\n"
-+msgstr "インタフェース%s��期化�れ����ん.\n"
-+
-+#: ../ifconfig.c:792 ../ifconfig.c:882
-+#, c-format
-+msgid "Bad address.\n"
-+msgstr "��切�アドレス��.\n"
-+
-+#: ../ifconfig.c:885
-+#, c-format
-+msgid "Address deletion not supported on this system.\n"
-+msgstr "アドレス削除���システム��サ�ート�れ����ん.\n"
-+
-+#: ../ifconfig.c:957
-+#, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "ifconfig:��プロトコルファミリ�アドレスを設定����ん.\n"
-+
-+#: ../ifconfig.c:983
-+#, c-format
-+msgid "No support for ECONET on this system.\n"
-+msgstr "ECONET���システム��サ�ート�れ����ん.\n"
-+
-+#: ../ifconfig.c:991
-+#, c-format
-+msgid "Don't know how to set addresses for family %d.\n"
-+msgstr "ファミリ%d�アドレス�設定方法��明��.\n"
-+
-+#: ../ifconfig.c:1021
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr "警告: 少���も1��エラー�発生����. (%d)\n"
-+
-+#: ../netstat.c:434
-+#, c-format
-+msgid ""
-+"(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
-+msgstr "(\"-p\"�情報を読�込���ん���: geteuid()=%d ���ルート��る����.)\n"
-+
-+#: ../netstat.c:438
-+#, c-format
-+msgid ""
-+"(Not all processes could be identified, non-owned process info\n"
-+" will not be shown, you would have to be root to see it all.)\n"
-+msgstr ""
-+"(一部�プロセス�識別�れ���, 所有�����プロセス�情報�\n"
-+"表示�れ��ん。�れら全�を見る��ルート��る必���り��.)\n"
-+
-+# translatable?
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
-+msgid "LISTENING"
-+msgstr "LISTENING"
-+
-+# translatable?
-+#: ../netstat.c:446
-+msgid "CONN SENT"
-+msgstr "CONN SENT"
-+
-+# translatable?
-+#: ../netstat.c:447 ../netstat.c:1268
-+msgid "DISC SENT"
-+msgstr "DISC SENT"
-+
-+# translatable?
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
-+msgid "ESTABLISHED"
-+msgstr "ESTABLISHED"
-+
-+#: ../netstat.c:470
-+#, c-format
-+msgid "Active NET/ROM sockets\n"
-+msgstr "稼�中�NET/ROMソケット\n"
-+
-+#: ../netstat.c:471
-+#, c-format
-+msgid ""
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
-+msgstr "ユーザ     �信先     発信元    デ�イス  状態        Vr/Vs    �信-Q  �信-Q\n"
-+
-+#: ../netstat.c:481 ../netstat.c:1308
-+#, c-format
-+msgid "Problem reading data from %s\n"
-+msgstr "%s�ら�データ�読�込���題\n"
-+
-+# translatable?
-+#: ../netstat.c:516
-+msgid "SYN_SENT"
-+msgstr "SYN_SENT"
-+
-+# translatable?
-+#: ../netstat.c:517
-+msgid "SYN_RECV"
-+msgstr "SYN_RECV"
-+
-+# translatable?
-+#: ../netstat.c:518
-+msgid "FIN_WAIT1"
-+msgstr "FIN_WAIT1"
-+
-+# translatable?
-+#: ../netstat.c:519
-+msgid "FIN_WAIT2"
-+msgstr "FIN_WAIT2"
-+
-+# translatable?
-+#: ../netstat.c:520
-+msgid "TIME_WAIT"
-+msgstr "TIME_WAIT"
-+
-+# translatable?
-+#: ../netstat.c:521
-+msgid "CLOSE"
-+msgstr "CLOSE"
-+
-+# translatable?
-+#: ../netstat.c:522
-+msgid "CLOSE_WAIT"
-+msgstr "CLOSE_WAIT"
-+
-+# translatable?
-+#: ../netstat.c:523
-+msgid "LAST_ACK"
-+msgstr "LAST_ACK"
-+
-+# translatable?
-+#: ../netstat.c:524
-+msgid "LISTEN"
-+msgstr "LISTEN"
-+
-+# translatable?
-+#: ../netstat.c:525
-+msgid "CLOSING"
-+msgstr "CLOSING"
-+
-+#: ../netstat.c:596
-+#, c-format
-+msgid "warning, got bogus igmp6 line %d.\n"
-+msgstr "警告, ��igmp6ライン%dを得���.\n"
-+
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
-+#, c-format
-+msgid "netstat: unsupported address family %d !\n"
-+msgstr "netstat: サ�ート����アドレスファミリ%d��!\n"
-+
-+# c-format
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
-+#, c-format
-+msgid "warning, got bogus igmp line %d.\n"
-+msgstr "警告, ��igmpライン%dを得���.\n"
-+
-+#: ../netstat.c:677
-+#, c-format
-+msgid "Active X.25 sockets\n"
-+msgstr "稼�中�X.25ソケット\n"
-+
-+#. IMHO, Vr/Vs is not very usefull --SF
-+#: ../netstat.c:679
-+#, c-format
-+msgid ""
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
-+msgstr "�信先       発信元        デ�イス  LCI  状態         Vr/Vs  �信-Q  �信-Q\n"
-+
-+#: ../netstat.c:759
-+#, c-format
-+msgid "warning, got bogus tcp line.\n"
-+msgstr "警告, ��TCPラインを得���.\n"
-+
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
-+#, c-format
-+msgid "off (0.00/%ld/%d)"
-+msgstr "オフ (0.00/%ld/%d)"
-+
-+#: ../netstat.c:804
-+#, c-format
-+msgid "on (%2.2f/%ld/%d)"
-+msgstr "オン (%2.2f/%ld/%d)"
-+
-+#: ../netstat.c:809
-+#, c-format
-+msgid "keepalive (%2.2f/%ld/%d)"
-+msgstr "キープアライブ (%2.2f/%ld/%d)"
-+
-+#: ../netstat.c:814
-+#, c-format
-+msgid "timewait (%2.2f/%ld/%d)"
-+msgstr "時間待� (%2.2f/%ld/%d)"
-+
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
-+#, c-format
-+msgid "unkn-%d (%2.2f/%ld/%d)"
-+msgstr "�明-%d (%2.2f/%ld/%d)"
-+
-+#: ../netstat.c:894
-+#, c-format
-+msgid "warning, got bogus udp line.\n"
-+msgstr "警告, ��UDPラインを得���.\n"
-+
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
-+msgid "UNKNOWN"
-+msgstr "�明"
-+
-+#: ../netstat.c:958 ../netstat.c:1080
-+#, c-format
-+msgid "on%d (%2.2f/%ld/%d)"
-+msgstr "オン%d (%2.2f/%ld/%d)"
-+
-+#: ../netstat.c:1046
-+#, c-format
-+msgid "warning, got bogus raw line.\n"
-+msgstr "警告, ��Rawラインを得���.\n"
-+
-+#: ../netstat.c:1128
-+#, c-format
-+msgid "warning, got bogus unix line.\n"
-+msgstr "警告, ��unixラインを得���.\n"
-+
-+# translatable?
-+#: ../netstat.c:1155
-+msgid "STREAM"
-+msgstr "STREAM"
-+
-+# translatable?
-+#: ../netstat.c:1159
-+msgid "DGRAM"
-+msgstr "DGRAM"
-+
-+# translatable?
-+#: ../netstat.c:1163
-+msgid "RAW"
-+msgstr "RAW"
-+
-+# translatable?
-+#: ../netstat.c:1167
-+msgid "RDM"
-+msgstr "RDM"
-+
-+# translatable?
-+#: ../netstat.c:1171
-+msgid "SEQPACKET"
-+msgstr "SEQPACKET"
-+
-+# translatable?
-+#: ../netstat.c:1180
-+msgid "FREE"
-+msgstr "FREE"
-+
-+# translatable?
-+#: ../netstat.c:1196
-+msgid "CONNECTING"
-+msgstr "CONNECTING"
-+
-+# translatable?
-+#: ../netstat.c:1200
-+msgid "CONNECTED"
-+msgstr "CONNECTED"
-+
-+# translatable?
-+#: ../netstat.c:1204
-+msgid "DISCONNECTING"
-+msgstr "DISCONNECTING"
-+
-+#: ../netstat.c:1235
-+#, c-format
-+msgid "Active UNIX domain sockets "
-+msgstr "稼�中�UNIXドメインソケット "
-+
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
-+msgid "(servers and established)"
-+msgstr "(サー��確立)"
-+
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
-+msgid "(only servers)"
-+msgstr "(サー���)"
-+
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
-+msgid "(w/o servers)"
-+msgstr "(w/oサー�)"
-+
-+#: ../netstat.c:1245
-+#, c-format
-+msgid ""
-+"\n"
-+"Proto RefCnt Flags       Type       State         I-Node"
-+msgstr ""
-+"\n"
-+"Proto RefCnt フラグ      タイプ     状態         Iノード"
-+
-+#: ../netstat.c:1247
-+#, c-format
-+msgid " Path\n"
-+msgstr " パス\n"
-+
-+# translatable?
-+#: ../netstat.c:1267
-+msgid "SABM SENT"
-+msgstr "SABM SENT"
-+
-+# translatable?
-+#: ../netstat.c:1270
-+msgid "RECOVERY"
-+msgstr "RECOVERY"
-+
-+#: ../netstat.c:1284
-+#, c-format
-+msgid "Active AX.25 sockets\n"
-+msgstr "稼�中�AX.25ソケット\n"
-+
-+#: ../netstat.c:1285
-+#, c-format
-+msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
-+msgstr "�信先     発信元     デ�イス 状態        Vr/Vs    �信-Q  �信-Q\n"
-+
-+#: ../netstat.c:1328
-+#, c-format
-+msgid "problem reading data from %s\n"
-+msgstr "%s�ら�データ読�込�中��題\n"
-+
-+#: ../netstat.c:1379
-+#, c-format
-+msgid ""
-+"Active IPX sockets\n"
-+"Proto Recv-Q Send-Q Local Address              Foreign Address            "
-+"State"
-+msgstr ""
-+"稼�中�IPXソケット\n"
-+"Proto �信-Q �信-Q 内部アドレス               外部アドレス               状"
-+"æ…‹"
-+
-+#: ../netstat.c:1381
-+#, c-format
-+msgid " User"
-+msgstr " ユーザ"
-+
-+# translatable?
-+#: ../netstat.c:1415
-+msgid "ESTAB"
-+msgstr "ESTAB"
-+
-+# translatable?
-+#: ../netstat.c:1423
-+msgid "UNK."
-+msgstr "UNK."
-+
-+#: ../netstat.c:1461
-+#, c-format
-+msgid "Kernel Interface table\n"
-+msgstr "カー�ルインタフェーステーブル\n"
-+
-+#: ../netstat.c:1465
-+#, c-format
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr "Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR フラグ\n"
-+
-+#: ../netstat.c:1469
-+msgid "missing interface information"
-+msgstr "インタフェース情報�足り��ん"
-+
-+#: ../netstat.c:1492
-+#, c-format
-+msgid ""
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
-+msgstr ""
-+"使用法: netstat [-veenNcCF] [<アドレスファミリ>] -r\n"
-+"        netstat {-V|--version|-h|--help}\n"
-+
-+#: ../netstat.c:1493
-+#, c-format
-+msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
-+msgstr "        netstat [-vnNcaeol] [<ソケット> ...]\n"
-+
-+#: ../netstat.c:1494
-+#, c-format
-+msgid ""
-+"       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+"\n"
-+msgstr "        netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n"
-+
-+#: ../netstat.c:1496
-+#, c-format
-+msgid "        -r, --route              display routing table\n"
-+msgstr "        -r, --routing            経路テーブル�表示\n"
-+
-+#: ../netstat.c:1497
-+#, c-format
-+msgid "        -i, --interfaces         display interface table\n"
-+msgstr "        -i, --interfaces         インタフェーステーブル�表示\n"
-+
-+#: ../netstat.c:1498
-+#, c-format
-+msgid "        -g, --groups             display multicast group memberships\n"
-+msgstr "        -g, --groups             マル�キャスト・グループメン�シップ�表示\n"
-+
-+#: ../netstat.c:1499
-+#, c-format
-+msgid ""
-+"        -s, --statistics         display networking statistics (like SNMP)\n"
-+msgstr ""
-+"        -s, --statistics         (SNMP�よ��)�ットワーク統計を表示\n"
-+
-+#: ../netstat.c:1501
-+#, c-format
-+msgid ""
-+"        -M, --masquerade         display masqueraded connections\n"
-+"\n"
-+msgstr ""
-+"        -M, --masquerade         マスカレード接続�表示\n"
-+"\n"
-+
-+#: ../netstat.c:1505
-+#, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
-+msgstr "        --numeric-hosts          ホスト�をレゾルブ���\n"
-+
-+#: ../netstat.c:1506
-+#, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
-+msgstr "        --numeric-ports          �ート�をレゾルブ���\n"
-+
-+#: ../netstat.c:1507
-+#, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
-+msgstr "        --numeric-users          ユーザ�をレゾルブ���\n"
-+
-+#: ../netstat.c:1508
-+#, c-format
-+msgid "        -N, --symbolic           resolve hardware names\n"
-+msgstr "        -N, --symbolic           �ードウェア�をレゾルブ�る\n"
-+
-+#: ../netstat.c:1509 ../route.c:88
-+#, c-format
-+msgid "        -e, --extend             display other/more information\n"
-+msgstr "        -e, --extend             他�情報や多��情報を表示�る\n"
-+
-+#: ../netstat.c:1510
-+#, c-format
-+msgid "        -p, --programs           display PID/Program name for sockets\n"
-+msgstr "        -p, --programs           ソケット�PID/プログラム�を表示�る\n"
-+
-+#: ../netstat.c:1511
-+#, c-format
-+msgid ""
-+"        -c, --continuous         continuous listing\n"
-+"\n"
-+msgstr ""
-+"        -c, --continous          継続的�表示\n"
-+"\n"
-+
-+#: ../netstat.c:1512
-+#, c-format
-+msgid "        -l, --listening          display listening server sockets\n"
-+msgstr "        -l, --listening          サー��listenソケット�表示\n"
-+
-+#: ../netstat.c:1513
-+#, c-format
-+msgid ""
-+"        -a, --all, --listening   display all sockets (default: connected)\n"
-+msgstr "        -a, --all, --listening   全��情報を表示 (標準: connected)\n"
-+
-+#: ../netstat.c:1514
-+#, c-format
-+msgid "        -o, --timers             display timers\n"
-+msgstr "        -o, --timers             タイマ�表示\n"
-+
-+#: ../netstat.c:1515 ../route.c:89
-+#, c-format
-+msgid ""
-+"        -F, --fib                display Forwarding Information Base "
-+"(default)\n"
-+msgstr "        -F, --fib                フォワード情報ベースを表示�る(標準)\n"
-+
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
-+msgid ""
-+"        -C, --cache              display routing cache instead of FIB\n"
-+"\n"
-+msgstr "        -C, --cache              FIB���り�経路キャッシュを表示�る\n\n"
-+
-+#: ../netstat.c:1518
-+#, c-format
-+msgid ""
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
-+msgstr ""
-+"  <ソケット>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
-+
-+#: ../netstat.c:1519
-+#, c-format
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>='-6|-4'���'-A <af>'���'--<af>'を利用; 標準: %s\n"
-+
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
-+msgid "  List of possible address families (which support routing):\n"
-+msgstr "  (ルーティングをサ�ート��)利用�能�アドレスファミリ�リスト:\n"
-+
-+#: ../netstat.c:1753
-+#, c-format
-+msgid "Active Internet connections "
-+msgstr "稼�中�インター�ット接続 "
-+
-+#: ../netstat.c:1763
-+#, c-format
-+msgid ""
-+"\n"
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
-+msgstr ""
-+"\n"
-+"Proto �信-Q �信-Q 内部アドレス            外部アドレス            状"
-+"æ…‹       "
-+
-+#: ../netstat.c:1765
-+#, c-format
-+msgid " User       Inode     "
-+msgstr " ユーザ    Iノード    "
-+
-+#: ../netstat.c:1768
-+#, c-format
-+msgid " Timer"
-+msgstr "タイマ"
-+
-+#: ../netstat.c:1798
-+#, c-format
-+msgid "IPv4 Group Memberships\n"
-+msgstr "IPv4グループメン�シップ\n"
-+
-+#: ../netstat.c:1799
-+#, c-format
-+msgid "Interface       RefCnt Group\n"
-+msgstr "インタフェース �照Cnt グループ\n"
-+
-+#: ../rarp.c:44
-+msgid "This kernel does not support RARP.\n"
-+msgstr "��カー�ル�RARPをサ�ート�����ん.\n"
-+
-+#: ../rarp.c:83
-+#, c-format
-+msgid "no RARP entry for %s.\n"
-+msgstr "%s�RARPエントリ��り��ん.\n"
-+
-+#: ../rarp.c:96
-+#, c-format
-+msgid "%s: bad hardware address\n"
-+msgstr "%s: �正��ードウェアアドレス��\n"
-+
-+#: ../rarp.c:128
-+#, c-format
-+msgid "rarp: cannot open file %s:%s.\n"
-+msgstr "rarp: ファイル%sを開���ん:%s.\n"
-+
-+#: ../rarp.c:140
-+#, c-format
-+msgid "rarp: format error at %s:%u\n"
-+msgstr "rarp: %s:%u行�フォーマットエラー��り��\n"
-+
-+#: ../rarp.c:144 ../rarp.c:289
-+#, c-format
-+msgid "rarp: %s: unknown host\n"
-+msgstr "rarp: %s: �明�ホスト��\n"
-+
-+#: ../rarp.c:147
-+#, c-format
-+msgid "rarp: cannot set entry from %s:%u\n"
-+msgstr "rarp: %s:%u行�らエントリを設定����ん\n"
-+
-+#: ../rarp.c:176
-+#, c-format
-+msgid "Usage: rarp -a                               list entries in cache.\n"
-+msgstr ""
-+"使用法: rarp -a                              キャッシュエントリ�表示.\n"
-+
-+#: ../rarp.c:177
-+#, c-format
-+msgid "       rarp -d <hostname>                    delete entry from cache.\n"
-+msgstr ""
-+"       rarp -d <ホスト�>                    キャッシュ�らエントリを削除�"
-+"ã‚‹.\n"
-+
-+#: ../rarp.c:178
-+#, c-format
-+msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
-+msgstr ""
-+"       rarp [<HW>] -s <ホスト�> <�ードウェアアドレス>\n"
-+"                                             キャッシュ�エントリを追加.\n"
-+
-+#: ../rarp.c:179
-+#, c-format
-+msgid ""
-+"       rarp -f                               add entries from /etc/ethers.\n"
-+msgstr ""
-+"       rarp -f                               /etc/ethers�らエントリ追加.\n"
-+
-+#: ../rarp.c:180
-+#, c-format
-+msgid ""
-+"       rarp -V                               display program version.\n"
-+"\n"
-+msgstr "       rarp -V                               �ージョン情報�出力.\n"
-+
-+#: ../rarp.c:238
-+#, c-format
-+msgid "%s: illegal option mix.\n"
-+msgstr "%s: オプション�組���間������.\n"
-+
-+#: ../rarp.c:269
-+#, c-format
-+msgid "rarp: %s: unknown hardware type.\n"
-+msgstr "rarp: %s: �ードウェアタイプ��明��.\n"
-+
-+#: ../route.c:80
-+#, c-format
-+msgid ""
-+"Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
-+msgstr "使用法:route [-nNvee] [-FC] [アドレスファミリ]  カー�ル経路テーブル�表示.\n"
-+
-+#: ../route.c:81
-+#, c-format
-+msgid ""
-+"       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
-+"\n"
-+msgstr ""
-+"       route [-v] [-FC] {add|del|flush}‥‥\n"
-+"\t\t\t\t   アドレスファミリ�経路テーブル�設定.\n"
-+"\n"
-+
-+#: ../route.c:83
-+#, c-format
-+msgid ""
-+"       route {-h|--help} [<AF>]              Detailed usage syntax for "
-+"specified AF.\n"
-+msgstr ""
-+"       route {-h|--help} [アドレスファミリ]\n"
-+"                                     アドレスファミリ特定�文法�説明.\n"
-+
-+#: ../route.c:84
-+#, c-format
-+msgid ""
-+"       route {-V|--version}                  Display version/author and "
-+"exit.\n"
-+"\n"
-+msgstr "       route {-V|--version}          �ージョン/作者情報�出力�終了.\n\n"
-+
-+#: ../route.c:92
-+#, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>='-A <af>'���'--<af>'を利用; 標準: %s\n"
-+
-+#: ../plipconfig.c:66
-+#, c-format
-+msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
-+msgstr "使用法: plipconfig [-a] [-i] [-v] インタフェース\n"
-+
-+#: ../plipconfig.c:67
-+#, c-format
-+msgid "                  [nibble NN] [trigger NN]\n"
-+msgstr "                  [nibble 数値] [trigger 数値]\n"
-+
-+#: ../plipconfig.c:68
-+#, c-format
-+msgid "       plipconfig -V | --version\n"
-+msgstr "       plipconfig -V | --version\n"
-+
-+# translatable?
-+#: ../plipconfig.c:74
-+#, c-format
-+msgid "%s\tnibble %lu  trigger %lu\n"
-+msgstr "%s\tnibble %lu  trigger %lu\n"
-+
-+#: ../iptunnel.c:85
-+#, c-format
-+msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
-+msgstr "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
-+
-+#: ../iptunnel.c:86
-+#, c-format
-+msgid ""
-+"          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
-+msgstr "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
-+
-+#: ../iptunnel.c:87
-+#, c-format
-+msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-+msgstr "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
-+
-+#: ../iptunnel.c:88
-+#, c-format
-+msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
-+msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
-+
-+#: ../iptunnel.c:89
-+#, c-format
-+msgid ""
-+"       iptunnel -V | --version\n"
-+"\n"
-+msgstr "       iptunnel -V | --version\n\n"
-+
-+#: ../iptunnel.c:90
-+#, c-format
-+msgid "Where: NAME := STRING\n"
-+msgstr "�味: NAME := STRING\n"
-+
-+#: ../iptunnel.c:91
-+#, c-format
-+msgid "       ADDR := { IP_ADDRESS | any }\n"
-+msgstr "       ADDR := { IP_ADDRESS | any }\n"
-+
-+#: ../iptunnel.c:92
-+#, c-format
-+msgid "       TOS  := { NUMBER | inherit }\n"
-+msgstr "       TOS  := { NUMBER | inherit }\n"
-+
-+#: ../iptunnel.c:93
-+#, c-format
-+msgid "       TTL  := { 1..255 | inherit }\n"
-+msgstr "       TTL  := { 1..255 | inherit }\n"
-+
-+#: ../iptunnel.c:94
-+#, c-format
-+msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-+msgstr "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-+
-+#: ../iptunnel.c:332
-+#, c-format
-+msgid "Keys are not allowed with ipip and sit.\n"
-+msgstr "キー�ipip�よ�sit��許��れ��ん.\n"
-+
-+#: ../iptunnel.c:352
-+#, c-format
-+msgid "Broadcast tunnel requires a source address.\n"
-+msgstr "ブロードキャストトン�ル�発信元アドレス�必���.\n"
-+
-+#: ../iptunnel.c:367
-+#, c-format
-+msgid "ttl != 0 and noptmudisc are incompatible\n"
-+msgstr "ttl != 0�よ�noptmudisc�矛盾���\n"
-+
-+#: ../iptunnel.c:379
-+#, c-format
-+msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
-+msgstr "トン�ルモードを決定����ん(ipip, gre���sit)\n"
-+
-+#: ../iptunnel.c:417
-+#, c-format
-+msgid "%s: %s/ip  remote %s  local %s "
-+msgstr "%s: %s/ip  リモート%s  ローカル%s "
-+
-+#: ../iptunnel.c:421
-+msgid "unknown"
-+msgstr "�明"
-+
-+# FIXME: what does it mean?
-+#: ../iptunnel.c:453
-+#, c-format
-+msgid "  Drop packets out of sequence.\n"
-+msgstr "  シーケンス�ら外れ�パケットをドロップ.\n"
-+
-+#: ../iptunnel.c:455
-+#, c-format
-+msgid "  Checksum in received packet is required.\n"
-+msgstr "  �信パケット��ェックサム�必須��.\n"
-+
-+# FIXME: what does it mean?
-+#: ../iptunnel.c:457
-+#, c-format
-+msgid "  Sequence packets on output.\n"
-+msgstr "  �信�シーケンスパケット.\n"
-+
-+# FIXME: what does it mean?
-+#: ../iptunnel.c:459
-+#, c-format
-+msgid "  Checksum output packets.\n"
-+msgstr "  �信パケット��ェックサム.\n"
-+
-+#: ../iptunnel.c:487
-+#, c-format
-+msgid "Wrong format of /proc/net/dev. Sorry.\n"
-+msgstr "/proc/net/dev��正�フォーマット��. ����ん.\n"
-+
-+#: ../iptunnel.c:500
-+#, c-format
-+msgid "Failed to get type of [%s]\n"
-+msgstr "[%s]�タイプ��得�失敗\n"
-+
-+#: ../iptunnel.c:516
-+#, c-format
-+msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
-+msgstr "RX: パケット   �イト      エラー  CsumErrs outOfSeq マル�キャスト\n"
-+
-+#: ../iptunnel.c:519
-+#, c-format
-+msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
-+msgstr "TX: パケット   �イト       エラー DeadLoop NoRoute  �ッファ��\n"
-+
-+#: ../statistics.c:47
-+msgid "ICMP input histogram:"
-+msgstr "ICMP入力ヒストグラム:"
-+
-+#: ../statistics.c:48
-+msgid "ICMP output histogram:"
-+msgstr "ICMP出力ヒストグラム:"
-+
-+#: ../statistics.c:65
-+#, c-format
-+msgid "Forwarding is %s"
-+msgstr "フォワード�%s��"
-+
-+#: ../statistics.c:66
-+#, c-format
-+msgid "Default TTL is %u"
-+msgstr "標準TTL�%u��"
-+
-+#: ../statistics.c:67
-+#, c-format
-+msgid "%u total packets received"
-+msgstr "�計%uパケットを�信"
-+
-+#: ../statistics.c:68
-+#, c-format
-+msgid "%u with invalid headers"
-+msgstr "��当�ヘッダ�%u"
-+
-+#: ../statistics.c:69
-+#, c-format
-+msgid "%u with invalid addresses"
-+msgstr "��当�アドレス�%u"
-+
-+#: ../statistics.c:70
-+#, c-format
-+msgid "%u forwarded"
-+msgstr "%u�転�"
-+
-+#: ../statistics.c:71
-+#, c-format
-+msgid "%u with unknown protocol"
-+msgstr "%u��明�プロトコル"
-+
-+#: ../statistics.c:72
-+#, c-format
-+msgid "%u incoming packets discarded"
-+msgstr "%u��信パケットを破棄"
-+
-+#: ../statistics.c:73
-+#, c-format
-+msgid "%u incoming packets delivered"
-+msgstr "%u��信パケットを��"
-+
-+#: ../statistics.c:74
-+#, c-format
-+msgid "%u requests sent out"
-+msgstr "%u��求を�信"
-+
-+#. ?
-+#: ../statistics.c:75
-+#, c-format
-+msgid "%u outgoing packets dropped"
-+msgstr "%u��信パケットをドロップ"
-+
-+#: ../statistics.c:76
-+#, c-format
-+msgid "%u dropped because of missing route"
-+msgstr "�明�経路�%uをドロップ"
-+
-+#: ../statistics.c:77
-+#, c-format
-+msgid "%u fragments dropped after timeout"
-+msgstr "タイムアウト後�%u�フラグメントをドロップ"
-+
-+#: ../statistics.c:78
-+#, c-format
-+msgid "%u reassemblies required"
-+msgstr "%u��構築�必�"
-+
-+#. ?
-+#: ../statistics.c:79
-+#, c-format
-+msgid "%u packets reassembled ok"
-+msgstr "%uパケット��構築��功"
-+
-+#: ../statistics.c:80
-+#, c-format
-+msgid "%u packet reassembles failed"
-+msgstr "%uパケット��構築�失敗"
-+
-+#: ../statistics.c:81
-+#, c-format
-+msgid "%u fragments received ok"
-+msgstr "%uフラグメント��信��功"
-+
-+#: ../statistics.c:82
-+#, c-format
-+msgid "%u fragments failed"
-+msgstr "%uフラグメント�失敗"
-+
-+#: ../statistics.c:83
-+#, c-format
-+msgid "%u fragments created"
-+msgstr "%uフラグメントを生�"
-+
-+#: ../statistics.c:88
-+#, c-format
-+msgid "%u ICMP messages received"
-+msgstr "%u�ICMPメッセージ�信"
-+
-+#: ../statistics.c:89
-+#, c-format
-+msgid "%u input ICMP message failed."
-+msgstr "%u�ICMPメッセージ入力失敗."
-+
-+#: ../statistics.c:90 ../statistics.c:103
-+#, c-format
-+msgid "destination unreachable: %u"
-+msgstr "�信先到���: %u"
-+
-+#: ../statistics.c:91
-+#, c-format
-+msgid "timeout in transit: %u"
-+msgstr "�信時間オー�: %u"
-+
-+#: ../statistics.c:92 ../statistics.c:105
-+#, c-format
-+msgid "wrong parameters: %u"
-+msgstr "���パラメータ: %u"
-+
-+#. ?
-+#: ../statistics.c:93
-+#, c-format
-+msgid "source quenches: %u"
-+msgstr "発信元消滅: %u"
-+
-+#: ../statistics.c:94
-+#, c-format
-+msgid "redirects: %u"
-+msgstr "リダイレクト: %u"
-+
-+#: ../statistics.c:95
-+#, c-format
-+msgid "echo requests: %u"
-+msgstr "エコー�求: %u"
-+
-+#: ../statistics.c:96 ../statistics.c:109
-+#, c-format
-+msgid "echo replies: %u"
-+msgstr "エコー応答: %u"
-+
-+#: ../statistics.c:97
-+#, c-format
-+msgid "timestamp request: %u"
-+msgstr "タイムスタンプ�求: %u"
-+
-+#: ../statistics.c:98
-+#, c-format
-+msgid "timestamp reply: %u"
-+msgstr "タイムスタンプ応答: %u"
-+
-+#: ../statistics.c:99
-+#, c-format
-+msgid "address mask request: %u"
-+msgstr "アドレスマスク�求: %u"
-+
-+#. ?
-+#: ../statistics.c:100 ../statistics.c:113
-+#, c-format
-+msgid "address mask replies: %u"
-+msgstr "アドレスマスク応答: %u"
-+
-+#. ?
-+#: ../statistics.c:101
-+#, c-format
-+msgid "%u ICMP messages sent"
-+msgstr "%u�ICMPメッセージ�信"
-+
-+#: ../statistics.c:102
-+#, c-format
-+msgid "%u ICMP messages failed"
-+msgstr "%u�ICMPメッセージ失敗"
-+
-+#: ../statistics.c:104
-+#, c-format
-+msgid "time exceeded: %u"
-+msgstr "時間切れ: %u"
-+
-+#. ?
-+#: ../statistics.c:106
-+#, c-format
-+msgid "source quench: %u"
-+msgstr "発信元消滅: %u"
-+
-+#: ../statistics.c:107
-+#, c-format
-+msgid "redirect: %u"
-+msgstr "リダイレクト: %u"
-+
-+#: ../statistics.c:108
-+#, c-format
-+msgid "echo request: %u"
-+msgstr "エコー�求: %u"
-+
-+#: ../statistics.c:110
-+#, c-format
-+msgid "timestamp requests: %u"
-+msgstr "タイムスタンプ�求: %u"
-+
-+#: ../statistics.c:111
-+#, c-format
-+msgid "timestamp replies: %u"
-+msgstr "タイムスタンプ応答: %u"
-+
-+#: ../statistics.c:112
-+#, c-format
-+msgid "address mask requests: %u"
-+msgstr "アドレスマスク�求: %u"
-+
-+#: ../statistics.c:118
-+#, c-format
-+msgid "RTO algorithm is %s"
-+msgstr "RTOアルゴリズム�%s��"
-+
-+#: ../statistics.c:122
-+#, c-format
-+msgid "%u active connections openings"
-+msgstr "%u�能動接続開始"
-+
-+#: ../statistics.c:123
-+#, c-format
-+msgid "%u passive connection openings"
-+msgstr "%u��動接続開始"
-+
-+#: ../statistics.c:124
-+#, c-format
-+msgid "%u failed connection attempts"
-+msgstr "%u�接続試行失敗"
-+
-+#: ../statistics.c:125
-+#, c-format
-+msgid "%u connection resets received"
-+msgstr "%u�接続リセット�信"
-+
-+#: ../statistics.c:126
-+#, c-format
-+msgid "%u connections established"
-+msgstr "%u�接続確立"
-+
-+#: ../statistics.c:127
-+#, c-format
-+msgid "%u segments received"
-+msgstr "%uセグメント��信"
-+
-+#: ../statistics.c:128
-+#, c-format
-+msgid "%u segments send out"
-+msgstr "%uセグメント��信"
-+
-+#: ../statistics.c:129
-+#, c-format
-+msgid "%u segments retransmited"
-+msgstr "%uセグメント��転�"
-+
-+#: ../statistics.c:130
-+#, c-format
-+msgid "%u bad segments received."
-+msgstr "%u��正セグメント�信."
-+
-+#: ../statistics.c:131
-+#, c-format
-+msgid "%u resets sent"
-+msgstr "%u�リセット�信"
-+
-+#: ../statistics.c:136
-+#, c-format
-+msgid "%u packets received"
-+msgstr "%uパケット�信"
-+
-+#: ../statistics.c:137
-+#, c-format
-+msgid "%u packets to unknown port received."
-+msgstr "�明��ート�ら�%uパケット��信."
-+
-+#: ../statistics.c:138
-+#, c-format
-+msgid "%u packet receive errors"
-+msgstr "%u�パケット�信エラー"
-+
-+#: ../statistics.c:139
-+#, c-format
-+msgid "%u packets sent"
-+msgstr "%u�パケットを�信"
-+
-+#: ../statistics.c:144
-+#, c-format
-+msgid "%u SYN cookies sent"
-+msgstr "%u�SYNクッキーを�信"
-+
-+#: ../statistics.c:145
-+#, c-format
-+msgid "%u SYN cookies received"
-+msgstr "%u�SYNクッキーを�信"
-+
-+#: ../statistics.c:146
-+#, c-format
-+msgid "%u invalid SYN cookies received"
-+msgstr "%u���当�SYNクッキーを�信"
-+
-+#: ../statistics.c:148
-+#, c-format
-+msgid "%u resets received for embryonic SYN_RECV sockets"
-+msgstr "%u�未完��SYN_RECVソケット�対�るリセットを�信"
-+
-+#: ../statistics.c:150
-+#, c-format
-+msgid "%u packets pruned from receive queue because of socket buffer overrun"
-+msgstr "%u�パケットをソケット�ッファオー�ラン����信キュー�ら除外"
-+
-+#. obsolete: 2.2.0 doesn't do that anymore
-+#: ../statistics.c:153
-+#, c-format
-+msgid "%u packets pruned from receive queue"
-+msgstr "%u�パケットを�信キュー�ら除外"
-+
-+#: ../statistics.c:154
-+#, c-format
-+msgid ""
-+"%u packets dropped from out-of-order queue because of socket buffer overrun"
-+msgstr "%u�パケット�ソケット�ッファオー�ーラン���out-of-orderキュー�らドロップ"
-+
-+#: ../statistics.c:156
-+#, c-format
-+msgid "%u ICMP packets dropped because they were out-of-window"
-+msgstr "%u�ICMPパケット�out-of-window���ドロップ"
-+
-+#: ../statistics.c:158
-+#, c-format
-+msgid "%u ICMP packets dropped because socket was locked"
-+msgstr "%u�ICMPパケットをソケット�ロック�よ��ドロップ"
-+
-+# FIXME: what does it mean?
-+#: ../statistics.c:160
-+#, c-format
-+msgid "%u TCP sockets finished time wait in fast timer"
-+msgstr "%u�TCPソケット�ファーストタイマ��時間待�を完了"
-+
-+# FIXME
-+#: ../statistics.c:161
-+#, c-format
-+msgid "%u time wait sockets recycled by time stamp"
-+msgstr "%u�時間待�ソケット�タイムスタンプ��利用"
-+
-+# FIXME
-+#: ../statistics.c:162
-+#, c-format
-+msgid "%u TCP sockets finished time wait in slow timer"
-+msgstr "%u�TCPソケット�スロータイマ��時間待�を完了"
-+
-+#: ../statistics.c:163
-+#, c-format
-+msgid "%u passive connections rejected because of time stamp"
-+msgstr "%u��動的接続�タイムスタンプ����拒�"
-+
-+#: ../statistics.c:165
-+#, c-format
-+msgid "%u active connections rejected because of time stamp"
-+msgstr "%u�能動的接続�タイムスタンプ����拒�"
-+
-+#: ../statistics.c:167
-+#, c-format
-+msgid "%u packets rejects in established connections because of timestamp"
-+msgstr "%u�パケット�タイムスタンプ����接続確立を拒�"
-+
-+#: ../statistics.c:169
-+#, c-format
-+msgid "%u delayed acks sent"
-+msgstr "%u��延ackを�信"
-+
-+# FIXME
-+#: ../statistics.c:170
-+#, c-format
-+msgid "%u delayed acks further delayed because of locked socket"
-+msgstr "%u��延ack�ロック�れ�ソケット�����ら��延"
-+
-+#: ../statistics.c:172
-+#, c-format
-+msgid "Quick ack mode was activated %u times"
-+msgstr "クイックackモード�%u回稼�"
-+
-+# FIXME
-+#: ../statistics.c:173
-+#, c-format
-+msgid "%u times the listen queue of a socket overflowed"
-+msgstr "ソケット�リスンキュー�%u回オー�フロー"
-+
-+# FIXME
-+#: ../statistics.c:175
-+#, c-format
-+msgid "%u SYNs to LISTEN sockets ignored"
-+msgstr "%u�ソケットリスンSYN�無視"
-+
-+#: ../statistics.c:176
-+#, c-format
-+msgid "%u packets directly queued to recvmsg prequeue."
-+msgstr "%uパケットをrecvmsgプレキュー�直接キュー."
-+
-+#: ../statistics.c:178
-+#, c-format
-+msgid "%u of bytes directly received from backlog"
-+msgstr "%u�イトを�ックログ�ら直接�信"
-+
-+#: ../statistics.c:180
-+#, c-format
-+msgid "%u of bytes directly received from prequeue"
-+msgstr "%u�イトをプレキュー�ら直接�信"
-+
-+#: ../statistics.c:182
-+#, c-format
-+msgid "%u packets dropped from prequeue"
-+msgstr "%u�パケットをプレキュー�らドロップ"
-+
-+#: ../statistics.c:183
-+#, c-format
-+msgid "%u packet headers predicted"
-+msgstr "%u�パケットヘッダを予測"
-+
-+#: ../statistics.c:184
-+#, c-format
-+msgid "%u packets header predicted and directly queued to user"
-+msgstr "%u�パケットヘッダを予測��ユーザ�直接キュー"
-+
-+#: ../statistics.c:186
-+#, c-format
-+msgid "Ran %u times out of system memory during packet sending"
-+msgstr "%u回�パケット�信中�システムメモリ��れ"
-+
-+#: ../statistics.c:188
-+#, c-format
-+msgid "%u acknowledgments not containing data received"
-+msgstr "データを����%u�承���信"
-+
-+#: ../statistics.c:189
-+#, c-format
-+msgid "%u predicted acknowledgments"
-+msgstr "%u�予測承�"
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr "高速����よるパケットロス�%u回�回復"
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u times recovered from packet loss due to SACK data"
-+msgstr "SACKデータ�よるパケットロス�%u回�回復"
-+
-+#: ../statistics.c:192
-+#, c-format
-+msgid "%u bad SACKs received"
-+msgstr "%u��正�SACKを�信"
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr "FACKを使��%u回�検出�れ�並�替�"
-+
-+#: ../statistics.c:194
-+#, c-format
-+msgid "Detected reordering %u times using SACK"
-+msgstr "SACKを使��%u回�検出�れ�並�替�"
-+
-+#: ../statistics.c:195
-+#, c-format
-+msgid "Detected reordering %u times using time stamp"
-+msgstr "タイムスタンプを使��%u回�検出�れ�並�替�"
-+
-+# FIXME:what does it mean?
-+#: ../statistics.c:196
-+#, c-format
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr "高速��を使��%u回�検出�れ�並�替�"
-+
-+#: ../statistics.c:197
-+#, c-format
-+msgid "%u congestion windows fully recovered"
-+msgstr "%u�輻輳ウィンドウを完全�回復"
-+
-+#: ../statistics.c:198
-+#, c-format
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr "Hoeヒューリスティックを使��%u�輻輳ウィンドウを部分的�回復"
-+
-+#: ../statistics.c:199
-+#, c-format
-+msgid "%u congestion window recovered using DSACK"
-+msgstr "DSACKを使��%u�輻輳ウィンドウを回復"
-+
-+#: ../statistics.c:200
-+#, c-format
-+msgid "%u congestion windows recovered after partial ack"
-+msgstr "部分ack後�%u�輻輳ウィンドウを回復"
-+
-+#: ../statistics.c:201
-+#, c-format
-+msgid "%u retransmits lost"
-+msgstr "%u���ロスト"
-+
-+# FIXME
-+#: ../statistics.c:202
-+#, c-format
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr "高速��後�%u�タイムアウト"
-+
-+#: ../statistics.c:203
-+#, c-format
-+msgid "%u timeouts after SACK recovery"
-+msgstr "SACK復元後�%u�タイムアウト"
-+
-+#: ../statistics.c:204
-+#, c-format
-+msgid "%u timeouts in loss state"
-+msgstr "状態ロス��%u�タイムアウト"
-+
-+#: ../statistics.c:205
-+#, c-format
-+msgid "%u fast retransmits"
-+msgstr "%u�高速��"
-+
-+#: ../statistics.c:206
-+#, c-format
-+msgid "%u forward retransmits"
-+msgstr "%u�転���"
-+
-+#: ../statistics.c:207
-+#, c-format
-+msgid "%u retransmits in slow start"
-+msgstr "スロースタート��%u���"
-+
-+#: ../statistics.c:208
-+#, c-format
-+msgid "%u other TCP timeouts"
-+msgstr "%u���他�TCPタイムアウト"
-+
-+# FIXME
-+#: ../statistics.c:209
-+#, c-format
-+msgid "%u reno fast retransmits failed"
-+msgstr "%d�高速��失敗"
-+
-+#: ../statistics.c:210
-+#, c-format
-+msgid "%u sack retransmits failed"
-+msgstr "%u�sack��失敗"
-+
-+# FIXME
-+#: ../statistics.c:211
-+#, c-format
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr "直接処������る�スケジュール�れ�%u回�レシー�"
-+
-+# FIXME
-+#: ../statistics.c:212
-+#, c-format
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr "%u�パケットを低ソケット�ッファ�����信キュー�ら除外"
-+
-+#: ../statistics.c:213
-+#, c-format
-+msgid "%u DSACKs sent for old packets"
-+msgstr "%u�DSACKを��パケット����信"
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr "%u�DSACKを順�外パケット����信"
-+
-+#: ../statistics.c:215
-+#, c-format
-+msgid "%u DSACKs received"
-+msgstr "%u�DSACKを�信"
-+
-+#: ../statistics.c:216
-+#, c-format
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "%u�DSACKを順�外パケット����信"
-+
-+#: ../statistics.c:217
-+#, c-format
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "予期��SYN����%u�接続をリセット"
-+
-+#: ../statistics.c:218
-+#, c-format
-+msgid "%u connections reset due to unexpected data"
-+msgstr "予期��データ����%u�接続をリセット"
-+
-+#: ../statistics.c:219
-+#, c-format
-+msgid "%u connections reset due to early user close"
-+msgstr "早期�ユーザ�クローズ����%u�接続をリセット"
-+
-+#: ../statistics.c:220
-+#, c-format
-+msgid "%u connections aborted due to memory pressure"
-+msgstr "メモリ�制約����%u�接続を中止"
-+
-+#: ../statistics.c:221
-+#, c-format
-+msgid "%u connections aborted due to timeout"
-+msgstr "タイムアウト����%u�接続を中止"
-+
-+# FIXME
-+#: ../statistics.c:222
-+#, c-format
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr "ユーザ�長期タイムアウト��クローズ後�%u�接続�中止"
-+
-+#: ../statistics.c:223
-+#, c-format
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr "メモリ�足����RST��信�%u回�能"
-+
-+# FIXME
-+#: ../statistics.c:224
-+#, c-format
-+msgid "TCP ran low on memory %u times"
-+msgstr "TCP�少��メモリ�%u回実行"
-+
-+#: ../statistics.c:225
-+#, c-format
-+msgid "%u TCP data loss events"
-+msgstr "%u�TCPデータ�イベントをロス"
-+
-+#: ../statistics.c:292
-+msgid "enabled"
-+msgstr "有効"
-+
-+#: ../statistics.c:292
-+msgid "disabled"
-+msgstr "無効"
-+
-+#: ../statistics.c:375
-+msgid "error parsing /proc/net/snmp"
-+msgstr "/proc/net/snmp�処�中�エラー�発生����"
-+
-+#: ../statistics.c:388
-+msgid "cannot open /proc/net/snmp"
-+msgstr "/proc/net/snmpを開���ん"
-+
-+#: ../lib/activate.c:69
-+#, c-format
-+msgid "Hardware type `%s' not supported.\n"
-+msgstr "�ードウェアタイプ`%s'�サ�ート�れ����ん.\n"
-+
-+#: ../lib/activate.c:73
-+#, c-format
-+msgid "Cannot change line discipline to `%s'.\n"
-+msgstr "`%s'�line disciplineを変更����ん.\n"
-+
-+#: ../lib/af.c:153 ../lib/hw.c:161
-+msgid "UNSPEC"
-+msgstr "�明��ット"
-+
-+#: ../lib/af.c:155
-+msgid "UNIX Domain"
-+msgstr "UNIXドメイン"
-+
-+#: ../lib/af.c:158
-+msgid "DARPA Internet"
-+msgstr "DARPAインター�ット"
-+
-+#: ../lib/af.c:161
-+msgid "IPv6"
-+msgstr "IPv6"
-+
-+#: ../lib/af.c:164 ../lib/hw.c:182
-+msgid "AMPR AX.25"
-+msgstr "AMPR AX.25"
-+
-+#: ../lib/af.c:167 ../lib/hw.c:188
-+msgid "AMPR NET/ROM"
-+msgstr "AMPR NET/ROM"
-+
-+#: ../lib/af.c:170
-+msgid "Novell IPX"
-+msgstr "Novell IPX"
-+
-+#: ../lib/af.c:173
-+msgid "Appletalk DDP"
-+msgstr "アップルトークDDP"
-+
-+#: ../lib/af.c:176 ../lib/hw.c:223
-+msgid "Econet"
-+msgstr "エコ�ット"
-+
-+#: ../lib/af.c:179
-+msgid "CCITT X.25"
-+msgstr "CCITT X.25"
-+
-+#: ../lib/af.c:182 ../lib/hw.c:185
-+msgid "AMPR ROSE"
-+msgstr "AMPR ROSE"
-+
-+#: ../lib/af.c:185 ../lib/hw.c:173
-+msgid "Ash"
-+msgstr "Ash"
-+
-+#: ../lib/af.c:243
-+#, c-format
-+msgid "Please don't supply more than one address family.\n"
-+msgstr "複数�アドレスファミリを����下��.\n"
-+
-+#: ../lib/af.c:304
-+#, c-format
-+msgid "Too much address family arguments.\n"
-+msgstr "アドレスファミリ�引数�多����.\n"
-+
-+#: ../lib/af.c:315
-+#, c-format
-+msgid "Unknown address family `%s'.\n"
-+msgstr "�明�アドレスファミリ�� `%s'.\n"
-+
-+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
-+#, c-format
-+msgid "in_arcnet(%s): invalid arcnet address!\n"
-+msgstr "in_arcnet(%s): ��当�ARCNETアドレス��!\n"
-+
-+#: ../lib/arcnet.c:97
-+#, c-format
-+msgid "in_arcnet(%s): trailing : ignored!\n"
-+msgstr "in_arcnet(%s): trailing : 無効!\n"
-+
-+# translatable?
-+#: ../lib/arcnet.c:109
-+#, c-format
-+msgid "in_arcnet(%s): trailing junk!\n"
-+msgstr "in_arcnet(%s): trailing junk!\n"
-+
-+#: ../lib/ash.c:81
-+#, c-format
-+msgid "Malformed Ash address"
-+msgstr "異常�Ashアドレス��"
-+
-+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-+msgid "[NONE SET]"
-+msgstr "[設定��]"
-+
-+#: ../lib/ax25.c:97 ../lib/netrom.c:100
-+msgid "Invalid callsign"
-+msgstr "��当�コールサイン��"
-+
-+#: ../lib/ax25.c:110 ../lib/netrom.c:113
-+msgid "Callsign too long"
-+msgstr "コールサイン�長����"
-+
-+#: ../lib/ax25_gr.c:47
-+#, c-format
-+msgid "AX.25 not configured in this system.\n"
-+msgstr "AX.25���システム��設定�れ����ん.\n"
-+
-+#: ../lib/ax25_gr.c:50
-+#, c-format
-+msgid "Kernel AX.25 routing table\n"
-+msgstr "カー�ル AX.25経路テーブル\n"
-+
-+#. xxx
-+#: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
-+msgid "Destination  Iface    Use\n"
-+msgstr "�信先サイト Iface    使用数\n"
-+
-+#: ../lib/ether.c:74 ../lib/ether.c:91
-+#, c-format
-+msgid "in_ether(%s): invalid ether address!\n"
-+msgstr "in_ether(%s): ��当�イーサアドレス!\n"
-+
-+#: ../lib/ether.c:105
-+#, c-format
-+msgid "in_ether(%s): trailing : ignored!\n"
-+msgstr "in_ether(%s): trailing : 無効!\n"
-+
-+# translatable?
-+#: ../lib/ether.c:117
-+#, c-format
-+msgid "in_ether(%s): trailing junk!\n"
-+msgstr "in_ether(%s): trailing junk!\n"
-+
-+#: ../lib/fddi.c:84 ../lib/fddi.c:99
-+#, c-format
-+msgid "in_fddi(%s): invalid fddi address!\n"
-+msgstr "in_fddi(%s): ��当�fddiアドレス!\n"
-+
-+#: ../lib/fddi.c:111
-+#, c-format
-+msgid "in_fddi(%s): trailing : ignored!\n"
-+msgstr "in_fddi(%s): trailing : 無効!\n"
-+
-+# translatable?
-+#: ../lib/fddi.c:123
-+#, c-format
-+msgid "in_fddi(%s): trailing junk!\n"
-+msgstr "in_fddi(%s): trailing junk!\n"
-+
-+#: ../lib/getroute.c:101 ../lib/setroute.c:80
-+#, c-format
-+msgid "Address family `%s' not supported.\n"
-+msgstr "アドレスファミリ`%s'�サ�ート�れ����ん.\n"
-+
-+#: ../lib/getroute.c:107 ../lib/setroute.c:84
-+#, c-format
-+msgid "No routing for address family `%s'.\n"
-+msgstr "アドレスファミリ`%s'��経路�見��り��ん.\n"
-+
-+#: ../lib/hippi.c:84 ../lib/hippi.c:99
-+#, c-format
-+msgid "in_hippi(%s): invalid hippi address!\n"
-+msgstr "in_hippi(%s): ��当�hippiアドレス��!\n"
-+
-+#: ../lib/hippi.c:111
-+#, c-format
-+msgid "in_hippi(%s): trailing : ignored!\n"
-+msgstr "in_hippi(%s): trailing : 無効!\n"
-+
-+# translatable?
-+#: ../lib/hippi.c:122
-+#, c-format
-+msgid "in_hippi(%s): trailing junk!\n"
-+msgstr "in_hippi(%s): trailing junk!\n"
-+
-+#: ../lib/hw.c:160
-+msgid "Local Loopback"
-+msgstr "ローカルループ�ック"
-+
-+#: ../lib/hw.c:163
-+msgid "Serial Line IP"
-+msgstr "シリアルラインIP"
-+
-+#: ../lib/hw.c:164
-+msgid "VJ Serial Line IP"
-+msgstr "VJシリアルラインIP"
-+
-+#: ../lib/hw.c:165
-+msgid "6-bit Serial Line IP"
-+msgstr "6ビットシリアルラインIP"
-+
-+#: ../lib/hw.c:166
-+msgid "VJ 6-bit Serial Line IP"
-+msgstr "VJ 6ビットシリアルラインIP"
-+
-+#: ../lib/hw.c:167
-+msgid "Adaptive Serial Line IP"
-+msgstr "AdaptiveシリアルラインIP"
-+
-+#: ../lib/hw.c:170
-+msgid "Ethernet"
-+msgstr "イーサ�ット"
-+
-+# translatable?
-+#: ../lib/hw.c:176
-+msgid "Fiber Distributed Data Interface"
-+msgstr "Fiber Distributed Data Interface"
-+
-+#: ../lib/hw.c:179
-+msgid "HIPPI"
-+msgstr "HIPPI"
-+
-+#: ../lib/hw.c:191
-+msgid "generic X.25"
-+msgstr "ジェ�リックX.25"
-+
-+#: ../lib/hw.c:194
-+msgid "IPIP Tunnel"
-+msgstr "IPIPトン�ル"
-+
-+#: ../lib/hw.c:197
-+msgid "Point-to-Point Protocol"
-+msgstr "Point-to-Pointプロトコル"
-+
-+#: ../lib/hw.c:200
-+msgid "(Cisco)-HDLC"
-+msgstr "(Cisco)-HDLC"
-+
-+#: ../lib/hw.c:201
-+msgid "LAPB"
-+msgstr "LAPB"
-+
-+#: ../lib/hw.c:204
-+msgid "ARCnet"
-+msgstr "ARC�ット"
-+
-+#: ../lib/hw.c:207
-+msgid "Frame Relay DLCI"
-+msgstr "フレームリレーDLCI"
-+
-+#: ../lib/hw.c:208
-+msgid "Frame Relay Access Device"
-+msgstr "フレームリレーアクセスデ�イス"
-+
-+#: ../lib/hw.c:211
-+msgid "IPv6-in-IPv4"
-+msgstr "IPv6-in-IPv4"
-+
-+#: ../lib/hw.c:214
-+msgid "IrLAP"
-+msgstr "IrLAP"
-+
-+#: ../lib/hw.c:217
-+msgid "16/4 Mbps Token Ring"
-+msgstr "16/4 Mbpsトークンリング"
-+
-+#: ../lib/hw.c:219
-+msgid "16/4 Mbps Token Ring (New)"
-+msgstr "16/4 Mbpsトークンリング(新)"
-+
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr "ジェ�リックEUI-64"
-+
-+#: ../lib/inet.c:153 ../lib/inet6.c:79
-+#, c-format
-+msgid "rresolve: unsupport address family %d !\n"
-+msgstr "rresolve: アドレスファミリ%dをサ�ート�����ん!\n"
-+
-+#: ../lib/inet6.c:131
-+msgid "[UNKNOWN]"
-+msgstr "[�明]"
-+
-+#: ../lib/inet6_gr.c:71
-+#, c-format
-+msgid "INET6 (IPv6) not configured in this system.\n"
-+msgstr "INET6(IPv6)���システム��利用��るよ�設定�れ����ん.\n"
-+
-+#: ../lib/inet6_gr.c:74
-+#, c-format
-+msgid "Kernel IPv6 routing table\n"
-+msgstr "カー�ルIPv6 経路テーブル\n"
-+
-+#: ../lib/inet6_gr.c:76
-+#, c-format
-+msgid ""
-+"Destination                                 Next "
-+"Hop                                Flags Metric Ref    Use Iface\n"
-+msgstr "�信先サイト                                次回ホップ                             フラグ Metric Ref 使用数 インタフェース\n"
-+
-+#: ../lib/inet6_gr.c:150
-+#, c-format
-+msgid "Kernel IPv6 Neighbour Cache\n"
-+msgstr "カー�ルIPv6 近隣�ットワーク�キャッシュ\n"
-+
-+#: ../lib/inet6_gr.c:153
-+#, c-format
-+msgid ""
-+"Neighbour                                   HW Address        Iface    Flags "
-+"Ref State\n"
-+msgstr ""
-+"近隣サイト                               �ードウェアアドレス Iface   フラグ "
-+"Ref 状態\n"
-+
-+#: ../lib/inet6_gr.c:157
-+#, c-format
-+msgid ""
-+"Neighbour                                   HW Address        Iface    Flags "
-+"Ref State            Stale(sec) Delete(sec)\n"
-+msgstr ""
-+"近隣サイト                               �ードウェアアドレス Iface   フラグ "
-+"Ref 状態             Stale[秒]  Delete[秒]\n"
-+
-+#: ../lib/inet6_sr.c:46
-+#, c-format
-+msgid "Usage: inet6_route [-vF] del Target\n"
-+msgstr "使用法: inet6_route [-vF] del ターゲット\n"
-+
-+#: ../lib/inet6_sr.c:47
-+#, c-format
-+msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
-+msgstr ""
-+"        inet6_route [-vF] add ターゲット \n"
-+"                    [gw ゲートウェイ] [metric メトリック]\n"
-+"                    [[dev] インタフェース]\n"
-+
-+#: ../lib/inet6_sr.c:48
-+#, c-format
-+msgid "       inet6_route [-FC] flush      NOT supported\n"
-+msgstr "        inet6_route [-FC] flush      サ�ート�����ん\n"
-+
-+#: ../lib/inet6_sr.c:188
-+#, c-format
-+msgid "Flushing `inet6' routing table not supported\n"
-+msgstr "`inet6'経路テーブル�フラッシュ�サ�ート�����ん\n"
-+
-+#: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
-+msgid "INET (IPv4) not configured in this system.\n"
-+msgstr "INET(IPv4)���システム��利用��るよ��設定�れ����ん.\n"
-+
-+#: ../lib/inet_gr.c:53
-+#, c-format
-+msgid "Kernel IP routing table\n"
-+msgstr "カー�ルIP経路テーブル\n"
-+
-+#: ../lib/inet_gr.c:56
-+#, c-format
-+msgid ""
-+"Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+"Iface\n"
-+msgstr "�信先サイト    ゲートウェイ    �ットマスク   フラグ Metric Ref 使用数 インタフェース\n"
-+
-+#: ../lib/inet_gr.c:59
-+#, c-format
-+msgid ""
-+"Destination     Gateway         Genmask         Flags   MSS Window  irtt "
-+"Iface\n"
-+msgstr "�信先サイト    ゲートウェイ    �ットマスク   フラグ   MSS Window  irtt インタフェース\n"
-+
-+#: ../lib/inet_gr.c:62
-+#, c-format
-+msgid ""
-+"Destination     Gateway         Genmask         Flags Metric Ref    Use "
-+"Iface    MSS   Window irtt\n"
-+msgstr ""
-+"�信先サイト   ゲートウェイ    �ットマスク    フラグ Metric Ref 使用数 "
-+"Iface    MSS   Window irtt\n"
-+
-+#: ../lib/inet_gr.c:237
-+#, c-format
-+msgid "Kernel IP routing cache\n"
-+msgstr "カー�ルIP経路キャッシュ\n"
-+
-+#: ../lib/inet_gr.c:258
-+#, c-format
-+msgid ""
-+"Source          Destination     Gateway         Flags Metric Ref    Use "
-+"Iface\n"
-+msgstr "発信元サイト   �信先サイト    ゲートウェイ    フラグ Metric Ref 使用数 インタフェース\n"
-+
-+#: ../lib/inet_gr.c:261
-+#, c-format
-+msgid ""
-+"Source          Destination     Gateway         Flags   MSS Window  irtt "
-+"Iface\n"
-+msgstr "発信元サイト    �信先サイト    ゲートウェイ   フラグ   MSS Window  irtt インタフェース\n"
-+
-+#: ../lib/inet_gr.c:266
-+#, c-format
-+msgid ""
-+"Source          Destination     Gateway         Flags Metric Ref    Use "
-+"Iface    MSS   Window irtt  HH  Arp\n"
-+msgstr ""
-+"発信元サイト    �信先サイト    ゲートウェイ   フラグ Metric Ref 使用数 "
-+"Iface    MSS   Window irtt   HH  Arp\n"
-+
-+#: ../lib/inet_gr.c:290
-+#, c-format
-+msgid ""
-+"Source          Destination     Gateway         Flags Metric Ref    Use "
-+"Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-+msgstr ""
-+"発信元サイト   �信先サイト     ゲートウェイ   フラグ Metric Ref 使用数 "
-+"Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
-+
-+#: ../lib/inet_sr.c:51
-+#, c-format
-+msgid ""
-+"Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
-+"[[dev] If]\n"
-+msgstr ""
-+"使用法:inet_route [-vF] del {-host|-net} �信先[/プレフィックス]\n"
-+"                   [gw ゲートウェイ] [metric メトリック]\n"
-+"                   [[dev] インタフェース]\n"
-+
-+#: ../lib/inet_sr.c:52
-+#, c-format
-+msgid ""
-+"       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
-+msgstr ""
-+"       inet_route [-vF] add {-host|-net} �信先[/プレフィックス]\n"
-+"                   [gw ゲートウェイ] [metric メトリック]\n"
-+
-+#: ../lib/inet_sr.c:53
-+#, c-format
-+msgid ""
-+"                              [netmask N] [mss Mss] [window W] [irtt I]\n"
-+msgstr "            [netmask �ットマスク] [mss Mss] [window W] [irtt I]\n"
-+
-+#: ../lib/inet_sr.c:54
-+#, c-format
-+msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
-+msgstr "            [mod] [dyn] [reinstate] [[dev] インタフェース]\n"
-+
-+#: ../lib/inet_sr.c:55
-+#, c-format
-+msgid ""
-+"       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
-+msgstr ""
-+"       inet_route [-vF] add {-host|-net} �信先[/プレフィックス]\n"
-+"                   [metric メトリック] reject\n"
-+
-+#: ../lib/inet_sr.c:56
-+#, c-format
-+msgid "       inet_route [-FC] flush      NOT supported\n"
-+msgstr "        inet_route [-FC] flush      サ�ート�����ん\n"
-+
-+#: ../lib/inet_sr.c:158
-+#, c-format
-+msgid "route: %s: cannot use a NETWORK as gateway!\n"
-+msgstr "route: %s: NETWORKをゲートウェイ���使���ん!\n"
-+
-+#: ../lib/inet_sr.c:174
-+#, c-format
-+msgid "route: Invalid MSS/MTU.\n"
-+msgstr "route: MSS/MTU���当��.\n"
-+
-+#: ../lib/inet_sr.c:187
-+#, c-format
-+msgid "route: Invalid window.\n"
-+msgstr "route: window���当��.\n"
-+
-+#: ../lib/inet_sr.c:203
-+#, c-format
-+msgid "route: Invalid initial rtt.\n"
-+msgstr "route: �期rtt���当��.\n"
-+
-+#: ../lib/inet_sr.c:261
-+#, c-format
-+msgid "route: netmask %.8x doesn't make sense with host route\n"
-+msgstr "route: �ットマスク%.8x�ホスト経路を検出���ん\n"
-+
-+#: ../lib/inet_sr.c:265
-+#, c-format
-+msgid "route: bogus netmask %s\n"
-+msgstr "route: ���ットマスク`%s'��\n"
-+
-+#: ../lib/inet_sr.c:270
-+#, c-format
-+msgid "route: netmask doesn't match route address\n"
-+msgstr "route: �ットマスク�経路アドレス�一致���ん\n"
-+
-+#: ../lib/inet_sr.c:306
-+#, c-format
-+msgid "Flushing `inet' routing table not supported\n"
-+msgstr "`inet'経路テーブル�フラッシュ�サ�ート�����ん\n"
-+
-+#: ../lib/inet_sr.c:310
-+#, c-format
-+msgid "Modifying `inet' routing cache not supported\n"
-+msgstr "`inet'経路テーブル�変更�サ�ート�����ん\n"
-+
-+#: ../lib/ipx_gr.c:52
-+#, c-format
-+msgid "IPX not configured in this system.\n"
-+msgstr "IPX���システム��設定�れ����ん.\n"
-+
-+#: ../lib/ipx_gr.c:56
-+#, c-format
-+msgid "Kernel IPX routing table\n"
-+msgstr "カー�ルIPX経路テーブル\n"
-+
-+#. xxx
-+#: ../lib/ipx_gr.c:57
-+#, c-format
-+msgid "Destination               Router Net                Router Node\n"
-+msgstr "�信先サイト              ルータ �ット             ルータノード\n"
-+
-+#: ../lib/ipx_sr.c:33
-+#, c-format
-+msgid "IPX: this needs to be written\n"
-+msgstr "IPX: �れ�書�込��必���\n"
-+
-+#: ../lib/masq_info.c:198
-+#, c-format
-+msgid "IP masquerading entries\n"
-+msgstr "IPマスカレード エントリ\n"
-+
-+#: ../lib/masq_info.c:201
-+#, c-format
-+msgid "prot   expire source               destination          ports\n"
-+msgstr "プロト expire 発信元サイト         �信先サイト         �ート\n"
-+
-+#: ../lib/masq_info.c:204
-+#, c-format
-+msgid ""
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
-+msgstr ""
-+"プロト expire    �期seq delta prevd 発信元サイト         �信先サイ"
-+"ト         �ート\n"
-+
-+#: ../lib/netrom_gr.c:48
-+#, c-format
-+msgid "NET/ROM not configured in this system.\n"
-+msgstr "NET/ROM���システム��利用�能�よ��設定�れ����ん.\n"
-+
-+#: ../lib/netrom_gr.c:51
-+#, c-format
-+msgid "Kernel NET/ROM routing table\n"
-+msgstr "カー�ルNET/ROM経路テーブル\n"
-+
-+#: ../lib/netrom_gr.c:52
-+#, c-format
-+msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
-+msgstr "�信先サイト ニーモニック �質  近隣サイト インタフェース\n"
-+
-+#: ../lib/netrom_sr.c:34
-+#, c-format
-+msgid "netrom usage\n"
-+msgstr "netrom使用法\n"
-+
-+#: ../lib/netrom_sr.c:44
-+#, c-format
-+msgid "NET/ROM: this needs to be written\n"
-+msgstr "NET/ROM: �れ�書�込��必���\n"
-+
-+#: ../lib/ppp.c:44
-+#, c-format
-+msgid "You cannot start PPP with this program.\n"
-+msgstr "��プログラム��PPPを開始����ん. \n"
-+
-+#: ../lib/ppp_ac.c:38
-+#, c-format
-+msgid "Sorry, use pppd!\n"
-+msgstr "申�訳�り��ん�, pppdを使��下��!\n"
-+
-+#: ../lib/rose.c:87
-+msgid "Node address must be ten digits"
-+msgstr "ノードアドレス�10進数���れ��り��ん"
-+
-+#: ../lib/rose_gr.c:51
-+#, c-format
-+msgid "ROSE not configured in this system.\n"
-+msgstr "ROSE���システム��利用�能�よ��設定�れ����ん\n"
-+
-+#: ../lib/rose_gr.c:54
-+#, c-format
-+msgid "Kernel ROSE routing table\n"
-+msgstr "カー�ルROSE経路テーブル\n"
-+
-+#: ../lib/tr.c:86 ../lib/tr.c:101
-+#, c-format
-+msgid "in_tr(%s): invalid token ring address!\n"
-+msgstr "in_tr(%s): ��当�トークンリングアドレス��!\n"
-+
-+#: ../lib/tr.c:113
-+#, c-format
-+msgid "in_tr(%s): trailing : ignored!\n"
-+msgstr "in_tr(%s): trailing : 無効!\n"
-+
-+# translatable?
-+#: ../lib/tr.c:125
-+#, c-format
-+msgid "in_tr(%s): trailing junk!\n"
-+msgstr "in_tr(%s): trailing junk!\n"
-+
-+#: ../lib/interface.c:176
-+#, c-format
-+msgid "warning: no inet socket available: %s\n"
-+msgstr "警告: Inetソケット�利用����ん: %s\n"
-+
-+#: ../lib/interface.c:325
-+#, c-format
-+msgid "Warning: cannot open %s (%s). Limited output.\n"
-+msgstr "警告: %sを開���ん(%s). �定�れ�出力��.\n"
-+
-+#. Give better error message for this case.
-+#: ../lib/interface.c:571
-+msgid "Device not found"
-+msgstr "デ�イス�見��り��ん"
-+
-+#: ../lib/interface.c:575
-+#, c-format
-+msgid "%s: error fetching interface information: %s\n"
-+msgstr "%s: インタフェース情報を�得中�エラー�発生����: %s\n"
-+
-+#: ../lib/interface.c:608
-+msgid "     - no statistics available -"
-+msgstr "     - 統計情報を利用����ん -"
-+
-+#: ../lib/interface.c:612
-+#, c-format
-+msgid "[NO FLAGS]"
-+msgstr "[フラグ��]"
-+
-+#: ../lib/interface.c:688
-+#, c-format
-+msgid "%-9.9s Link encap:%s  "
-+msgstr "%-9.9s リンク方法:%s  "
-+
-+#: ../lib/interface.c:693
-+#, c-format
-+msgid "HWaddr %s  "
-+msgstr "�ードウェアアドレス %s "
-+
-+#: ../lib/interface.c:696
-+#, c-format
-+msgid "Media:%s"
-+msgstr "メディア:%s"
-+
-+#: ../lib/interface.c:698
-+#, c-format
-+msgid "(auto)"
-+msgstr "(自動)"
-+
-+#: ../lib/interface.c:705
-+#, c-format
-+msgid "          %s addr:%s "
-+msgstr "          %sアドレス:%s"
-+
-+#: ../lib/interface.c:708
-+#, c-format
-+msgid " P-t-P:%s "
-+msgstr " P-t-P:%s "
-+
-+#: ../lib/interface.c:711
-+#, c-format
-+msgid " Bcast:%s "
-+msgstr " ブロードキャスト:%s "
-+
-+#: ../lib/interface.c:713
-+#, c-format
-+msgid " Mask:%s\n"
-+msgstr " マスク:%s\n"
-+
-+#: ../lib/interface.c:730
-+#, c-format
-+msgid "          inet6 addr: %s/%d"
-+msgstr "          inet6アドレス: %s/%d"
-+
-+#: ../lib/interface.c:732
-+#, c-format
-+msgid " Scope:"
-+msgstr " 範囲:"
-+
-+#: ../lib/interface.c:735
-+#, c-format
-+msgid "Global"
-+msgstr "グロー�ル"
-+
-+#: ../lib/interface.c:738
-+#, c-format
-+msgid "Link"
-+msgstr "リンク"
-+
-+#: ../lib/interface.c:741
-+#, c-format
-+msgid "Site"
-+msgstr "サイト"
-+
-+# translatable?
-+#: ../lib/interface.c:744
-+#, c-format
-+msgid "Compat"
-+msgstr "Compat"
-+
-+#: ../lib/interface.c:747
-+#, c-format
-+msgid "Host"
-+msgstr "ホスト"
-+
-+#: ../lib/interface.c:750
-+#, c-format
-+msgid "Unknown"
-+msgstr "�明"
-+
-+#: ../lib/interface.c:765
-+#, c-format
-+msgid "          IPX/Ethernet II addr:%s\n"
-+msgstr "          IPX/イーサ�ットIIアドレス:%s\n"
-+
-+#: ../lib/interface.c:768
-+#, c-format
-+msgid "          IPX/Ethernet SNAP addr:%s\n"
-+msgstr "          IPX/イーサ�ットSNAPアドレス:%s\n"
-+
-+#: ../lib/interface.c:771
-+#, c-format
-+msgid "          IPX/Ethernet 802.2 addr:%s\n"
-+msgstr "          IPX/イーサ�ット802.2アドレス:%s\n"
-+
-+#: ../lib/interface.c:774
-+#, c-format
-+msgid "          IPX/Ethernet 802.3 addr:%s\n"
-+msgstr "          IPX/イーサ�ット802.3アドレス:%s\n"
-+
-+#: ../lib/interface.c:784
-+#, c-format
-+msgid "          EtherTalk Phase 2 addr:%s\n"
-+msgstr "          イーサトーク フェーズ2アドレス:%s\n"
-+
-+#: ../lib/interface.c:793
-+#, c-format
-+msgid "          econet addr:%s\n"
-+msgstr "          エコ�ットアドレス:%s\n"
-+
-+#: ../lib/interface.c:800
-+#, c-format
-+msgid "[NO FLAGS] "
-+msgstr "[フラグ��]"
-+
-+# translatable?
-+#: ../lib/interface.c:802
-+#, c-format
-+msgid "UP "
-+msgstr "UP "
-+
-+# translatable?
-+#: ../lib/interface.c:804
-+#, c-format
-+msgid "BROADCAST "
-+msgstr "BROADCAST "
-+
-+# translatable?
-+#: ../lib/interface.c:806
-+#, c-format
-+msgid "DEBUG "
-+msgstr "DEBUG "
-+
-+# translatable?
-+#: ../lib/interface.c:808
-+#, c-format
-+msgid "LOOPBACK "
-+msgstr "LOOPBACK "
-+
-+# translatable?
-+#: ../lib/interface.c:810
-+#, c-format
-+msgid "POINTOPOINT "
-+msgstr "POINTOPOINT "
-+
-+# translatable?
-+#: ../lib/interface.c:812
-+#, c-format
-+msgid "NOTRAILERS "
-+msgstr "NOTRAILERS "
-+
-+# translatable?
-+#: ../lib/interface.c:814
-+#, c-format
-+msgid "RUNNING "
-+msgstr "RUNNING "
-+
-+# translatable?
-+#: ../lib/interface.c:816
-+#, c-format
-+msgid "NOARP "
-+msgstr "NOARP "
-+
-+# translatable?
-+#: ../lib/interface.c:818
-+#, c-format
-+msgid "PROMISC "
-+msgstr "PROMISC "
-+
-+# translatable?
-+#: ../lib/interface.c:820
-+#, c-format
-+msgid "ALLMULTI "
-+msgstr "ALLMULTI "
-+
-+# translatable?
-+#: ../lib/interface.c:822
-+#, c-format
-+msgid "SLAVE "
-+msgstr "SLAVE "
-+
-+# translatable?
-+#: ../lib/interface.c:824
-+#, c-format
-+msgid "MASTER "
-+msgstr "MASTER "
-+
-+# translatable?
-+#: ../lib/interface.c:826
-+#, c-format
-+msgid "MULTICAST "
-+msgstr "MULTICAST "
-+
-+# translatable?
-+#: ../lib/interface.c:829
-+#, c-format
-+msgid "DYNAMIC "
-+msgstr "DYNAMIC "
-+
-+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
-+#: ../lib/interface.c:832
-+#, c-format
-+msgid " MTU:%d  Metric:%d"
-+msgstr " MTU:%d  メトリック:%d"
-+
-+# translatable?
-+#: ../lib/interface.c:836
-+#, c-format
-+msgid "  Outfill:%d  Keepalive:%d"
-+msgstr "  Outfill:%d  キープアライブ:%d"
-+
-+#: ../lib/interface.c:850
-+#, c-format
-+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
-+msgstr "RXパケット:%llu エラー:%lu �失:%lu オー�ラン:%lu フレーム:%lu\n"
-+
-+#: ../lib/interface.c:855
-+#, c-format
-+msgid "             compressed:%lu\n"
-+msgstr "             圧縮:%lu\n"
-+
-+#: ../lib/interface.c:895
-+#, c-format
-+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
-+msgstr "TXパケット:%llu エラー:%lu �失:%lu オー�ラン:%lu キャリア:%lu\n"
-+
-+#: ../lib/interface.c:899
-+#, c-format
-+msgid "          collisions:%lu "
-+msgstr "      ��(Collisions):%lu "
-+
-+#: ../lib/interface.c:901
-+#, c-format
-+msgid "compressed:%lu "
-+msgstr "圧縮:%lu "
-+
-+#: ../lib/interface.c:903
-+#, c-format
-+msgid "txqueuelen:%d "
-+msgstr "TXキュー長:%d "
-+
-+#: ../lib/interface.c:905
-+#, c-format
-+msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
-+msgstr "RX�イト:%llu (%lu.%lu %s)  TX�イト:%llu (%lu.%lu %s)\n"
-+
-+#: ../lib/interface.c:916
-+#, c-format
-+msgid "Interrupt:%d "
-+msgstr "割り込�:%d "
-+
-+#. Only print devices using it for
-+#. I/O maps
-+#: ../lib/interface.c:919
-+#, c-format
-+msgid "Base address:0x%x "
-+msgstr "ベースアドレス:0x%x "
-+
-+#: ../lib/interface.c:921
-+#, c-format
-+msgid "Memory:%lx-%lx "
-+msgstr "メモリ:%lx-%lx "
-+
-+#: ../lib/interface.c:924
-+#, c-format
-+msgid "DMA chan:%x "
-+msgstr "DMA�ェイン:%x "
-+
-+#: ../lib/sockets.c:63
-+#, c-format
-+msgid "No usable address families found.\n"
-+msgstr "利用�能�アドレスファミリ�見��り��ん.\n"
-+
-+#: ../lib/util-ank.c:229
-+#, c-format
-+msgid "ip: %s is invalid inet address\n"
-+msgstr "ip: %s���切�Inetアドレス��.\n"
-+
-+#: ../lib/util-ank.c:238
-+#, c-format
-+msgid "ip: %s is invalid inet prefix\n"
-+msgstr "ip: %s���切�Inetプレフィックス��\n"
-+
-+#: ../lib/util-ank.c:248
-+#, c-format
-+msgid "ip: %s is invalid IPv4 address\n"
-+msgstr "ip: %s���切�IPv4アドレス��.\n"
-+
-+#: ../lib/util-ank.c:256
-+#, c-format
-+msgid "ip: argument is wrong: %s\n"
-+msgstr "ip: 引数�間������: %s\n"
-+
-+#: ../ipmaddr.c:61
-+#, c-format
-+msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
-+msgstr "使用法: ipmaddr [ add | del ] マル�キャストアドレス dev 文字列\n"
-+
-+#: ../ipmaddr.c:62
-+#, c-format
-+msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
-+msgstr "        ipmaddr show [ dev 文字列 ] [ ipv4 | ipv6 | link | all ]\n"
-+
-+#: ../ipmaddr.c:63
-+#, c-format
-+msgid "       ipmaddr -V | -version\n"
-+msgstr "       ipmaddr -V | -version\n"
-+
-+#: ../ipmaddr.c:263
-+#, c-format
-+msgid "family %d "
-+msgstr "ファミリ %d "
-+
-+#: ../ipmaddr.c:272
-+#, c-format
-+msgid " users %d"
-+msgstr " ユーザ %d"
-+
-+#: ../ipmaddr.c:358
-+msgid "Cannot create socket"
-+msgstr "ソケットを作�����ん"
-+
-+#: ../slattach.c:180
-+#, c-format
-+msgid "slattach: /dev/%s already locked!\n"
-+msgstr "slattach: /dev/%s ����ロック�れ����!\n"
-+
-+#: ../slattach.c:186
-+#, c-format
-+msgid "slattach: tty_lock: (%s): %s\n"
-+msgstr "slattach: tty_lock: (%s): %s\n"
-+
-+#: ../slattach.c:192
-+#, c-format
-+msgid "slattach: cannot write PID file\n"
-+msgstr "slattach: PIDファイルを書�込���ん\n"
-+
-+#: ../slattach.c:202
-+#, c-format
-+msgid "slattach: tty_lock: UUCP user %s unknown!\n"
-+msgstr "slattach: tty_lock: UUCPユーザ%s��明��!\n"
-+
-+#: ../slattach.c:430
-+#, c-format
-+msgid "slattach: tty_hangup(DROP): %s\n"
-+msgstr "slattach: tty_hangup(DROP): %s\n"
-+
-+#: ../slattach.c:437
-+#, c-format
-+msgid "slattach: tty_hangup(RAISE): %s\n"
-+msgstr "slattach: tty_hangup(RAISE): %s\n"
-+
-+#: ../slattach.c:468
-+#, c-format
-+msgid "slattach: tty name too long\n"
-+msgstr "slattach: tty��長����\n"
-+
-+#: ../slattach.c:498
-+#, c-format
-+msgid "slattach: tty_open: cannot get current state!\n"
-+msgstr "slattach: tty_open: �在�状態を得られ��ん!\n"
-+
-+#: ../slattach.c:505
-+#, c-format
-+msgid "slattach: tty_open: cannot get current line disc!\n"
-+msgstr "slattach: tty_open: �在�ライン・ディスクを得られ��ん!\n"
-+
-+#: ../slattach.c:513
-+#, c-format
-+msgid "slattach: tty_open: cannot set RAW mode!\n"
-+msgstr "slattach: tty_open: RAWモードを設定����ん!\n"
-+
-+#: ../slattach.c:520
-+#, c-format
-+msgid "slattach: tty_open: cannot set %s bps!\n"
-+msgstr "slattach: tty_open: %s bpsを設定����ん!\n"
-+
-+#: ../slattach.c:530
-+#, c-format
-+msgid "slattach: tty_open: cannot set 8N1 mode!\n"
-+msgstr "slattach: tty_open: 8N1モード�設定����ん!\n"
-+
-+#: ../slattach.c:672
-+#, c-format
-+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+msgstr "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+
-+#: ../slattach.c:704
-+#, c-format
-+msgid "%s started"
-+msgstr "%sを開始����"
-+
-+#: ../slattach.c:705
-+#, c-format
-+msgid " on %s"
-+msgstr "(%s上)"
-+
-+#: ../slattach.c:706
-+#, c-format
-+msgid " interface %s\n"
-+msgstr " インタフェース %s\n"
---- net-tools-1.60.orig/ipmaddr.c
-+++ net-tools-1.60/ipmaddr.c
-@@ -291,13 +291,15 @@
- static int multiaddr_list(int argc, char **argv)
- {
- 	struct ma_info *list = NULL;
-+	size_t l;
- 
- 	while (argc > 0) {
- 		if (strcmp(*argv, "dev") == 0) {
- 			NEXT_ARG();
--			if (filter_dev[0])
-+			l = strlen(*argv);
-+			if (l <= 0 || l >= sizeof(filter_dev))
- 				usage();
--			strcpy(filter_dev, *argv);
-+			strncpy(filter_dev, *argv, sizeof (filter_dev));
- 		} else if (strcmp(*argv, "all") == 0) {
- 			filter_family = AF_UNSPEC;
- 		} else if (strcmp(*argv, "ipv4") == 0) {
-@@ -307,9 +309,10 @@
- 		} else if (strcmp(*argv, "link") == 0) {
- 			filter_family = AF_PACKET;
- 		} else {
--			if (filter_dev[0])
-+			l = strlen(*argv);
-+			if (l <= 0 || l >= sizeof(filter_dev))
- 				usage();
--			strcpy(filter_dev, *argv);
-+			strncpy(filter_dev, *argv, sizeof (filter_dev));
- 		}
- 		argv++; argc--;
- 	}
---- net-tools-1.60.orig/Makefile
-+++ net-tools-1.60/Makefile
-@@ -76,7 +76,7 @@
- NET_LIB_PATH = lib
- NET_LIB_NAME = net-tools
- 
--PROGS	:= ifconfig hostname arp netstat route rarp slattach plipconfig nameif
-+PROGS	:= ifconfig arp netstat route rarp slattach plipconfig nameif # hostname
- 
- -include config.make
- ifeq ($(HAVE_IP_TOOLS),1)
-@@ -88,7 +88,7 @@
- 
- # Compiler and Linker Options
- # You may need to uncomment and edit these if you are using libc5 and IPv6.
--COPTS = -D_GNU_SOURCE -O2 -Wall -g # -I/usr/inet6/include
-+COPTS = -D_GNU_SOURCE -O2 -Wall # -g -I/usr/inet6/include
- ifeq ($(origin LOPTS), undefined)
- LOPTS = 
- endif
-@@ -116,6 +116,18 @@
- CFLAGS	= $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH)
- LDFLAGS	= $(LOPTS) -L$(NET_LIB_PATH)
- 
-+INSTALL = install
-+INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
-+          
-+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-+CFLAGS += -g
-+endif
-+
-+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-+INSTALL_PROGRAM += -s
-+endif
-+
-+
- SUBDIRS	= man/ $(NET_LIB_PATH)/
- 
- ifeq ($(origin CC), undefined)
-@@ -223,29 +235,29 @@
- installbin:
- 	install -m 0755 -d ${BASEDIR}/sbin
- 	install -m 0755 -d ${BASEDIR}/bin
--	install -m 0755 arp        ${BASEDIR}/sbin
--	install -m 0755 hostname   ${BASEDIR}/bin
--	install -m 0755 ifconfig   ${BASEDIR}/sbin
--	install -m 0755 nameif     ${BASEDIR}/sbin
--	install -m 0755 netstat    ${BASEDIR}/bin
--	install -m 0755 plipconfig $(BASEDIR)/sbin
--	install -m 0755 rarp       ${BASEDIR}/sbin
--	install -m 0755 route      ${BASEDIR}/sbin
--	install -m 0755 slattach   $(BASEDIR)/sbin
-+	$(INSTALL_PROGRAM) arp        ${BASEDIR}/sbin
-+#	$(INSTALL_PROGRAM) hostname   ${BASEDIR}/bin
-+	$(INSTALL_PROGRAM) ifconfig   ${BASEDIR}/sbin
-+	$(INSTALL_PROGRAM) nameif     ${BASEDIR}/sbin
-+	$(INSTALL_PROGRAM) netstat    ${BASEDIR}/bin
-+	$(INSTALL_PROGRAM) plipconfig $(BASEDIR)/sbin
-+	$(INSTALL_PROGRAM) rarp       ${BASEDIR}/sbin
-+	$(INSTALL_PROGRAM) route      ${BASEDIR}/sbin
-+	$(INSTALL_PROGRAM) slattach   $(BASEDIR)/sbin
- ifeq ($(HAVE_IP_TOOLS),1)
--	install -m 0755 ipmaddr    $(BASEDIR)/sbin
--	install -m 0755 iptunnel   $(BASEDIR)/sbin
-+	$(INSTALL_PROGRAM) ipmaddr    $(BASEDIR)/sbin
-+	$(INSTALL_PROGRAM) iptunnel   $(BASEDIR)/sbin
- endif
- ifeq ($(HAVE_MII),1)
--	install -m 0755 mii-tool   $(BASEDIR)/sbin
--endif
--	ln -fs hostname $(BASEDIR)/bin/dnsdomainname
--	ln -fs hostname $(BASEDIR)/bin/ypdomainname
--	ln -fs hostname $(BASEDIR)/bin/nisdomainname
--	ln -fs hostname $(BASEDIR)/bin/domainname
--ifeq ($(HAVE_AFDECnet),1)
--	ln -fs hostname $(BASEDIR)/bin/nodename
-+	$(INSTALL_PROGRAM) mii-tool   $(BASEDIR)/sbin
- endif
-+#	ln -fs hostname $(BASEDIR)/bin/dnsdomainname
-+#	ln -fs hostname $(BASEDIR)/bin/ypdomainname
-+#	ln -fs hostname $(BASEDIR)/bin/nisdomainname
-+#	ln -fs hostname $(BASEDIR)/bin/domainname
-+#ifeq ($(HAVE_AFDECnet),1)
-+#	ln -fs hostname $(BASEDIR)/bin/nodename
-+#endif
- 
- savebin:
- 	@for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \
---- net-tools-1.60.orig/README
-+++ net-tools-1.60/README
-@@ -10,7 +10,7 @@
- subsystem of the Linux kernel.  This includes arp, hostname, ifconfig,
- netstat, rarp and route.  Additionally, this package contains
- utilities relating to particular network hardware types (plipconfig,
--slattach) and advanced aspects of IP configuration (iptunnel,
-+slattach, mii-tool) and advanced aspects of IP configuration (iptunnel,
- ipmaddr).
- 
- Please include the output of "program --version" when reporting bugs.
-@@ -24,10 +24,14 @@
- 
-    INSTALLING		Installation instructions.
- 
--   COPYING		Your free copy of the GNU Public License.
--
-    TODO			Some things that need to be done.
- 
-+The  Homepage (including CVS repository, release downloads and a form to
-+request enhancements) is hosted by BerliOS Developer. Please consider to
-+join the project if you want to contribute:
-+
-+                  http://net-tools.berlios.de/
-+
- 
-                           Notes
-                           -----
---- net-tools-1.60.orig/arp.c
-+++ net-tools-1.60/arp.c
-@@ -8,7 +8,7 @@
-  *              NET-3 Networking Distribution for the LINUX operating
-  *              system.
-  *
-- * Version:     $Id: arp.c,v 1.20 2001/04/08 17:05:05 pb Exp $
-+ * Version:     $Id: arp.c,v 1.25 2005/12/04 02:57:15 ecki Exp $
-  *
-  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
-  *
-@@ -100,9 +100,10 @@
- {
-     char host[128];
-     struct arpreq req;
--    struct sockaddr sa;
-+    struct sockaddr_storage ss;
-+    struct sockaddr *sa;
-     int flags = 0;
--    int err;
-+    int deleted = 0;
- 
-     memset((char *) &req, 0, sizeof(req));
- 
-@@ -112,12 +113,13 @@
- 	return (-1);
-     }
-     safe_strncpy(host, *args, (sizeof host));
--    if (ap->input(0, host, &sa) < 0) {
-+    sa = (struct sockaddr *)&ss;
-+    if (ap->input(0, host, sa) < 0) {
- 	ap->herror(host);
- 	return (-1);
-     }
-     /* If a host has more than one address, use the correct one! */
--    memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr));
-+    memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr));
- 
-     if (hw_set)
- 	req.arp_ha.sa_family = hw->type;
-@@ -148,7 +150,7 @@
- 	    continue;
- 	}
- 	if (!strcmp(*args, "dontpub")) {
--#ifdef HAVE_ATF_DONTPUB
-+#ifdef ATF_DONTPUB
- 	    req.arp_flags |= ATF_DONTPUB;
- #else
- 	    ENOSUPP("arp", "ATF_DONTPUB");
-@@ -157,7 +159,7 @@
- 	    continue;
- 	}
- 	if (!strcmp(*args, "auto")) {
--#ifdef HAVE_ATF_MAGIC
-+#ifdef ATF_MAGIC
- 	    req.arp_flags |= ATF_MAGIC;
- #else
- 	    ENOSUPP("arp", "ATF_MAGIC");
-@@ -177,11 +179,11 @@
- 		usage();
- 	    if (strcmp(*args, "255.255.255.255") != 0) {
- 		strcpy(host, *args);
--		if (ap->input(0, host, &sa) < 0) {
-+		if (ap->input(0, host, sa) < 0) {
- 		    ap->herror(host);
- 		    return (-1);
- 		}
--		memcpy((char *) &req.arp_netmask, (char *) &sa,
-+		memcpy((char *) &req.arp_netmask, (char *) sa,
- 		       sizeof(struct sockaddr));
- 		req.arp_flags |= ATF_NETMASK;
- 	    }
-@@ -190,35 +192,41 @@
- 	}
- 	usage();
-     }
-+
-+    // if neighter priv nor pub is given, work on both
-     if (flags == 0)
- 	flags = 3;
- 
-     strcpy(req.arp_dev, device);
- 
--    err = -1;
-+    /* unfortuatelly the kernel interface does not allow us to
-+       delete private entries anlone, so we need this hack
-+       to avoid "not found" errors if we try both. */
-+    deleted = 0;
- 
-     /* Call the kernel. */
-     if (flags & 2) {
- 	if (opt_v)
--	    fprintf(stderr, "arp: SIOCDARP(nopub)\n");
--	if ((err = ioctl(sockfd, SIOCDARP, &req) < 0)) {
--	    if (errno == ENXIO) {
-+	    fprintf(stderr, "arp: SIOCDARP(dontpub)\n");
-+	if (ioctl(sockfd, SIOCDARP, &req) < 0) {
-+	    if ((errno == ENXIO) || (errno == ENOENT)) {
- 		if (flags & 1)
--		    goto nopub;
-+		    goto dontpub;
- 		printf(_("No ARP entry for %s\n"), host);
- 		return (-1);
- 	    }
--	    perror("SIOCDARP(priv)");
-+	    perror("SIOCDARP(dontpub)");
- 	    return (-1);
--	}
-+	} else
-+	  deleted = 1;
-     }
--    if ((flags & 1) && (err)) {
--      nopub:
-+    if (!deleted && (flags & 1)) {
-+      dontpub:
- 	req.arp_flags |= ATF_PUBL;
- 	if (opt_v)
- 	    fprintf(stderr, "arp: SIOCDARP(pub)\n");
- 	if (ioctl(sockfd, SIOCDARP, &req) < 0) {
--	    if (errno == ENXIO) {
-+	    if ((errno == ENXIO) || (errno == ENOENT)) {
- 		printf(_("No ARP entry for %s\n"), host);
- 		return (-1);
- 	    }
-@@ -260,7 +268,8 @@
- {
-     char host[128];
-     struct arpreq req;
--    struct sockaddr sa;
-+    struct sockaddr_storage ss;
-+    struct sockaddr *sa;
-     int flags;
- 
-     memset((char *) &req, 0, sizeof(req));
-@@ -271,12 +280,13 @@
- 	return (-1);
-     }
-     safe_strncpy(host, *args++, (sizeof host));
--    if (ap->input(0, host, &sa) < 0) {
-+    sa = (struct sockaddr *)&ss;
-+    if (ap->input(0, host, sa) < 0) {
- 	ap->herror(host);
- 	return (-1);
-     }
-     /* If a host has more than one address, use the correct one! */
--    memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr));
-+    memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr));
- 
-     /* Fetch the hardware address. */
-     if (*args == NULL) {
-@@ -317,7 +327,7 @@
- 	    continue;
- 	}
- 	if (!strcmp(*args, "dontpub")) {
--#ifdef HAVE_ATF_DONTPUB
-+#ifdef ATF_DONTPUB
- 	    flags |= ATF_DONTPUB;
- #else
- 	    ENOSUPP("arp", "ATF_DONTPUB");
-@@ -326,7 +336,7 @@
- 	    continue;
- 	}
- 	if (!strcmp(*args, "auto")) {
--#ifdef HAVE_ATF_MAGIC
-+#ifdef ATF_MAGIC
- 	    flags |= ATF_MAGIC;
- #else
- 	    ENOSUPP("arp", "ATF_MAGIC");
-@@ -346,11 +356,11 @@
- 		usage();
- 	    if (strcmp(*args, "255.255.255.255") != 0) {
- 		strcpy(host, *args);
--		if (ap->input(0, host, &sa) < 0) {
-+		if (ap->input(0, host, sa) < 0) {
- 		    ap->herror(host);
- 		    return (-1);
- 		}
--		memcpy((char *) &req.arp_netmask, (char *) &sa,
-+		memcpy((char *) &req.arp_netmask, (char *) sa,
- 		       sizeof(struct sockaddr));
- 		flags |= ATF_NETMASK;
- 	    }
-@@ -445,11 +455,11 @@
- 	strcat(flags, "M");
-     if (arp_flags & ATF_PUBL)
- 	strcat(flags, "P");
--#ifdef HAVE_ATF_MAGIC
-+#ifdef ATF_MAGIC
-     if (arp_flags & ATF_MAGIC)
- 	strcat(flags, "A");
- #endif
--#ifdef HAVE_ATF_DONTPUB
-+#ifdef ATF_DONTPUB
-     if (arp_flags & ATF_DONTPUB)
- 	strcat(flags, "!");
- #endif
-@@ -463,7 +473,7 @@
- 
-     if (!(arp_flags & ATF_COM)) {
- 	if (arp_flags & ATF_PUBL)
--	    printf("%-8.8s%-20.20s", "*", "*");
-+	    printf("%-8.8s%-20.20s", "*", _("<from_interface>"));
- 	else
- 	    printf("%-8.8s%-20.20s", "", _("(incomplete)"));
-     } else {
-@@ -486,7 +496,7 @@
- 
-     if (!(arp_flags & ATF_COM)) {
- 	if (arp_flags & ATF_PUBL)
--	    printf("* ");
-+	    printf("<from_interface> ");
- 	else
- 	    printf(_("<incomplete> "));
-     } else {
-@@ -499,12 +509,12 @@
-     if (arp_flags & ATF_PERM)
- 	printf("PERM ");
-     if (arp_flags & ATF_PUBL)
--	printf("PUP ");
--#ifdef HAVE_ATF_MAGIC
-+	printf("PUB ");
-+#ifdef ATF_MAGIC
-     if (arp_flags & ATF_MAGIC)
- 	printf("AUTO ");
- #endif
--#ifdef HAVE_ATF_DONTPUB
-+#ifdef ATF_DONTPUB
-     if (arp_flags & ATF_DONTPUB)
- 	printf("DONTPUB ");
- #endif
-@@ -519,7 +529,8 @@
- static int arp_show(char *name)
- {
-     char host[100];
--    struct sockaddr sa;
-+    struct sockaddr_storage ss;
-+    struct sockaddr *sa;
-     char ip[100];
-     char hwa[100];
-     char mask[100];
-@@ -532,14 +543,15 @@
- 
-     host[0] = '\0';
- 
-+    sa = (struct sockaddr *)&ss;
-     if (name != NULL) {
- 	/* Resolve the host name. */
- 	safe_strncpy(host, name, (sizeof host));
--	if (ap->input(0, host, &sa) < 0) {
-+	if (ap->input(0, host, sa) < 0) {
- 	    ap->herror(host);
- 	    return (-1);
- 	}
--	safe_strncpy(host, ap->sprint(&sa, 1), sizeof(host));
-+	safe_strncpy(host, ap->sprint(sa, 1), sizeof(host));
-     }
-     /* Open the PROCps kernel table. */
-     if ((fp = fopen(_PATH_PROCNET_ARP, "r")) == NULL) {
-@@ -575,10 +587,10 @@
- 	    if (opt_n)
- 		hostname = "?";
- 	    else {
--		if (ap->input(0, ip, &sa) < 0)
-+		if (ap->input(0, ip, sa) < 0)
- 		    hostname = ip;
- 		else
--		    hostname = ap->sprint(&sa, opt_n | 0x8000);
-+		    hostname = ap->sprint(sa, opt_n | 0x8000);
- 		if (strcmp(hostname, ip) == 0)
- 		    hostname = "?";
- 	    }
-@@ -612,11 +624,10 @@
- static void usage(void)
- {
-     fprintf(stderr, _("Usage:\n  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP cache\n"));
--    fprintf(stderr, _("  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP entry\n"));
--    fprintf(stderr, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from file\n"));
--    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add entry\n"));
--    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  <-''-\n"));
--    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      <-''-\n\n"));
-+    fprintf(stderr, _("  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP entry\n"));
-+    fprintf(stderr, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from file\n"));
-+    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add entry\n"));
-+    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          <-''-\n\n"));
-     
-     fprintf(stderr, _("        -a                       display (all) hosts in alternative (BSD) style\n"));
-     fprintf(stderr, _("        -s, --set                set a new ARP entry\n"));
---- net-tools-1.60.orig/config.in
-+++ net-tools-1.60/config.in
-@@ -49,16 +49,16 @@
- * 
- bool 'UNIX protocol family' HAVE_AFUNIX y
- bool 'INET (TCP/IP) protocol family' HAVE_AFINET y
--bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n
-+bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y
- bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y
- bool 'Appletalk DDP protocol family' HAVE_AFATALK y
- bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y
- bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y
--bool 'Rose (packet radio) protocol family' HAVE_AFROSE n
-+bool 'Rose (packet radio) protocol family' HAVE_AFROSE y
- bool 'X.25 (CCITT) protocol family' HAVE_AFX25 y
--bool 'Econet protocol family' HAVE_AFECONET n
-+bool 'Econet protocol family' HAVE_AFECONET y
- bool 'DECnet protocol family' HAVE_AFDECnet n
--bool 'Ash protocol family' HAVE_AFASH n
-+bool 'Ash protocol family' HAVE_AFASH y
- *
- *
- *            Device Hardware types.
-@@ -71,21 +71,23 @@
- bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y
- bool 'Token ring (generic) support' HAVE_HWTR y
- bool 'AX25 (packet radio) support' HAVE_HWAX25 y
--bool 'Rose (packet radio) support' HAVE_HWROSE n
-+bool 'Rose (packet radio) support' HAVE_HWROSE y
- bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y
- bool 'X.25 (generic) support' HAVE_HWX25 y
- bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y
--bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT n
--bool 'FDDI (generic) support' HAVE_HWFDDI n
--bool 'HIPPI (generic) support' HAVE_HWHIPPI n
--bool 'Ash hardware support' HAVE_HWASH n
--bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB n
-+bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y
-+bool 'FDDI (generic) support' HAVE_HWFDDI y
-+bool 'HIPPI (generic) support' HAVE_HWHIPPI y
-+bool 'Ash hardware support' HAVE_HWASH y
-+bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB y
- bool 'IrDA support' HAVE_HWIRDA y
--bool 'Econet hardware support' HAVE_HWEC n
-+bool 'Econet hardware support' HAVE_HWEC y
-+bool 'Generic EUI-64 hardware support' HAVE_HWEUI64 y
-+
- *
- *
- *           Other Features.
- *
--bool 'IP Masquerading support' HAVE_FW_MASQUERADE n
--bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n
--bool 'Build mii-tool' HAVE_MII n
-+bool 'IP Masquerading support' HAVE_FW_MASQUERADE y
-+bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y
-+bool 'Build mii-tool' HAVE_MII y
---- net-tools-1.60.orig/hostname.c
-+++ net-tools-1.60/hostname.c
-@@ -9,20 +9,19 @@
-  *              dnsdmoainname   
-  *              nisdomainname {name|-F file}
-  *
-- * Version:     hostname 1.96 (1996-02-18)
-+ * Version:     hostname 1.101 (2003-10-11)
-  *
-  * Author:      Peter Tobias <tobias@et-inf.fho-emden.de>
-  *
-  * Changes:
-- *      {1.90}  Peter Tobias :          Added -a and -i options.
-- *      {1.91}  Bernd Eckenfels :       -v,-V rewritten, long_opts 
-- *                                      (major rewrite), usage.
-- *960120 {1.95} Bernd Eckenfels :       -y/nisdomainname - support for get/
-- *                                      setdomainname added 
-- *960218 {1.96} Bernd Eckenfels :       netinet/in.h added
-- *980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
-- *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings
-+ *         {1.90}  Peter Tobias : Added -a and -i options.
-+ *         {1.91}  Bernd Eckenfels : -v,-V rewritten, long_opts (major rewrite), usage.
-+ *19960120 {1.95}  Bernd Eckenfels : -y/nisdomainname - support for get/setdomainname added 
-+ *19960218 {1.96}  Bernd Eckenfels : netinet/in.h added
-+ *19980629 {1.97}  Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
-+ *20000213 {1.99}  Arnaldo Carvalho de Melo : fixed some i18n strings
-  *20010404 {1.100} Arnaldo Carvalho de Melo: use setlocale
-+ *20031011 {1.101} Maik Broemme: gcc 3.x fixes (default: break)
-  *
-  *              This program is free software; you can redistribute it
-  *              and/or  modify it under  the terms of  the GNU General
-@@ -31,7 +30,9 @@
-  *              your option) any later version.
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include <getopt.h>
- #include <string.h>
- #include <netdb.h>
-@@ -78,6 +79,7 @@
-             fprintf(stderr, _("%s: name too long\n"), program_name);
-             break;
-         default:
-+	    break;
-         }
- 	exit(1);
-     }
-@@ -97,7 +99,6 @@
- 	case EINVAL:
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
--	default:
- 	}
- 	exit(1);
-     };
-@@ -116,7 +117,6 @@
- 	case EINVAL:
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
--	default:
- 	}
- 	exit(1);
-     };
-@@ -173,7 +173,6 @@
- 	    *p = '\0';
- 	printf("%s\n", hp->h_name);
- 	break;
--    default:
-     }
- }
- 
-@@ -326,11 +325,12 @@
- 	    break;
- 	case 'V':
- 	    version();
-+	    break; // not reached
- 	case '?':
- 	case 'h':
- 	default:
- 	    usage();
--
-+	    break; // not reached
- 	};
- 
- 
---- net-tools-1.60.orig/ifconfig.c
-+++ net-tools-1.60/ifconfig.c
-@@ -3,7 +3,7 @@
-  *              that either displays or sets the characteristics of
-  *              one or more of the system's networking interfaces.
-  *
-- * Version:     $Id: ifconfig.c,v 1.50 2001/04/13 18:25:18 pb Exp $
-+ * Version:     $Id: ifconfig.c,v 1.57 2002/12/10 00:56:41 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              and others.  Copyright 1993 MicroWalt Corporation
-@@ -88,7 +88,6 @@
- char *Release = RELEASE, *Version = "ifconfig 1.42 (2001-04-13)";
- 
- int opt_a = 0;			/* show all interfaces          */
--int opt_i = 0;			/* show the statistics          */
- int opt_v = 0;			/* debugging output flag        */
- 
- int addr_family = 0;		/* currently selected AF        */
-@@ -105,7 +104,7 @@
-     int res;
- 
-     if (ife_short)
--	printf(_("Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-+	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
- 
-     if (!ifname) {
- 	res = for_all_interfaces(do_if_print, &opt_a);
-@@ -127,7 +126,7 @@
- 
-     safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-     if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) {
--	fprintf(stderr, _("%s: unknown interface: %s\n"), 
-+	fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), 
- 		ifname,	strerror(errno));
- 	return (-1);
-     }
-@@ -159,7 +158,7 @@
- 
-     safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-     if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
--	fprintf(stderr, _("%s: unknown interface: %s\n"), 
-+	fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), 
- 		ifname, strerror(errno));
- 	return -1;
-     }
-@@ -172,9 +171,35 @@
-     return (0);
- }
- 
-+/** test is a specified flag is set */
-+static int test_flag(char *ifname, short flags)
-+{
-+    struct ifreq ifr;
-+    int fd;
-+
-+    if (strchr(ifname, ':')) {
-+        /* This is a v4 alias interface.  Downing it via a socket for
-+	   another AF may have bad consequences. */
-+        fd = get_socket_for_af(AF_INET);
-+	if (fd < 0) {
-+	    fprintf(stderr, _("No support for INET on this system.\n"));
-+	    return -1;
-+	}
-+    } else
-+        fd = skfd;
-+
-+    safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-+    if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
-+	fprintf(stderr, _("%s: ERROR while testing interface flags: %s\n"), 
-+		ifname, strerror(errno));
-+	return -1;
-+    }
-+    return (ifr.ifr_flags & flags);
-+}
-+
- static void usage(void)
- {
--    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"));
-+    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"));
- #if HAVE_AFINET
-     fprintf(stderr, _("  [add <address>[/<prefixlen>]]\n"));
-     fprintf(stderr, _("  [del <address>[/<prefixlen>]]\n"));
-@@ -208,7 +233,7 @@
- static void version(void)
- {
-     fprintf(stderr, "%s\n%s\n", Release, Version);
--    exit(0);
-+    exit(E_USAGE);
- }
- 
- static int set_netmask(int skfd, struct ifreq *ifr, struct sockaddr *sa)
-@@ -222,18 +247,19 @@
- 		strerror(errno));
- 	err = 1;
-     }
--    return 0;
-+    return err;
- }
- 
- int main(int argc, char **argv)
- {
-     struct sockaddr sa;
-+    struct sockaddr samask;
-     struct sockaddr_in sin;
-     char host[128];
-     struct aftype *ap;
-     struct hwtype *hw;
-     struct ifreq ifr;
--    int goterr = 0, didnetmask = 0;
-+    int goterr = 0, didnetmask = 0, neednetmask=0;
-     char **spp;
-     int fd;
- #if HAVE_AFINET6
-@@ -388,6 +414,8 @@
- 	}
- 	if (!strcmp(*spp, "-promisc")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_PROMISC);
-+	    if (test_flag(ifr.ifr_name, IFF_PROMISC) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in promisc mode... maybe other application is running?\n"), ifr.ifr_name);
- 	    spp++;
- 	    continue;
- 	}
-@@ -398,6 +426,8 @@
- 	}
- 	if (!strcmp(*spp, "-multicast")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_MULTICAST);
-+	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in MULTICAST mode.\n"), ifr.ifr_name);
- 	    spp++;
- 	    continue;
- 	}
-@@ -408,6 +438,8 @@
- 	}
- 	if (!strcmp(*spp, "-allmulti")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI);
-+	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name);
- 	    spp++;
- 	    continue;
- 	}
-@@ -430,6 +462,8 @@
- 	if (!strcmp(*spp, "-dynamic")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC);
- 	    spp++;
-+	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name);
- 	    continue;
- 	}
- #endif
-@@ -486,6 +520,8 @@
- 
- 	if (!strcmp(*spp, "-broadcast")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST);
-+	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name);
- 	    spp++;
- 	    continue;
- 	}
-@@ -493,7 +529,10 @@
- 	    if (*++spp != NULL) {
- 		safe_strncpy(host, *spp, (sizeof host));
- 		if (ap->input(0, host, &sa) < 0) {
--		    ap->herror(host);
-+		    if (ap->herror)
-+		    	ap->herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for broadcast\n"), host);
- 		    goterr = 1;
- 		    spp++;
- 		    continue;
-@@ -515,7 +554,10 @@
- 		usage();
- 	    safe_strncpy(host, *spp, (sizeof host));
- 	    if (ap->input(0, host, &sa) < 0) {
--		ap->herror(host);
-+		    if (ap->herror)
-+		    	ap->herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for dstaddr\n"), host);
- 		goterr = 1;
- 		spp++;
- 		continue;
-@@ -535,13 +577,16 @@
- 		usage();
- 	    safe_strncpy(host, *spp, (sizeof host));
- 	    if (ap->input(0, host, &sa) < 0) {
--		ap->herror(host);
-+		    if (ap->herror)
-+		    	ap->herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for netmask\n"), host);
- 		goterr = 1;
- 		spp++;
- 		continue;
- 	    }
- 	    didnetmask++;
--	    goterr = set_netmask(ap->fd, &ifr, &sa);
-+	    goterr |= set_netmask(ap->fd, &ifr, &sa);
- 	    spp++;
- 	    continue;
- 	}
-@@ -613,6 +658,8 @@
- 	if (!strcmp(*spp, "-pointopoint")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT);
- 	    spp++;
-+	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name);
- 	    continue;
- 	}
- 	if (!strcmp(*spp, "pointopoint")) {
-@@ -620,7 +667,10 @@
- 		spp++;
- 		safe_strncpy(host, *spp, (sizeof host));
- 		if (ap->input(0, host, &sa)) {
--		    ap->herror(host);
-+		    if (ap->herror)
-+		    	ap->herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for pointopoint\n"), host);
- 		    goterr = 1;
- 		    spp++;
- 		    continue;
-@@ -661,8 +711,12 @@
- 	    memcpy((char *) &ifr.ifr_hwaddr, (char *) &sa,
- 		   sizeof(struct sockaddr));
- 	    if (ioctl(skfd, SIOCSIFHWADDR, &ifr) < 0) {
--		fprintf(stderr, "SIOCSIFHWADDR: %s\n",
--			strerror(errno));
-+		if (errno == EBUSY)
-+			fprintf(stderr, "SIOCSIFHWADDR: %s - you may need to down the interface\n",
-+				strerror(errno));
-+		else
-+			fprintf(stderr, "SIOCSIFHWADDR: %s\n",
-+				strerror(errno));
- 		goterr = 1;
- 	    }
- 	    spp++;
-@@ -681,12 +735,15 @@
- 			usage();
- 		    *cp = 0;
- 		} else {
--		    prefix_len = 0;
-+		    prefix_len = 128;
- 		}
- 		safe_strncpy(host, *spp, (sizeof host));
- 		if (inet6_aftype.input(1, host, 
- 				       (struct sockaddr *) &sa6) < 0) {
--		    inet6_aftype.herror(host);
-+		    if (inet6_aftype.herror)
-+		    	inet6_aftype.herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for add\n"), host);
- 		    goterr = 1;
- 		    spp++;
- 		    continue;
-@@ -771,7 +828,7 @@
- 			usage();
- 		    *cp = 0;
- 		} else {
--		    prefix_len = 0;
-+		    prefix_len = 128;
- 		}
- 		safe_strncpy(host, *spp, (sizeof host));
- 		if (inet6_aftype.input(1, host, 
-@@ -800,6 +857,8 @@
- 		}
- 		ifr6.ifr6_ifindex = ifr.ifr_ifindex;
- 		ifr6.ifr6_prefixlen = prefix_len;
-+		if (opt_v)
-+			fprintf(stderr, "now deleting: ioctl(SIOCDIFADDR,{ifindex=%d,prefixlen=%ld})\n",ifr.ifr_ifindex,prefix_len);
- 		if (ioctl(fd, SIOCDIFADDR, &ifr6) < 0) {
- 		    fprintf(stderr, "SIOCDIFADDR: %s\n",
- 			    strerror(errno));
-@@ -859,7 +918,7 @@
- 		    usage();
- 		*cp = 0;
- 	    } else {
--		prefix_len = 0;
-+		prefix_len = 128;
- 	    }
- 	    safe_strncpy(host, *spp, (sizeof host));
- 	    if (inet6_aftype.input(1, host, (struct sockaddr *) &sa6) < 0) {
-@@ -903,7 +962,7 @@
- 	/* FIXME: sa is too small for INET6 addresses, inet6 should use that too, 
- 	   broadcast is unexpected */
- 	if (ap->getmask) {
--	    switch (ap->getmask(host, &sa, NULL)) {
-+	    switch (ap->getmask(host, &samask, NULL)) {
- 	    case -1:
- 		usage();
- 		break;
-@@ -911,8 +970,8 @@
- 		if (didnetmask)
- 		    usage();
- 
--		goterr = set_netmask(skfd, &ifr, &sa);
--		didnetmask++;
-+		// remeber to set the netmask from samask later
-+		neednetmask = 1;
- 		break;
- 	    }
- 	}
-@@ -921,9 +980,11 @@
- 	   exit(1);
- 	}
- 	if (ap->input(0, host, &sa) < 0) {
--	    ap->herror(host);
--	    fprintf(stderr, _("ifconfig: `--help' gives usage information.\n"));
--	    exit(1);
-+	    if (ap->herror)
-+	    	ap->herror(host);
-+	    else
-+	    	fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name); fprintf(stderr,
-+	    _("ifconfig: `--help' gives usage information.\n")); exit(1);
- 	}
- 	memcpy((char *) &ifr.ifr_addr, (char *) &sa, sizeof(struct sockaddr));
- 	{
-@@ -980,6 +1041,14 @@
- 	spp++;
-     }
- 
-+    if (neednetmask) {
-+	goterr |= set_netmask(skfd, &ifr, &samask);
-+	didnetmask++;
-+    }
-+
-+    if (opt_v && goterr)
-+    	fprintf(stderr, _("WARNING: at least one error occured. (%d)\n"), goterr);
-+
-     return (goterr);
- }
- 
---- net-tools-1.60.orig/netstat.c
-+++ net-tools-1.60/netstat.c
-@@ -6,7 +6,7 @@
-  *              NET-3 Networking Distribution for the LINUX operating
-  *              system.
-  *
-- * Version:     $Id: netstat.c,v 1.43 2001/04/15 14:41:17 pb Exp $
-+ * Version:     $Id: netstat.c,v 1.55 2007/12/01 19:00:40 ecki Exp $
-  *
-  * Authors:     Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de>
-  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-@@ -94,6 +94,7 @@
- #include "sockets.h"
- #include "interface.h"
- #include "util.h"
-+#include "proc.h"
- 
- #define PROGNAME_WIDTH 20
- 
-@@ -153,7 +154,7 @@
- FILE *procinfo;
- 
- #define INFO_GUTS1(file,name,proc)			\
--  procinfo = fopen((file), "r");			\
-+  procinfo = proc_fopen((file));			\
-   if (procinfo == NULL) {				\
-     if (errno != ENOENT) {				\
-       perror((file));					\
-@@ -174,7 +175,7 @@
- #if HAVE_AFINET6
- #define INFO_GUTS2(file,proc)				\
-   lnr = 0;						\
--  procinfo = fopen((file), "r");		       	\
-+  procinfo = proc_fopen((file));		       	\
-   if (procinfo != NULL) {				\
-     do {						\
-       if (fgets(buffer, sizeof(buffer), procinfo))	\
-@@ -216,7 +217,7 @@
- 
- static struct prg_node {
-     struct prg_node *next;
--    int inode;
-+    unsigned long inode;
-     char name[PROGNAME_WIDTH];
- } *prg_hash[PRG_HASH_SIZE];
- 
-@@ -249,7 +250,7 @@
- /* NOT working as of glibc-2.0.7: */
- #undef  DIRENT_HAVE_D_TYPE_WORKS
- 
--static void prg_cache_add(int inode, char *name)
-+static void prg_cache_add(unsigned long inode, char *name)
- {
-     unsigned hi = PRG_HASHIT(inode);
-     struct prg_node **pnp,*pn;
-@@ -272,7 +273,7 @@
-     strcpy(pn->name,name);
- }
- 
--static const char *prg_cache_get(int inode)
-+static const char *prg_cache_get(unsigned long inode)
- {
-     unsigned hi=PRG_HASHIT(inode);
-     struct prg_node *pn;
-@@ -295,16 +296,18 @@
-     prg_cache_loaded=0;
- }
- 
--static void extract_type_1_socket_inode(const char lname[], long * inode_p) {
-+static int extract_type_1_socket_inode(const char lname[], unsigned long * inode_p) {
- 
-     /* If lname is of the form "socket:[12345]", extract the "12345"
-        as *inode_p.  Otherwise, return -1 as *inode_p.
-        */
- 
--    if (strlen(lname) < PRG_SOCKET_PFXl+3) *inode_p = -1;
--    else if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) *inode_p = -1;
--    else if (lname[strlen(lname)-1] != ']') *inode_p = -1;
--    else {
-+    if (strlen(lname) < PRG_SOCKET_PFXl+3) return(-1);
-+    
-+    if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) return(-1);
-+    if (lname[strlen(lname)-1] != ']') return(-1);
-+
-+    {
-         char inode_str[strlen(lname + 1)];  /* e.g. "12345" */
-         const int inode_str_len = strlen(lname) - PRG_SOCKET_PFXl - 1;
-         char *serr;
-@@ -313,37 +316,41 @@
-         inode_str[inode_str_len] = '\0';
-         *inode_p = strtol(inode_str,&serr,0);
-         if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
--            *inode_p = -1;
-+            return(-1);
-     }
-+    return(0);
- }
- 
- 
- 
--static void extract_type_2_socket_inode(const char lname[], long * inode_p) {
-+static int extract_type_2_socket_inode(const char lname[], unsigned long * inode_p) {
- 
-     /* If lname is of the form "[0000]:12345", extract the "12345"
-        as *inode_p.  Otherwise, return -1 as *inode_p.
-        */
- 
--    if (strlen(lname) < PRG_SOCKET_PFX2l+1) *inode_p = -1;
--    else if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) *inode_p = -1;
--    else {
-+    if (strlen(lname) < PRG_SOCKET_PFX2l+1) return(-1);
-+    if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) return(-1);
-+
-+    {
-         char *serr;
- 
-         *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0);
-         if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
--            *inode_p = -1;
-+            return(-1);
-     }
-+    return(0);
- }
- 
- 
- 
-+
- static void prg_cache_load(void)
- {
-     char line[LINE_MAX],eacces=0;
-     int procfdlen,fd,cmdllen,lnamelen;
-     char lname[30],cmdlbuf[512],finbuf[PROGNAME_WIDTH];
--    long inode;
-+    unsigned long inode;
-     const char *cs,*cmdlp;
-     DIR *dirproc=NULL,*dirfd=NULL;
-     struct dirent *direproc,*direfd;
-@@ -386,11 +393,9 @@
- 	    lnamelen=readlink(line,lname,sizeof(lname)-1);
-             lname[lnamelen] = '\0';  /*make it a null-terminated string*/
- 
--            extract_type_1_socket_inode(lname, &inode);
--
--            if (inode < 0) extract_type_2_socket_inode(lname, &inode);
--
--            if (inode < 0) continue;
-+            if (extract_type_1_socket_inode(lname, &inode) < 0)
-+              if (extract_type_2_socket_inode(lname, &inode) < 0)
-+                continue;
- 
- 	    if (!cmdlp) {
- 		if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >= 
-@@ -450,7 +455,7 @@
-     char buffer[256], dev[16];
-     int st, vs, vr, sendq, recvq, ret;
- 
--    f = fopen(_PATH_PROCNET_NR, "r");
-+    f = proc_fopen(_PATH_PROCNET_NR);
-     if (f == NULL) {
- 	if (errno != ENOENT) {
- 	    perror(_PATH_PROCNET_NR);
-@@ -527,15 +532,15 @@
- 
-     if (flag_exp > 1) {
- 	if (!(flag_not & FLAG_NUM_USER) && ((pw = getpwuid(uid)) != NULL))
--	    printf("%-10s ", pw->pw_name);
-+	    printf(" %-10s ", pw->pw_name);
- 	else
--	    printf("%-10d ", uid);
--	printf("%-10ld ",inode);
-+	    printf(" %-10d ", uid);
-+	printf("%-10lu ",inode);
-     }
-     if (flag_prg)
--	printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode));
-+	printf(" %-16s",prg_cache_get(inode));
-     if (flag_opt)
--	printf("%s", timers);
-+	printf(" %s", timers);
-     putchar('\n');
- }
- 
-@@ -646,7 +651,7 @@
- #if HAVE_AFX25
- static int x25_info(void)
- {
--       FILE *f=fopen(_PATH_PROCNET_X25, "r");
-+       FILE *f=proc_fopen(_PATH_PROCNET_X25);
-        char buffer[256],dev[16];
-        int st,vs,vr,sendq,recvq,lci;
-        static char *x25_state[5]=
-@@ -657,7 +662,7 @@
-                "ESTABLISHED",
-                "RECOVERY"
-        };
--       if(!(f=fopen(_PATH_PROCNET_X25, "r")))
-+       if(!(f=proc_fopen(_PATH_PROCNET_X25)))
-        {
-                if (errno != ENOENT) {
-                        perror(_PATH_PROCNET_X25);
-@@ -705,6 +710,7 @@
-     unsigned long rxq, txq, time_len, retr, inode;
-     int num, local_port, rem_port, d, state, uid, timer_run, timeout;
-     char rem_addr[128], local_addr[128], timers[64], buffer[1024], more[512];
-+    char *protname;
-     struct aftype *ap;
- #if HAVE_AFINET6
-     struct sockaddr_in6 localaddr, remaddr;
-@@ -719,12 +725,13 @@
- 	return;
- 
-     num = sscanf(line,
--    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-+    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
- 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
- 		 &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
- 
-     if (strlen(local_addr) > 8) {
- #if HAVE_AFINET6
-+	protname = "tcp6";
- 	/* Demangle what the kernel gives us */
- 	sscanf(local_addr, "%08X%08X%08X%08X",
- 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
-@@ -740,6 +747,7 @@
- 	remaddr.sin6_family = AF_INET6;
- #endif
-     } else {
-+	protname = "tcp";
- 	sscanf(local_addr, "%X",
- 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
- 	sscanf(rem_addr, "%X",
-@@ -813,8 +821,8 @@
- 			 timer_run, (double) time_len / HZ, retr, timeout);
- 		break;
- 	    }
--	printf("tcp   %6ld %6ld %-23s %-23s %-12s",
--	       rxq, txq, local_addr, rem_addr, _(tcp_state[state]));
-+	printf("%-4s  %6ld %6ld %-*s %-*s %-11s",
-+	       protname, rxq, txq, netmax(23,strlen(local_addr)), local_addr, netmax(23,strlen(rem_addr)), rem_addr, _(tcp_state[state]));
- 
- 	finish_this_one(uid,inode,timers);
-     }
-@@ -831,6 +839,7 @@
-     char buffer[8192], local_addr[64], rem_addr[64];
-     char *udp_state, timers[64], more[512];
-     int num, local_port, rem_port, d, state, timer_run, uid, timeout;
-+    char *protname;
- #if HAVE_AFINET6
-     struct sockaddr_in6 localaddr, remaddr;
-     char addr6[INET6_ADDRSTRLEN];
-@@ -847,13 +856,14 @@
- 
-     more[0] = '\0';
-     num = sscanf(line,
--		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-+		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
- 		 &d, local_addr, &local_port,
- 		 rem_addr, &rem_port, &state,
- 	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
- 
-     if (strlen(local_addr) > 8) {
- #if HAVE_AFINET6
-+	protname="udp6";
- 	sscanf(local_addr, "%08X%08X%08X%08X",
- 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
- 	       &in6.s6_addr32[2], &in6.s6_addr32[3]);
-@@ -868,6 +878,7 @@
- 	remaddr.sin6_family = AF_INET6;
- #endif
-     } else {
-+        protname="udp";
- 	sscanf(local_addr, "%X",
- 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
- 	sscanf(rem_addr, "%X",
-@@ -953,8 +964,8 @@
- 			 retr, timeout);
- 		break;
- 	    }
--	printf("udp   %6ld %6ld %-23s %-23s %-12s",
--	       rxq, txq, local_addr, rem_addr, udp_state);
-+	printf("%-4s  %6ld %6ld %-23s %-23s %-11s",
-+	       protname, rxq, txq, local_addr, rem_addr, udp_state);
- 
- 	finish_this_one(uid,inode,timers);
-     }
-@@ -971,6 +982,7 @@
-     char buffer[8192], local_addr[64], rem_addr[64];
-     char timers[64], more[512];
-     int num, local_port, rem_port, d, state, timer_run, uid, timeout;
-+    char *protname;
- #if HAVE_AFINET6
-     struct sockaddr_in6 localaddr, remaddr;
-     char addr6[INET6_ADDRSTRLEN];
-@@ -987,12 +999,13 @@
- 
-     more[0] = '\0';
-     num = sscanf(line,
--		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-+		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
- 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
- 	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
- 
-     if (strlen(local_addr) > 8) {
- #if HAVE_AFINET6
-+	protname = "raw6";
- 	sscanf(local_addr, "%08X%08X%08X%08X",
- 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
-            &in6.s6_addr32[2], &in6.s6_addr32[3]);
-@@ -1007,6 +1020,7 @@
- 	remaddr.sin6_family = AF_INET6;
- #endif
-     } else {
-+        protname = "raw";
- 	sscanf(local_addr, "%X",
- 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
- 	sscanf(rem_addr, "%X",
-@@ -1074,8 +1088,8 @@
- 			 retr, timeout);
- 		break;
- 	    }
--	printf("raw   %6ld %6ld %-23s %-23s %-12d",
--	       rxq, txq, local_addr, rem_addr, state);
-+	printf("%-4s  %6ld %6ld %-23s %-23s %-11d",
-+	       protname, rxq, txq, local_addr, rem_addr, state);
- 
- 	finish_this_one(uid,inode,timers);
-     }
-@@ -1099,9 +1113,9 @@
-     static int has = 0;
-     char path[MAXPATHLEN], ss_flags[32];
-     char *ss_proto, *ss_state, *ss_type;
--    int num, state, type, inode;
-+    int num, state, type;
-     void *d;
--    unsigned long refcnt, proto, flags;
-+    unsigned long refcnt, proto, flags, inode;
- 
-     if (nr == 0) {
- 	if (strstr(line, "Inode"))
-@@ -1109,14 +1123,14 @@
- 	return;
-     }
-     path[0] = '\0';
--    num = sscanf(line, "%p: %lX %lX %lX %X %X %d %s",
-+    num = sscanf(line, "%p: %lX %lX %lX %X %X %lu %s",
- 		 &d, &refcnt, &proto, &flags, &type, &state, &inode, path);
-     if (num < 6) {
- 	fprintf(stderr, _("warning, got bogus unix line.\n"));
- 	return;
-     }
-     if (!(has & HAS_INODE))
--	snprintf(path,sizeof(path),"%d",inode);
-+	snprintf(path,sizeof(path),"%lu",inode);
- 
-     if (!flag_all) {
-     	if ((state == SS_UNCONNECTED) && (flags & SO_ACCEPTCON)) {
-@@ -1208,9 +1222,9 @@
-     printf("%-5s %-6ld %-11s %-10s %-13s ",
- 	   ss_proto, refcnt, ss_flags, ss_type, ss_state);
-     if (has & HAS_INODE)
--	printf("%-6d ",inode);
-+	printf("%-8lu ",inode);
-     else
--	printf("-      ");
-+	printf("-        ");
-     if (flag_prg)
- 	printf("%-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-"));
-     puts(path);
-@@ -1229,7 +1243,7 @@
- 	printf(_("(w/o servers)"));
-     }
- 
--    printf(_("\nProto RefCnt Flags       Type       State         I-Node"));
-+    printf(_("\nProto RefCnt Flags       Type       State         I-Node  "));
-     print_progname_banner();
-     printf(_(" Path\n"));	/* xxx */
- 
-@@ -1256,7 +1270,7 @@
- 	N_("ESTABLISHED"),
- 	N_("RECOVERY")
-     };
--    if (!(f = fopen(_PATH_PROCNET_AX25, "r"))) {
-+    if (!(f = proc_fopen(_PATH_PROCNET_AX25))) {
- 	if (errno != ENOENT) {
- 	    perror(_PATH_PROCNET_AX25);
- 	    return (-1);
-@@ -1350,18 +1364,37 @@
-     char sad[50], dad[50];
-     struct sockaddr sa;
-     unsigned sport = 0, dport = 0;
--
--    if (!(f = fopen(_PATH_PROCNET_IPX, "r"))) {
--	if (errno != ENOENT) {
--	    perror(_PATH_PROCNET_IPX);
--	    return (-1);
--	}
--	if (flag_arg || flag_ver)
--	    ESYSNOT("netstat", "AF IPX");
--	if (flag_arg)
--	    return (1);
--	else
--	    return (0);
-+    struct stat s;
-+    
-+    f = proc_fopen(_PATH_PROCNET_IPX_SOCKET1);
-+    if (!f) {
-+        if (errno != ENOENT) {
-+            perror(_PATH_PROCNET_IPX_SOCKET1);
-+            return (-1);
-+        }
-+        f = proc_fopen(_PATH_PROCNET_IPX_SOCKET2);
-+
-+        /* We need to check for directory */
-+        if (f) {
-+            fstat(fileno(f), &s);
-+            if (!S_ISREG(s.st_mode)) {
-+                fclose(f);
-+                f=NULL;
-+            }
-+        }
-+
-+        if (!f) {
-+            if (errno != ENOENT) {
-+	        perror(_PATH_PROCNET_IPX_SOCKET2);
-+	        return (-1);
-+	    }
-+	    if (flag_arg || flag_ver)
-+	        ESYSNOT("netstat", "AF IPX");
-+	    if (flag_arg)
-+	        return (1);
-+ 	    else
-+	        return (0);
-+        }
-     }
-     printf(_("Active IPX sockets\nProto Recv-Q Send-Q Local Address              Foreign Address            State"));	/* xxx */
-     if (flag_exp > 1)
-@@ -1381,7 +1414,7 @@
- 	    sscanf(st, "%X", &sport);	/* net byt order */
- 	    sport = ntohs(sport);
- 	} else {
--	    EINTERN("netstat.c", _PATH_PROCNET_IPX " sport format error");
-+	    EINTERN("netstat.c", "ipx socket format error in source port");
- 	    return (-1);
- 	}
- 	nc = 0;
-@@ -1391,7 +1424,7 @@
- 		sscanf(st, "%X", &dport);	/* net byt order */
- 		dport = ntohs(dport);
- 	    } else {
--		EINTERN("netstat.c", _PATH_PROCNET_IPX " dport format error");
-+		EINTERN("netstat.c", "ipx soket format error in destination port");
- 		return (-1);
- 	    }
- 	} else
-@@ -1449,7 +1482,7 @@
-     }
-     if (flag_exp < 2) {
- 	ife_short = 1;
--	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-+	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-     }
- 
-     if (for_all_interfaces(do_if_print, &flag_all) < 0) {
-@@ -1457,7 +1490,7 @@
- 	exit(1);
-     }
-     if (flag_cnt)
--	free_interface_list();
-+	if_cache_free();
-     else {
- 	close(skfd);
- 	skfd = -1;
-@@ -1503,7 +1536,7 @@
-     fprintf(stderr, _("        -C, --cache              display routing cache instead of FIB\n\n"));
- 
-     fprintf(stderr, _("  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n"));
--    fprintf(stderr, _("  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
-+    fprintf(stderr, _("  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
-     fprintf(stderr, _("  List of possible address families (which support routing):\n"));
-     print_aflist(1); /* 1 = routeable */
-     exit(E_USAGE);
-@@ -1514,7 +1547,7 @@
-  (int argc, char *argv[]) {
-     int i;
-     int lop;
--    struct option longopts[] =
-+    static struct option longopts[] =
-     {
- 	AFTRANS_OPTS,
- 	{"version", 0, 0, 'V'},
-@@ -1556,7 +1589,7 @@
-     getroute_init();		/* Set up AF routing support */
- 
-     afname[0] = '\0';
--    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl", longopts, &lop)) != EOF)
-+    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF)
- 	switch (i) {
- 	case -1:
- 	    break;
-@@ -1624,6 +1657,14 @@
- 	case 'o':
- 	    flag_opt++;
- 	    break;
-+	case '6':
-+	    if (aftrans_opt("inet6"))
-+		exit(1);
-+	    break;
-+	case '4':
-+	    if (aftrans_opt("inet"))
-+		exit(1);
-+	    break;
- 	case 'V':
- 	    version();
- 	    /*NOTREACHED */
-@@ -1741,10 +1782,11 @@
- 	    }
- 	    printf(_("\nProto Recv-Q Send-Q Local Address           Foreign Address         State      "));	/* xxx */
- 	    if (flag_exp > 1)
--		printf(_(" User       Inode     "));
--	    print_progname_banner();
-+		printf(_(" User       Inode      "));
-+            if (flag_prg)
-+                printf(_(" PID/Program name"));
- 	    if (flag_opt)
--		printf(_(" Timer"));	/* xxx */
-+		printf(_(" Timer"));
- 	    printf("\n");
- #else
- 	    if (flag_arg) {
-@@ -1845,6 +1887,7 @@
- 	    }
- #endif
- 	}
-+	            
- 	if (!flag_cnt || i)
- 	    break;
- 	sleep(1);
---- net-tools-1.60.orig/route.c
-+++ net-tools-1.60/route.c
-@@ -2,7 +2,7 @@
-  * route        This file contains an implementation of the command
-  *              that manages the IP routing table in the kernel.
-  *
-- * Version:     $Id: route.c,v 1.9 2001/04/15 14:41:17 pb Exp $
-+ * Version:     $Id: route.c,v 1.10 2002/07/30 05:24:20 ecki Exp $
-  *
-  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
-  *
-@@ -142,7 +142,7 @@
-     }
- 
-     /* Fetch the command-line arguments. */
--    while ((i = getopt_long(argc, argv, "A:eCFhnNVv?", longopts, &lop)) != EOF)
-+    while ((i = getopt_long(argc, argv, "A:eCFhnN64Vv?", longopts, &lop)) != EOF)
- 	switch (i) {
- 	case -1:
- 	    break;
-@@ -176,6 +176,14 @@
- 	    if ((i = aftrans_opt(optarg)))
- 		exit(i);
- 	    break;
-+	case '6':
-+	    if ((i = aftrans_opt("inet6")))
-+		exit(i);
-+	    break;
-+	case '4':
-+	    if ((i = aftrans_opt("inet")))
-+		exit(i);
-+	    break;
- 	case 'V':
- 	    version();
- 	case 'h':
---- net-tools-1.60.orig/statistics.c
-+++ net-tools-1.60/statistics.c
-@@ -1,6 +1,6 @@
- /*
-  * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL. 
-- * $Id: statistics.c,v 1.14 2001/02/02 18:01:23 pb Exp $
-+ * $Id: statistics.c,v 1.20 2007/12/01 18:44:56 ecki Exp $
-  * 19980630 - i18n - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 
-  * 19981113 - i18n fixes - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 
-  * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels 
-@@ -11,6 +11,7 @@
- #include <string.h>
- #include "config.h"
- #include "intl.h"
-+#include "proc.h"
- 
- /* #define WARN 1 */
- 
-@@ -172,19 +173,59 @@
-     { "DelayedACKLost", N_("Quick ack mode was activated %u times"), opt_number },
-     { "ListenOverflows", N_("%u times the listen queue of a socket overflowed"),
-       opt_number },
--    { "ListenDrops", N_("%u SYNs to LISTEN sockets ignored"), opt_number },
-+    { "ListenDrops", N_("%u SYNs to LISTEN sockets dropped"), opt_number },
-     { "TCPPrequeued", N_("%u packets directly queued to recvmsg prequeue."), 
-       opt_number },
--    { "TCPDirectCopyFromBacklog", N_("%u packets directly received"
--				     " from backlog"), opt_number },
--    { "TCPDirectCopyFromPrequeue", N_("%u packets directly received"
--				      " from prequeue"), opt_number },
-+    { "TCPDirectCopyFromBacklog", N_("%u bytes directly in process context from backlog"), opt_number },
-+    { "TCPDirectCopyFromPrequeue", N_("%u bytes directly received in process context from prequeue"),
-+				      opt_number },
-     { "TCPPrequeueDropped", N_("%u packets dropped from prequeue"), opt_number },
--    { "TCPHPHits", N_("%u packets header predicted"), number },
-+    { "TCPHPHits", N_("%u packet headers predicted"), number },
-     { "TCPHPHitsToUser", N_("%u packets header predicted and "
- 			    "directly queued to user"), opt_number },
-     { "SockMallocOOM", N_("Ran %u times out of system memory during " 
- 			  "packet sending"), opt_number }, 
-+    { "TCPPureAcks", N_("%u acknowledgments not containing data payload received"), opt_number },
-+    { "TCPHPAcks", N_("%u predicted acknowledgments"), opt_number },
-+    { "TCPRenoRecovery", N_("%u times recovered from packet loss due to fast retransmit"), opt_number },
-+    { "TCPSackRecovery", N_("%u times recovered from packet loss by selective acknowledgements"), opt_number },
-+    { "TCPSACKReneging", N_("%u bad SACK blocks received"), opt_number },
-+    { "TCPFACKReorder", N_("Detected reordering %u times using FACK"), opt_number },
-+    { "TCPSACKReorder", N_("Detected reordering %u times using SACK"), opt_number },
-+    { "TCPTSReorder", N_("Detected reordering %u times using time stamp"), opt_number },
-+    { "TCPRenoReorder", N_("Detected reordering %u times using reno fast retransmit"), opt_number },
-+    { "TCPFullUndo", N_("%u congestion windows fully recovered without slow start"), opt_number }, 
-+    { "TCPPartialUndo", N_("%u congestion windows partially recovered using Hoe heuristic"), opt_number },
-+    { "TCPDSackUndo", N_("%u congestion window recovered without slow start using DSACK"), opt_number },
-+    { "TCPLossUndo", N_("%u congestion windows recovered without slow start after partial ack"), opt_number },
-+    { "TCPLostRetransmits", N_("%u retransmits lost"), opt_number },
-+    { "TCPRenoFailures",  N_("%u timeouts after reno fast retransmit"), opt_number },
-+    { "TCPSackFailures",  N_("%u timeouts after SACK recovery"), opt_number },
-+    { "TCPLossFailures",  N_("%u timeouts in loss state"), opt_number },
-+    { "TCPFastRetrans", N_("%u fast retransmits"), opt_number },
-+    { "TCPForwardRetrans", N_("%u forward retransmits"), opt_number }, 
-+    { "TCPSlowStartRetrans", N_("%u retransmits in slow start"), opt_number },
-+    { "TCPTimeouts", N_("%u other TCP timeouts"), opt_number },
-+    { "TCPRenoRecoveryFailed", N_("%u reno fast retransmits failed"), opt_number },
-+    { "TCPSackRecoveryFail", N_("%u SACK retransmits failed"), opt_number },
-+    { "TCPSchedulerFailed", N_("%u times receiver scheduled too late for direct processing"), opt_number },
-+    { "TCPRcvCollapsed", N_("%u packets collapsed in receive queue due to low socket buffer"), opt_number },
-+    { "TCPDSACKOldSent", N_("%u DSACKs sent for old packets"), opt_number },
-+    { "TCPDSACKOfoSent", N_("%u DSACKs sent for out of order packets"), opt_number },
-+    { "TCPDSACKRecv", N_("%u DSACKs received"), opt_number },
-+    { "TCPDSACKOfoRecv", N_("%u DSACKs for out of order packets received"), opt_number },
-+    { "TCPAbortOnSyn", N_("%u connections reset due to unexpected SYN"), opt_number },
-+    { "TCPAbortOnData", N_("%u connections reset due to unexpected data"), opt_number },
-+    { "TCPAbortOnClose", N_("%u connections reset due to early user close"), opt_number },
-+    { "TCPAbortOnMemory", N_("%u connections aborted due to memory pressure"), opt_number },
-+    { "TCPAbortOnTimeout", N_("%u connections aborted due to timeout"), opt_number },
-+    { "TCPAbortOnLinger", N_("%u connections aborted after user close in linger timeout"), opt_number },
-+    { "TCPAbortFailed", N_("%u times unabled to send RST due to no memory"), opt_number }, 
-+    { "TCPMemoryPressures", N_("TCP ran low on memory %u times"), opt_number }, 
-+    { "TCPLoss", N_("%u TCP data loss events"), opt_number },
-+    { "TCPDSACKUndo", N_("%u congestion windows recovered without slow start by DSACK"), 
-+	opt_number },
-+    { "TCPRenoRecoveryFail", N_("%u classic Reno fast retransmits failed"), opt_number },
- };
- 
- struct tabtab {
-@@ -222,7 +263,8 @@
- 	    ent = bsearch(&key, tab->tab, tab->size / sizeof(struct entry),
- 			  sizeof(struct entry), cmpentries);
-     if (!ent) {			/* try our best */
--	printf("%*s%s: %d\n", states[state].indent, "", title, val);
-+	if (val) 
-+		printf("%*s%s: %d\n", states[state].indent, "", title, val);
- 	return;
-     }
-     type = ent->type;
-@@ -289,14 +331,17 @@
- 	return &dummytab;
- }
- 
--void process_fd(FILE *f)
-+int process_fd(FILE *f)
- {
--    char buf1[1024], buf2[1024];
-+    char buf1[2048], buf2[2048];
-     char *sp, *np, *p;
-     while (fgets(buf1, sizeof buf1, f)) {
- 	int endflag;
- 	struct tabtab *tab;
- 
-+        if (buf1[0] == '\n') // skip empty first line in 2.6 kernels
-+            continue;
-+            
- 	if (!fgets(buf2, sizeof buf2, f))
- 	    break;
- 	sp = strchr(buf1, ':');
-@@ -330,11 +375,10 @@
- 	    sp = p + 1;
- 	}
-     }
--  return;
-+  return 0;
-   
- formaterr:
--  perror(_("error parsing /proc/net/snmp"));
--  return;
-+  return -1;
- }
- 
- 
-@@ -344,22 +388,25 @@
- 
-     f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp;
-     
--    f = fopen("/proc/net/snmp", "r");
-+    f = proc_fopen("/proc/net/snmp");
-     if (!f) {
- 	perror(_("cannot open /proc/net/snmp"));
- 	return;
-     }
--    process_fd(f);
-+
-+    if (process_fd(f) < 0)
-+      fprintf(stderr, _("Problem while parsing /proc/net/snmp\n"));
- 
-     if (ferror(f))
- 	perror("/proc/net/snmp");
- 
-     fclose(f);
- 
--    f = fopen("/proc/net/netstat", "r");
-+    f = proc_fopen("/proc/net/netstat");
- 
-     if (f) {
--    	process_fd(f);
-+    	if (process_fd(f) <0)
-+          fprintf(stderr, _("Problem while parsing /proc/net/netstat\n"));
- 
-         if (ferror(f))
- 	    perror("/proc/net/netstat");
---- net-tools-1.60.orig/nameif.c
-+++ net-tools-1.60/nameif.c
-@@ -3,7 +3,7 @@
-  * Writen 2000 by Andi Kleen.
-  * Subject to the Gnu Public License, version 2.  
-  * TODO: make it support token ring etc.
-- * $Id: nameif.c,v 1.1 2000/10/18 17:26:29 ak Exp $
-+ * $Id: nameif.c,v 1.4 2003/09/11 03:46:49 ak Exp $
-  */ 
- #ifndef _GNU_SOURCE 
- #define _GNU_SOURCE
-@@ -117,7 +117,8 @@
- }
- 
- struct change { 
--	struct change *next,**pprev;
-+	struct change *next;
-+	int found;
- 	char ifname[IFNAMSIZ+1];
- 	unsigned char mac[6];
- }; 
-@@ -139,10 +140,7 @@
- 			ch->ifname, pos); 
- 	if (parsemac(p,ch->mac) < 0) 
- 		complain(_("cannot parse MAC `%s' at %s"), p, pos); 
--	if (clist) 
--		clist->pprev = &ch->next;
- 	ch->next = clist;
--	ch->pprev = &clist;
- 	clist = ch;
- 	return 0; 
- }
-@@ -177,7 +175,7 @@
- 		if (*p == '\0')
- 			continue; 
- 		n = strcspn(p, " \t"); 
--		if (n > IFNAMSIZ) 
-+		if (n > IFNAMSIZ-1) 
- 			complain(_("interface name too long at line %d"), line);  
- 		memcpy(ch->ifname, p, n); 
- 		ch->ifname[n] = 0; 
-@@ -200,7 +198,7 @@
- 
- void usage(void)
- {
--	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); 
-+	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); 
- 	exit(1); 
- }
- 
-@@ -277,21 +275,21 @@
- 		ch = lookupmac(mac); 
- 		if (!ch) 
- 			continue;
--			
--		*ch->pprev = ch->next;
-+		
-+		ch->found = 1;	
- 		if (strcmp(p, ch->ifname)) { 
- 			if (setname(p, ch->ifname) < 0)  
- 				complain(_("cannot change name of %s to %s: %s"),
- 						p, ch->ifname, strerror(errno)); 
- 		} 
--		free(ch);
- 	} 
- 	fclose(ifh); 
- 	
- 	while (clist) { 
- 		struct change *ch = clist;
- 		clist = clist->next;
--		warning(_("interface '%s' not found"), ch->ifname); 
-+		if (!ch->found)
-+			warning(_("interface '%s' not found"), ch->ifname); 
- 		free(ch); 
- 	}
- 
---- net-tools-1.60.orig/mii-tool.c
-+++ net-tools-1.60/mii-tool.c
-@@ -29,8 +29,7 @@
- 	http://www.national.com/pf/DP/DP83840.html
- */
- 
--static char version[] =
--"mii-tool.c 1.9 2000/04/28 00:56:08 (David Hinds)\n";
-+static char Version[] = "$Id: mii-tool.c,v 1.9 2006/09/27 20:59:18 ecki Exp $\n(Author: David Hinds based on Donald Becker's mii-diag)";
- 
- #include <unistd.h>
- #include <stdlib.h>
-@@ -46,16 +45,19 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
-+#include <linux/sockios.h>
-+
- #ifndef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_ether.h>
- #endif
- #include "mii.h"
-+#include "version.h"
- 
- #define MAX_ETH		8		/* Maximum # of interfaces */
- 
- /* Table of known MII's */
--static struct {
-+static const struct {
-     u_short	id1, id2;
-     char	*name;
- } mii_id[] = {
-@@ -74,6 +76,9 @@
-     { 0x0181, 0x4410, "Quality QS6612" },
-     { 0x0282, 0x1c50, "SMSC 83C180" },
-     { 0x0300, 0xe540, "TDK 78Q2120" },
-+    { 0x0141, 0x0c20, "Yukon 88E1011" },
-+    { 0x0141, 0x0cc0, "Yukon-EC 88E1111" },
-+    { 0x0141, 0x0c90, "Yukon-2 88E1112" },
- };
- #define NMII (sizeof(mii_id)/sizeof(mii_id[0]))
- 
-@@ -137,40 +142,48 @@
- 
- const struct {
-     char	*name;
--    u_short	value;
-+    u_short	value[2];
- } media[] = {
-     /* The order through 100baseT4 matches bits in the BMSR */
--    { "10baseT-HD",	MII_AN_10BASET_HD },
--    { "10baseT-FD",	MII_AN_10BASET_FD },
--    { "100baseTx-HD",	MII_AN_100BASETX_HD },
--    { "100baseTx-FD",	MII_AN_100BASETX_FD },
--    { "100baseT4",	MII_AN_100BASET4 },
--    { "100baseTx",	MII_AN_100BASETX_FD | MII_AN_100BASETX_HD },
--    { "10baseT",	MII_AN_10BASET_FD | MII_AN_10BASET_HD },
-+    { "10baseT-HD",	{MII_AN_10BASET_HD} },
-+    { "10baseT-FD",	{MII_AN_10BASET_FD} },
-+    { "100baseTx-HD",	{MII_AN_100BASETX_HD} },
-+    { "100baseTx-FD",	{MII_AN_100BASETX_FD} },
-+    { "100baseT4",	{MII_AN_100BASET4} },
-+    { "100baseTx",	{MII_AN_100BASETX_FD | MII_AN_100BASETX_HD} },
-+    { "10baseT",	{MII_AN_10BASET_FD | MII_AN_10BASET_HD} },
-+
-+    { "1000baseT-HD",	{0, MII_BMCR2_1000HALF} },
-+    { "1000baseT-FD",	{0, MII_BMCR2_1000FULL} },
-+    { "1000baseT",	{0, MII_BMCR2_1000HALF|MII_BMCR2_1000FULL} },
- };
- #define NMEDIA (sizeof(media)/sizeof(media[0]))
- 	
- /* Parse an argument list of media types */
--static int parse_media(char *arg)
-+static int parse_media(char *arg, unsigned *bmcr2)
- {
-     int mask, i;
-     char *s;
-     mask = strtoul(arg, &s, 16);
-     if ((*arg != '\0') && (*s == '\0')) {
- 	if ((mask & MII_AN_ABILITY_MASK) &&
--	    !(mask & ~MII_AN_ABILITY_MASK))
--	    return mask;
-+	    !(mask & ~MII_AN_ABILITY_MASK)) {
-+		*bmcr2 = 0;
-+		return mask;
-+	}
- 	goto failed;
--    } else {
--	mask = 0;
--	s = strtok(arg, ", ");
--	do {
-+    }
-+    mask = 0;
-+    *bmcr2 = 0;
-+    s = strtok(arg, ", ");
-+    do {
- 	    for (i = 0; i < NMEDIA; i++)
--		if (strcasecmp(media[i].name, s) == 0) break;
-+		if (s && strcasecmp(media[i].name, s) == 0) break;
- 	    if (i == NMEDIA) goto failed;
--	    mask |= media[i].value;
--	} while ((s = strtok(NULL, ", ")) != NULL);
--    }
-+	    mask |= media[i].value[0];
-+	    *bmcr2 |= media[i].value[1];
-+    } while ((s = strtok(NULL, ", ")) != NULL);
-+
-     return mask;
- failed:
-     fprintf(stderr, "Invalid media specification '%s'.\n", arg);
-@@ -179,11 +192,24 @@
- 
- /*--------------------------------------------------------------------*/
- 
--static char *media_list(int mask, int best)
-+static const char *media_list(unsigned mask, unsigned mask2, int best)
- {
-     static char buf[100];
-     int i;
-     *buf = '\0';
-+
-+    if (mask & MII_BMCR_SPEED1000) {
-+	if (mask2 & MII_BMCR2_1000HALF) {
-+	    strcat(buf, " ");
-+	    strcat(buf, "1000baseT-HD");
-+	    if (best) goto out;
-+	}
-+	if (mask2 & MII_BMCR2_1000FULL) {
-+	    strcat(buf, " ");
-+	    strcat(buf, "1000baseT-FD");
-+	    if (best) goto out;
-+	}
-+    }
-     mask >>= 5;
-     for (i = 4; i >= 0; i--) {
- 	if (mask & (1<<i)) {
-@@ -192,6 +218,7 @@
- 	    if (best) break;
- 	}
-     }
-+ out:
-     if (mask & (1<<5))
- 	strcat(buf, " flow-control");
-     return buf;
-@@ -201,15 +228,15 @@
- {
-     char buf[100];
-     int i, mii_val[32];
--    int bmcr, bmsr, advert, lkpar;
-+    unsigned bmcr, bmsr, advert, lkpar, bmcr2, lpa2;
- 
-     /* Some bits in the BMSR are latched, but we can't rely on being
-        the only reader, so only the current values are meaningful */
-     mdio_read(sock, MII_BMSR);
--    for (i = 0; i < ((verbose > 1) ? 32 : 8); i++)
-+    for (i = 0; i < ((verbose > 1) ? 32 : MII_BASIC_MAX); i++)
- 	mii_val[i] = mdio_read(sock, i);
- 
--    if (mii_val[MII_BMCR] == 0xffff) {
-+    if (mii_val[MII_BMCR] == 0xffff  || mii_val[MII_BMSR] == 0x0000) {
- 	fprintf(stderr, "  No MII transceiver present!.\n");
- 	return -1;
-     }
-@@ -217,6 +244,7 @@
-     /* Descriptive rename. */
-     bmcr = mii_val[MII_BMCR]; bmsr = mii_val[MII_BMSR];
-     advert = mii_val[MII_ANAR]; lkpar = mii_val[MII_ANLPAR];
-+    bmcr2 = mii_val[MII_CTRL1000]; lpa2 = mii_val[MII_STAT1000];
- 
-     sprintf(buf, "%s: ", ifr.ifr_name);
-     if (bmcr & MII_BMCR_AN_ENA) {
-@@ -224,7 +252,7 @@
- 	    if (advert & lkpar) {
- 		strcat(buf, (lkpar & MII_AN_ACK) ?
- 		       "negotiated" : "no autonegotiation,");
--		strcat(buf, media_list(advert & lkpar, 1));
-+		strcat(buf, media_list(advert & lkpar, bmcr2 & lpa2>>2, 1));
- 		strcat(buf, ", ");
- 	    } else {
- 		strcat(buf, "autonegotiation failed, ");
-@@ -234,8 +262,10 @@
- 	}
-     } else {
- 	sprintf(buf+strlen(buf), "%s Mbit, %s duplex, ",
--	       (bmcr & MII_BMCR_100MBIT) ? "100" : "10",
--	       (bmcr & MII_BMCR_DUPLEX) ? "full" : "half");
-+		((bmcr2 & (MII_BMCR2_1000HALF | MII_BMCR2_1000FULL)) & lpa2 >> 2)
-+		? "1000"
-+		: (bmcr & MII_BMCR_100MBIT) ? "100" : "10",
-+		(bmcr & MII_BMCR_DUPLEX) ? "full" : "half");
-     }
-     strcat(buf, (bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link");
- 
-@@ -296,12 +326,13 @@
- 	if (bmsr & MII_BMSR_REMOTE_FAULT)
- 	    printf("remote fault, ");
- 	printf((bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link");
--	printf("\n  capabilities:%s", media_list(bmsr >> 6, 0));
--	printf("\n  advertising: %s", media_list(advert, 0));
-+	printf("\n  capabilities:%s", media_list(bmsr >> 6, bmcr2, 0));
-+	printf("\n  advertising: %s", media_list(advert, lpa2 >> 2, 0));
- 	if (lkpar & MII_AN_ABILITY_MASK)
--	    printf("\n  link partner:%s", media_list(lkpar, 0));
-+	    printf("\n  link partner:%s", media_list(lkpar, bmcr2, 0));
- 	printf("\n");
-     }
-+    fflush(stdout);
-     return 0;
- }
- 
-@@ -329,7 +360,7 @@
- 	printf("resetting the transceiver...\n");
- 	mdio_write(skfd, MII_BMCR, MII_BMCR_RESET);
-     }
--    if (nway_advertise) {
-+    if (nway_advertise > 0) {
- 	mdio_write(skfd, MII_ANAR, nway_advertise | 1);
- 	opt_restart = 1;
-     }
-@@ -379,27 +410,38 @@
- /*--------------------------------------------------------------------*/
- 
- const char *usage =
--"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
--       -V, --version               display version information
--       -v, --verbose               more verbose output
--       -R, --reset                 reset MII to poweron state
--       -r, --restart               restart autonegotiation
--       -w, --watch                 monitor for link status changes
--       -l, --log                   with -w, write events to syslog
--       -A, --advertise=media,...   advertise only specified media
--       -F, --force=media           force specified media technology
--media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
--       (to advertise both HD and FD) 100baseTx, 10baseT\n";
-+"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
-+"       -V, --version               display version information\n"
-+"       -v, --verbose               more verbose output\n"
-+"       -R, --reset                 reset MII to poweron state\n"
-+"       -r, --restart               restart autonegotiation\n"
-+"       -w, --watch                 monitor for link status changes\n"
-+"       -l, --log                   with -w, write events to syslog\n"
-+"       -A, --advertise=media,...   advertise only specified media\n"
-+"       -F, --force=media           force specified media technology\n"
-+"media: 1000baseTx-HD, 1000baseTx-FD,\n"
-+"       100baseT4, 100baseTx-FD, 100baseTx-HD,\n"
-+"       10baseT-FD, 10baseT-HD,\n"
-+"       (to advertise both HD and FD) 1000baseTx, 100baseTx, 10baseT\n";
-+
-+
-+static void version(void)
-+{
-+    fprintf(stderr, "%s\n%s\n", Version, RELEASE);
-+    exit(5); /* E_VERSION */
-+}
-+
- 
- int main(int argc, char **argv)
- {
-     int i, c, ret, errflag = 0;
-     char s[6];
-+    unsigned ctrl1000 = 0;
-     
-     while ((c = getopt_long(argc, argv, "A:F:p:lrRvVw?", longopts, 0)) != EOF)
- 	switch (c) {
--	case 'A': nway_advertise = parse_media(optarg); break;
--	case 'F': fixed_speed = parse_media(optarg); break;
-+	case 'A': nway_advertise = parse_media(optarg, &ctrl1000); break;
-+	case 'F': fixed_speed = parse_media(optarg, &ctrl1000); break;
- 	case 'p': override_phy = atoi(optarg); break;
- 	case 'r': opt_restart++;	break;
- 	case 'R': opt_reset++;		break;
-@@ -411,6 +453,10 @@
- 	}
-     /* Check for a few inappropriate option combinations */
-     if (opt_watch) verbose = 0;
-+
-+    if ((nway_advertise < 0) || (fixed_speed < 0))
-+    	return 2;
-+
-     if (errflag || (fixed_speed & (fixed_speed-1)) ||
- 	(fixed_speed && (opt_restart || nway_advertise))) {
- 	fprintf(stderr, usage, argv[0]);
-@@ -418,7 +464,7 @@
-     }
- 
-     if (opt_version)
--	printf(version);
-+	version();
- 
-     /* Open a basic socket. */
-     if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) {
-@@ -426,6 +472,9 @@
- 	exit(-1);
-     }
- 
-+    if (verbose > 1)
-+    	printf("Using SIOCGMIIPHY=0x%x\n", SIOCGMIIPHY);	
-+
-     /* No remaining args means show all interfaces. */
-     if (optind == argc) {
- 	ret = 1;
---- net-tools-1.60.orig/debian/changelog
-+++ net-tools-1.60/debian/changelog
-@@ -0,0 +1,277 @@
-+net-tools (1.60-19) unstable; urgency=low
-+
-+  * fixed netstat(8) (interfaceS) reported by Liu Xing. (Closes Bug #435690)
-+  * fixed interface name truncation (Closes Bug #405521)
-+    Thank you Csaba Szep.
-+  * fixed pt error string (Closes: Bug#403033)
-+  * fixed route samples (Closes: Bug#400844, #368697) Thanks Danny Rathjens.
-+  * fixed ifconfig(8) see also section (Closes: Bug#365916) Dan Jacobs.
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sun, 02 Dec 2007 06:27:41 +0100
-+
-+net-tools (1.60-18) unstable; urgency=low
-+
-+  * Thanks for the l10n NMU to Kenshi Muto
-+  * fixed hostname compile problems
-+  * better error handling and speedup for proc file reading
-+  * improved mii-tool (more media types)
-+  * fixed string length contraint in ipmaddr
-+  * fixed ipx /proc/net (alternate naming)
-+  * smaller fixed to netstat(8) (de) 2002-02-20 - still incomplete
-+  * expanded arp(8) (en) 2007-12-01
-+  * added -4 and -6 to netstat(8) 02 October 2003
-+  * formatting fixed rarp(8)+slattach(8)  [en]
-+  * formatting fixed arp(8), rarp(8), ifconfig(8), hostname(1) [fr]
-+  * fixed slattach -L to not require HW handshake anymore
-+  * netstat -n: show v4inv6 mapped addressses as v4
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sun, 02 Dec 2007 03:28:17 +0100
-+
-+net-tools (1.60-17.2) unstable; urgency=low
-+
-+  * l10n NMU
-+  * Set conflict against ja-trans which has obsolete Japanese
-+    translations only for net-tools. (closes: #447327)
-+
-+ -- Kenshi Muto <kmuto@debian.org>  Sat, 20 Oct 2007 18:00:34 +0900
-+
-+net-tools (1.60-17.1) unstable; urgency=low
-+
-+  * l10n NMU
-+  * Updated net-tools.pot.
-+  * Updated Japanese translation (closes: Bug#432338)
-+  * Updated German translation (closes: #313808)
-+
-+ -- Kenshi Muto <kmuto@debian.org>  Thu, 11 Oct 2007 19:44:26 +0900
-+
-+net-tools (1.60-17) unstable; urgency=medium
-+
-+  * arp.c: bus error on sparc64 with latest gcc fixed. (Closes: Bug#340384)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sun, 04 Dec 2005 05:47:05 +0100
-+
-+net-tools (1.60-16) unstable; urgency=low
-+
-+  * spelling fix to slattach(8) (Closes: Bug#326124 (patch by A.Costa)
-+  * inet.c: portability fix for 64bit.
-+  * comment cleanups to aliagn with 1.65 cvs
-+    * net-support.h, inet_sr.c, nstrcmp.c, arp.c, ether.h
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 24 Oct 2005 22:05:38 +0200
-+
-+net-tools (1.60-15) unstable; urgency=low
-+
-+  * minor formating fix to ifconfig(8)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Thu, 30 Jun 2005 21:49:52 +0200
-+
-+net-tools (1.60-14) unstable; urgency=low
-+
-+  * added iptables(8) in ifconfig(8) (thanks Toralf Förster)
-+  * more usage updates in ifconfig.8 (used upstream HEAD=1.11)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Thu, 30 Jun 2005 20:51:18 +0200
-+
-+net-tools (1.60-13) unstable; urgency=low  Thu, 30 Jun 2005 20:49:57 +0200
-+
-+  * X25 code compiles with 2.4 and 2.6 kernel headers (Closes: Bug#271678)
-+  * IMPORTANT: make ifconfig show alias interfaces in 2.6 again. 
-+  * resort media type array to match kernel (Closes: Bug#199920)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Tue, 17 May 2005 01:28:51 +0200
-+
-+net-tools (1.60-12) unstable; urgency=low
-+
-+  * make TR hw address type work for new kernel (Closes: Bug #79462, #203400)
-+  * update-po uses msgmerge, new net-tools.pot (Closes: Bug: 271426)
-+  * de-support dontpub option in arp -? und arp.8 (Closes: Bug #203396)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 16 May 2005 06:33:48 +0200
-+
-+net-tools (1.60-11) unstable; urgency=low
-+
-+  * spelling fixes (Closes: Bug #305640, #305638, 305637)
-+  * nameif.c avoid overflow by malicious kernel
-+  * avoid overflow of the TX-OK Column (Closes: Bug #308922)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 14 May 2005 01:48:45 +0200
-+
-+net-tools (1.60-10) unstable; urgency=low
-+
-+  * typo fix in po/de.po for german arp command output (Closes: Bug #176151)
-+  * added diagnostics messages to mii-tool.8 (Closes: Bug #239229)
-+  * new version of nstrcmp (Closes: Bug #226503)
-+  * enable EUI64 support
-+  * stadanrds version 3.6.1 (no changes)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Fri, 23 Apr 2004 00:57:20 +0200
-+
-+net-tools (1.60-9) unstable; urgency=medium
-+
-+  * debian/changelog: fixed in last entry fixed bug from 197925 to 197924
-+  * include linux/sockios.h for SIOCGMIIPHY definition (new style)
-+    which will fix MII reporting on 2.4 kernels. (Closes: Bug #133648)
-+    NOTE: this will now require root to work, it will also not work on
-+    older kernels.
-+  * Rene Engelhard's patch to make AF X25 compile with 2.6 headers (Closes: Bug #223091)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 29 Dec 2003 13:42:20 +0100
-+
-+net-tools (1.60-8) unstable; urgency=medium
-+
-+  * lib/interface.c: backed off change which skipped reading ioctl 
-+    interfacelist, if _proc interfacelist was ok, which does not work,
-+    because alias interfaces are only in ioctl list available. It is 
-+    also falling back to the original lib/nstrcml.c because the
-+    comparision if : is present does not work.
-+    (Closes: bug #197924, #197582, #197269)
-+  * bumped standards version (no changes)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 28 Jun 2003 02:56:38 +0200
-+
-+net-tools (1.60-7) unstable; urgency=low
-+
-+  * interfaces.c: cvs version fixes Connectiva Bug #5711 (Closes: #149576)
-+    from Eduardo Pereira Habkost
-+  * netstat.c: cvs version adds support for tcp6,udp6,icmp6 protocols
-+  * netstat.c: cvs version adds support for -4 or -6 cmd line shortcut
-+  * netstat.c: cvs version adds fix for inode 
-+    signedness (Closes: #134600, #78932)
-+  * ifconfig: removed -i from usage (Closes: #181528)
-+  * make gcc 3.3 happy: added ull unsigned long long prefix to constant
-+  * lib/ddp_gr.c+pathnames.h: first support for appletalk routing from cvs
-+  * lib/eui64.c+hw.c+Makefile: forst support for new hw type from cvs
-+  * lib/interface.c: cvs fix for column run-into (Closes: #161080)
-+  * lib/irda.c,lib/ipx.c: cvs update
-+  * lib/nstrcmp.c: new, faster version, fixes b-lookups for ifconfig
-+  * hostanme.c: gcc 3.3 fix from cvs (not compiled in net-tools.deb)
-+  * lib/interface: fixed memory globbering
-+    (Closes: #135744, #149579, #185187)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Thu, 12 Jun 2003 05:44:38 +0200
-+
-+net-tools (1.60-6) unstable; urgency=low
-+
-+  * took route.c from upstream cvs: allow -6 and -4 option
-+  * took statistics.c from upstream cvs: more complete netstat -S
-+  * took README from upstream cvs: fix COPYING file title and removed
-+    the line (Closes: #102139)
-+  * took arp.c from upstream: fixed name "PUB", better not found handling,
-+    implicite proxy arp mac changed from '*' to '<from_interface>',
-+    usage line made shorter
-+  * added mii-tool in control file (Closes: #172473)
-+  * fixed description of binary multiple in man page (Closes: #182487)
-+  * fixed interpunctation in netstat(8) (Closes: #191660)
-+  * fixed compile warning in inet_sr.c by removing empty default: label in
-+    switch
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Wed, 28 May 2003 22:35:12 +0200
-+
-+net-tools (1.60-5) unstable; urgency=low
-+
-+  * thanks Andrew for the 4.1 NMU
-+  * NMU: Apply nameif patch from Matt Domsch. (Closes: #178209)
-+  * Fix FTB bug (string concatenation in gcc 3.3) (Closes: #194995)
-+  * Fix segfault in mii-tool by using cvs version (Closes: #139027)
-+  * fixed plural of authors to make lintian happy (I JOIN YOU :)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Wed, 28 May 2003 22:04:14 +0200
-+
-+net-tools (1.60-4.1) unstable; urgency=low
-+
-+  * NMU
-+  * Apply nameif patch from Matt Domsch. (Closes: #178209)
-+
-+ -- Andrew Suffield <asuffield@debian.org>  Wed,  9 Apr 2003 21:44:09 +0100
-+
-+net-tools (1.60-4) unstable; urgency=medium
-+
-+  * fixed (upstream) spurious newline in ifconfig
-+    Thanks Jonathen, Closes: Bug #109379
-+  * fixed SI-Units printout in ifconfig (Closes: Bug #110629, #97029, #100167)
-+  * this is done by including lib/interfaces.c from upstream cvs
-+  * also added ifconfig man page from upstream cvs
-+  * fixed (upstream) man page about netstat's --interface opt. (Closes: Bug#120475)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 24 Nov 2001 06:26:37 +0100
-+
-+net-tools (1.60-3) unstable; urgency=medium
-+
-+  * fixed upstream error where counters in ifconfig/netstat -i are 0
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 10 Nov 2001 18:12:13 +0100
-+
-+net-tools (1.60-2) unstable; urgency=low
-+
-+  * Fixed the following bug: (Closes: #117837)
-+  * inserted ifconfig.c from upstream cvs to do this
-+  * bumped debian Standard 3.1.1 -> 3.5.6 and removed -g from linking
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Thu,  1 Nov 2001 02:51:33 +0100
-+
-+net-tools (1.60-1) unstable; urgency=low
-+
-+  * New upstream
-+  * Phil fixed the following Bugs upstream: (Closes: #91919, #93048, #90282)
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 16 Apr 2001 02:28:12 +0200
-+
-+net-tools (1.59-1) unstable; urgency=low
-+
-+  * added Build Dependencies (closes bug: #89083)
-+  * new upstream version
-+  * removed dh_suidregister and a few comments from rules file
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sun, 18 Mar 2001 03:00:33 +0100
-+
-+net-tools (1.58-2) unstable; urgency=low
-+
-+  * backported ifconfig change from 1.59 to avoid closing socket too early
-+    on some systems (depending on the protocols installed). 
-+    Closes Bug: #85688, #85743
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Tue, 13 Feb 2001 01:39:59 +0100
-+
-+net-tools (1.58-1) unstable; urgency=low
-+
-+  * new upstream version
-+  * removed local man pages for now (Closes: bug #83894)
-+  * install nameif in /sbin
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 10 Feb 2001 21:50:30 +0100
-+
-+net-tools (1.57-2) unstable; urgency=high
-+
-+  * rebuild, this is believed to closes: #75825
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Sat, 30 Dec 2000 22:43:01 +0100
-+
-+net-tools (1.57-1) unstable; urgency=low
-+
-+  * new debian maintainer (thanks Anthony for the Work!)
-+  * new upstream version
-+
-+ -- Bernd Eckenfels <ecki@debian.org>  Mon, 14 Aug 2000 02:40:13 +0200
-+
-+net-tools (1.54-3) unstable; urgency=low
-+
-+  * Argggh. Don't use that horrible dh_installmanpages hack. (Closes:
-+    Bug#68925, Bug#68879)
-+
-+ -- Anthony Towns <ajt@debian.org>  Sun, 13 Aug 2000 00:12:05 +1000
-+
-+net-tools (1.54-2) unstable; urgency=low
-+
-+  * Reapply slattach patch from netbase 3.16-3.
-+
-+ -- Anthony Towns <ajt@debian.org>  Thu, 10 Aug 2000 11:32:58 +1000
-+
-+net-tools (1.54-1) unstable; urgency=low
-+
-+  * Split from netbase.
-+
-+ -- Anthony Towns <ajt@debian.org>  Mon, 17 Jul 2000 07:34:12 +1000
-+
-+Local variables:
-+mode: debian-changelog
-+End:
---- net-tools-1.60.orig/debian/copyright
-+++ net-tools-1.60/debian/copyright
-@@ -0,0 +1,18 @@
-+This debian package is maintained by Bernd Eckenfels <ecki@debian.org> since 
-+Mon, 14 Aug 2000 02:42:13 +0200. Debian Informations will be uploaded
-+upstream, too.
-+
-+This package was debianized by Anthony Towns <ajt@debian.org> on
-+Mon, 17 Jul 2000 07:34:12 +1000. It was originally part of the netbase
-+package.
-+
-+It was downloaded from http://www.tazenda.demon.co.uk/phil/net-tools/
-+
-+Upstream Authors: Phil Blundell <philb@gnu.org>, 
-+                  Bernd Eckenfels <net-tools@lina.inka.de>
-+
-+Copyright:
-+
-+Distributed under the terms of the GNU General Public License version 2,
-+as published by the Free Software Foundation. On Debian systems you can
-+find a copy of this license in /usr/share/common-licenses/GPL.
---- net-tools-1.60.orig/debian/dirs
-+++ net-tools-1.60/debian/dirs
-@@ -0,0 +1 @@
-+usr/sbin
---- net-tools-1.60.orig/debian/config.make
-+++ net-tools-1.60/debian/config.make
-@@ -0,0 +1,36 @@
-+I18N=1
-+HAVE_AFUNIX=1
-+HAVE_AFINET=1
-+HAVE_AFINET6=1
-+HAVE_AFIPX=1
-+HAVE_AFATALK=1
-+HAVE_AFAX25=1
-+HAVE_AFNETROM=1
-+HAVE_AFROSE=1
-+HAVE_AFX25=1
-+HAVE_AFECONET=1
-+HAVE_AFDECnet=1
-+HAVE_AFASH=1
-+HAVE_HWETHER=1
-+HAVE_HWARC=1
-+HAVE_HWSLIP=1
-+HAVE_HWPPP=1
-+HAVE_HWTUNNEL=1
-+HAVE_HWSTRIP=1
-+HAVE_HWTR=1
-+HAVE_HWAX25=1
-+HAVE_HWROSE=1
-+HAVE_HWNETROM=1
-+HAVE_HWX25=1
-+HAVE_HWFR=1
-+HAVE_HWSIT=1
-+HAVE_HWFDDI=1
-+HAVE_HWHIPPI=1
-+HAVE_HWASH=1
-+HAVE_HWHDLCLAPB=1
-+HAVE_HWIRDA=1
-+HAVE_HWEC=1
-+HAVE_EUI64=1
-+HAVE_FW_MASQUERADE=1
-+HAVE_IP_TOOLS=1
-+HAVE_MII=1
---- net-tools-1.60.orig/debian/control
-+++ net-tools-1.60/debian/control
-@@ -0,0 +1,21 @@
-+Source: net-tools
-+Section: net
-+Priority: important
-+Build-Depends: debhelper, gettext
-+Maintainer: Bernd Eckenfels <ecki@debian.org>
-+Standards-Version: 3.6.1
-+
-+Package: net-tools
-+Architecture: any
-+Depends: ${shlibs:Depends}
-+Replaces: netbase (<< 4.00), ja-trans (<= 0.8-2)
-+Conflicts: ja-trans (<= 0.8-2)
-+Description: The NET-3 networking toolkit
-+ This package includes the important tools for controlling the network
-+ subsystem of the Linux kernel.  This includes arp, ifconfig, netstat, 
-+ rarp, nameif and route.  Additionally, this package contains utilities
-+ relating to particular network hardware types (plipconfig, slattach, 
-+ mii-tool) and advanced aspects of IP configuration (iptunnel, ipmaddr).
-+ .
-+ In the upstream package 'hostname' and friends are included. Those are
-+ not installed by this package, since there is a special "hostname*.deb".
---- net-tools-1.60.orig/debian/rules
-+++ net-tools-1.60/debian/rules
-@@ -0,0 +1,74 @@
-+#!/usr/bin/make -f
-+# Sample debian/rules that uses debhelper.
-+# GNU copyright 1997 to 1999 by Joey Hess.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+# This is the debhelper compatability version to use.
-+export DH_COMPAT=1
-+
-+configure: configure-stamp
-+configure-stamp:
-+	dh_testdir
-+	touch configure-stamp
-+
-+build: configure-stamp build-stamp
-+build-stamp:
-+	dh_testdir
-+	cp debian/config.h config.h
-+	cp debian/config.make config.make
-+	$(MAKE)
-+	touch build-stamp
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp configure-stamp
-+	-$(MAKE) clobber
-+	dh_clean
-+
-+install: build
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+	$(MAKE) update BASEDIR=`pwd`/debian/tmp
-+	mv debian/tmp/sbin/arp debian/tmp/usr/sbin/arp
-+	# we don't want man pages for domainname and friends... (yet)
-+	rm -rf debian/tmp/usr/share/man/*/man1/ debian/tmp/usr/share/man/man1/
-+	# we don't install local manpages until policy is clear
-+	rm -rf debian/tmp/usr/share/man/*_*/
-+
-+
-+# 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_testversion
-+	dh_testdir
-+	dh_testroot
-+#	dh_installdebconf	
-+	dh_installdocs
-+	dh_installexamples
-+	dh_installmenu
-+	dh_installcron
-+#	dh_installmanpages
-+	dh_installinfo
-+#	dh_undocumented
-+	dh_installchangelogs 
-+	dh_link
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+#	dh_makeshlibs
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol -- -isp
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install
---- net-tools-1.60.orig/debian/config.h
-+++ net-tools-1.60/debian/config.h
-@@ -0,0 +1,75 @@
-+/*
-+* config.h	Automatically generated configuration includefile
-+*
-+* NET-TOOLS	A collection of programs that form the base set of the
-+*		NET-3 Networking Distribution for the LINUX operating
-+*		system.
-+*
-+*		DO  NOT  EDIT  DIRECTLY
-+*
-+*/
-+
-+/* 
-+ * 
-+ * Internationalization
-+ * 
-+ * The net-tools package has currently been translated to French,
-+ * German and Brazilian Portugese.  Other translations are, of
-+ * course, welcome.  Answer `n' here if you have no support for
-+ * internationalization on your system.
-+ * 
-+ */
-+#define I18N 1
-+
-+/* 
-+ * 
-+ * Protocol Families.
-+ * 
-+ */
-+#define HAVE_AFUNIX 1
-+#define HAVE_AFINET 1
-+#define HAVE_AFINET6 1
-+#define HAVE_AFIPX 1
-+#define HAVE_AFATALK 1
-+#define HAVE_AFAX25 1
-+#define HAVE_AFNETROM 1
-+#define HAVE_AFROSE 1
-+#define HAVE_AFX25 1
-+#define HAVE_AFECONET 1
-+#define HAVE_AFDECnet 1
-+#define HAVE_AFASH 1
-+
-+/* 
-+ * 
-+ * Device Hardware types.
-+ * 
-+ */
-+#define HAVE_HWETHER 1
-+#define HAVE_HWARC 1
-+#define HAVE_HWSLIP 1
-+#define HAVE_HWPPP 1
-+#define HAVE_HWTUNNEL 1
-+#define HAVE_HWSTRIP 1
-+#define HAVE_HWTR 1
-+#define HAVE_HWAX25 1
-+#define HAVE_HWROSE 1
-+#define HAVE_HWNETROM 1
-+#define HAVE_HWX25 1
-+#define HAVE_HWFR 1
-+#define HAVE_HWSIT 1
-+#define HAVE_HWFDDI 1
-+#define HAVE_HWHIPPI 1
-+#define HAVE_HWASH 1
-+#define HAVE_HWHDLCLAPB 1
-+#define HAVE_HWIRDA 1
-+#define HAVE_HWEC 1
-+#define HAVE_HWEUI64 1
-+
-+/* 
-+ * 
-+ * Other Features.
-+ * 
-+ */
-+#define HAVE_FW_MASQUERADE 1
-+#define HAVE_IP_TOOLS 1
-+#define HAVE_MII 1
---- net-tools-1.60.orig/debian/docs
-+++ net-tools-1.60/debian/docs
-@@ -0,0 +1,3 @@
-+README
-+README.ipv6
-+TODO
diff --git a/source/n/net-tools/net-tools_1.60-23.diff b/source/n/net-tools/net-tools_1.60-23.diff
new file mode 100644
index 000000000..449d62c30
--- /dev/null
+++ b/source/n/net-tools/net-tools_1.60-23.diff
@@ -0,0 +1,33404 @@
+--- net-tools-1.60.orig/debian/compat
++++ net-tools-1.60/debian/compat
+@@ -0,0 +1 @@
++5
+--- net-tools-1.60.orig/debian/README.source
++++ net-tools-1.60/debian/README.source
+@@ -0,0 +1,5 @@
++This package uses quilt to manage all modifications to the upstream
++source.  Changes are stored in the source package as diffs in
++debian/patches and applied during the build.
++
++See /usr/share/doc/quilt/README.source for a detailed explanation.
+--- net-tools-1.60.orig/debian/rules
++++ net-tools-1.60/debian/rules
+@@ -0,0 +1,81 @@
++#!/usr/bin/make -f
++
++include /usr/share/quilt/quilt.make
++
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
++
++# This has to be exported to make some magic below work.
++export DH_OPTIONS
++
++# 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)
++
++configure: configure-stamp
++configure-stamp: $(QUILT_STAMPFN)
++	[ ! -f config.make ] || mv config.make debian/config.make.bk
++	cp -f debian/config.make config.make
++	[ ! -f config.h ] || mv config.h debian/config.h.bk
++	cp -f debian/config.h config.h
++	dh_testdir
++	touch $@
++
++build: build-stamp
++build-stamp: configure-stamp
++	dh_testdir
++	$(MAKE) PROGS="ifconfig arp netstat route rarp slattach plipconfig \
++		nameif iptunnel ipmaddr mii-tool"
++	touch $@
++
++clean: unpatch
++	dh_testdir
++	dh_testroot
++	rm -f build-stamp configure-stamp
++	[ ! -f Makefile ] || $(MAKE) clobber
++	[ ! -f debian/config.h.bk ] || \
++		mv debian/config.h.bk config.h
++	[ ! -f debian/config.make.bk ] || \
++		mv debian/config.make.bk config.make
++	dh_clean
++
++MANPAGES = arp.8 ethers.5 ifconfig.8 mii-tool.8 nameif.8 netstat.8 \
++	   plipconfig.8 rarp.8 route.8 slattach.8
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs bin sbin usr/sbin
++	dh_install
++	$(MAKE) -C po install BASEDIR=$(CURDIR)/debian/net-tools
++	dh_installman --language=de \
++		$(wildcard $(addprefix man/de_DE/,$(MANPAGES)))
++	dh_installman --language=C \
++		$(wildcard $(addprefix man/en_US/,$(MANPAGES)))
++	dh_installman --language=fr \
++		$(wildcard $(addprefix man/fr_FR/,$(MANPAGES)))
++	dh_installman --language=pt_BR \
++		$(wildcard $(addprefix man/pt_BR/,$(MANPAGES)))
++
++binary-indep: build install
++
++binary-arch: build install
++	dh_testdir
++	dh_testroot
++	dh_installchangelogs
++	dh_installdocs README README.ipv6 TODO
++	dh_link
++	dh_strip
++	dh_compress
++	dh_fixperms
++	dh_installdeb
++	dh_shlibdeps
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary: binary-arch binary-indep
++.PHONY: build clean binary-indep binary-arch binary install install-indep \
++	install-arch
+--- net-tools-1.60.orig/debian/config.h
++++ net-tools-1.60/debian/config.h
+@@ -0,0 +1,75 @@
++/*
++* config.h	Automatically generated configuration includefile
++*
++* NET-TOOLS	A collection of programs that form the base set of the
++*		NET-3 Networking Distribution for the LINUX operating
++*		system.
++*
++*		DO  NOT  EDIT  DIRECTLY
++*
++*/
++
++/* 
++ * 
++ * Internationalization
++ * 
++ * The net-tools package has currently been translated to French,
++ * German and Brazilian Portugese.  Other translations are, of
++ * course, welcome.  Answer `n' here if you have no support for
++ * internationalization on your system.
++ * 
++ */
++#define I18N 1
++
++/* 
++ * 
++ * Protocol Families.
++ * 
++ */
++#define HAVE_AFUNIX 1
++#define HAVE_AFINET 1
++#define HAVE_AFINET6 1
++#define HAVE_AFIPX 1
++#define HAVE_AFATALK 1
++#define HAVE_AFAX25 1
++#define HAVE_AFNETROM 1
++#define HAVE_AFROSE 1
++#define HAVE_AFX25 1
++#define HAVE_AFECONET 1
++#define HAVE_AFDECnet 1
++#define HAVE_AFASH 1
++
++/* 
++ * 
++ * Device Hardware types.
++ * 
++ */
++#define HAVE_HWETHER 1
++#define HAVE_HWARC 1
++#define HAVE_HWSLIP 1
++#define HAVE_HWPPP 1
++#define HAVE_HWTUNNEL 1
++#define HAVE_HWSTRIP 1
++#define HAVE_HWTR 1
++#define HAVE_HWAX25 1
++#define HAVE_HWROSE 1
++#define HAVE_HWNETROM 1
++#define HAVE_HWX25 1
++#define HAVE_HWFR 1
++#define HAVE_HWSIT 1
++#define HAVE_HWFDDI 1
++#define HAVE_HWHIPPI 1
++#define HAVE_HWASH 1
++#define HAVE_HWHDLCLAPB 1
++#define HAVE_HWIRDA 1
++#define HAVE_HWEC 1
++#define HAVE_HWEUI64 1
++
++/* 
++ * 
++ * Other Features.
++ * 
++ */
++#define HAVE_FW_MASQUERADE 1
++#define HAVE_IP_TOOLS 1
++#define HAVE_MII 1
+--- net-tools-1.60.orig/debian/config.make
++++ net-tools-1.60/debian/config.make
+@@ -0,0 +1,36 @@
++I18N=1
++HAVE_AFUNIX=1
++HAVE_AFINET=1
++HAVE_AFINET6=1
++HAVE_AFIPX=1
++HAVE_AFATALK=1
++HAVE_AFAX25=1
++HAVE_AFNETROM=1
++HAVE_AFROSE=1
++HAVE_AFX25=1
++HAVE_AFECONET=1
++HAVE_AFDECnet=1
++HAVE_AFASH=1
++HAVE_HWETHER=1
++HAVE_HWARC=1
++HAVE_HWSLIP=1
++HAVE_HWPPP=1
++HAVE_HWTUNNEL=1
++HAVE_HWSTRIP=1
++HAVE_HWTR=1
++HAVE_HWAX25=1
++HAVE_HWROSE=1
++HAVE_HWNETROM=1
++HAVE_HWX25=1
++HAVE_HWFR=1
++HAVE_HWSIT=1
++HAVE_HWFDDI=1
++HAVE_HWHIPPI=1
++HAVE_HWASH=1
++HAVE_HWHDLCLAPB=1
++HAVE_HWIRDA=1
++HAVE_HWEC=1
++HAVE_EUI64=1
++HAVE_FW_MASQUERADE=1
++HAVE_IP_TOOLS=1
++HAVE_MII=1
+--- net-tools-1.60.orig/debian/install
++++ net-tools-1.60/debian/install
+@@ -0,0 +1,11 @@
++arp		/usr/sbin
++ifconfig	/sbin
++nameif		/sbin
++plipconfig	/sbin
++rarp		/sbin
++route		/sbin
++slattach	/sbin
++ipmaddr		/sbin
++iptunnel	/sbin
++mii-tool	/sbin
++netstat		/bin
+--- net-tools-1.60.orig/debian/control
++++ net-tools-1.60/debian/control
+@@ -0,0 +1,22 @@
++Source: net-tools
++Section: net
++Priority: important
++Build-Depends: debhelper (> 5), gettext, quilt
++Maintainer: net-tools Team <pkg-net-tools-maintainers@lists.alioth.debian.org>
++Uploaders: Luk Claes <luk@debian.org>, Martín Ferrari <tincho@debian.org>
++Standards-Version: 3.8.1
++
++Package: net-tools
++Architecture: any
++Depends: ${shlibs:Depends}
++Replaces: netbase (<< 4.00), ja-trans (<= 0.8-2)
++Conflicts: ja-trans (<= 0.8-2)
++Description: The NET-3 networking toolkit
++ This package includes the important tools for controlling the network
++ subsystem of the Linux kernel.  This includes arp, ifconfig, netstat, 
++ rarp, nameif and route.  Additionally, this package contains utilities
++ relating to particular network hardware types (plipconfig, slattach, 
++ mii-tool) and advanced aspects of IP configuration (iptunnel, ipmaddr).
++ .
++ In the upstream package 'hostname' and friends are included. Those are
++ not installed by this package, since there is a special "hostname*.deb".
+--- net-tools-1.60.orig/debian/copyright
++++ net-tools-1.60/debian/copyright
+@@ -0,0 +1,31 @@
++Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=437
++Upstream-Maintainer: Phil Blundell <philb@gnu.org>, 
++                     Bernd Eckenfels <net-tools@lina.inka.de>
++Upstream-Source: https://developer.berlios.de/projects/net-tools/
++
++Files: *
++Copyright: © 1988-1994 MicroWalt Corporation
++Copyright: © 1995-1996 Bernd Eckenfels
++Copyright: © 1997-2000 Andi Kleen
++Copyright: © 1997-2000 Donald Becker
++License: GPL-2+
++ The copyright attribution has been derived from individual files' text, but
++ each file may have different copyright holders, and some may be missing. See
++ the source code for details.
++ .
++ This program is free software; you can redistribute it and/or modify it under
++ the terms of  the GNU General Public  License as  published by  the  Free
++ Software Foundation;  either  version 2 of the License, or  (at your option)
++ any later version.
++ .
++ On Debian GNU/Linux systems, the complete text of the GNU General Public
++ License can be found in `/usr/share/common-licenses/GPL-2'
++
++Files: debian/*
++Copyright: © 2008-2009 Luk Claes, Martín Ferrari
++Copyright: © 2000-2007 Bernd Eckenfels
++Copyright: © 2000 Anthony Towns
++License: GPL-2+
++ It is assumed that all contributors put their work under the same license
++ as the module itself.
++
+--- net-tools-1.60.orig/debian/changelog
++++ net-tools-1.60/debian/changelog
+@@ -0,0 +1,347 @@
++net-tools (1.60-23) unstable; urgency=low
++
++  * debian/patches/Bug#254243-netstat.c-wide-opt.patch: Converted last patch
++    from Luar Roji to a quilt patch.
++  * Many changes done in diff.gz that are also present in upstream's CVS:
++    - debian/patches/CVS-20020730-route.c_opts_64.patch
++    - debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch
++    - debian/patches/CVS-20081003-statistics.c_sync.patch
++    - debian/patches/CVS-20071202-rarp.c_sync.patch
++    - debian/patches/CVS-20070316-netstat.c_sync.patch
++    - debian/patches/CVS-20060927-mii-tool.c_sync.patch
++    - debian/patches/CVS-20051204-arp.c_sync.patch
++    - debian/patches/CVS-20030911-nameif.c_sync.patch
++    - debian/patches/CVS-20081002-ifconfig.c_sync.patch
++    - debian/patches/CVS-20031011-hostname.c_sync.patch
++    - debian/patches/CVS-20051204-slttach.c_sync.patch
++    - debian/patches/CVS-20061011-includes_sync.patch
++    - debian/patches/CVS-lib_sync.patch
++    - debian/patches/CVS-20081003-config.in_sync.patch
++    - debian/patches/CVS-20081002-manpages_sync.patch
++  * Some unsyncable patches converted from diff.gz:
++    - debian/patches/netstat.c-assorted_changes.patch
++    - debian/patches/translations.patch
++    - debian/patches/local-manpages.patch
++    - debian/patches/lib_local_changes.patch
++    - debian/patches/netstat.c-local_changes.patch
++  * Reverted changes to Makefile and README.
++  * debian/watch: added watchfile.
++  * debian/control, debian/compat: Added versioned dependency on debhelper (it
++    was version 1!)
++  * debian/rules: made from scratch. Closes: #443063.
++  * Added quilt dependencies and hooks.
++  * debian/control: updated Standards-Version.
++  * debian/README.source: added to comply with S-V 3.8.1.
++  * debian/patches/local-manpages.patch: more manpage fixes.
++  * debian/patches/translations.patch: fix encoding for .po files.
++  * debia/rules: supercede Makefile install with custom commands.
++  * debian/copyright: new format, and attempt to provide a real copyright
++    file. Still, the attribution is a mess.
++  * debian/patches/Bug#345331-socket_overflow.patch: patch from Antonio Galea
++    that solves an issue when the socket number exceeds 2^31. Closes: #345331.
++
++ -- Martín Ferrari <tincho@debian.org>  Mon, 16 Mar 2009 01:58:18 -0300
++
++net-tools (1.60-22) unstable; urgency=low
++
++  * Add new command line option -W/--wide to netstat which prevents 
++    truncation of IPv6 addresses (Closes: #254243). Thanks Luar Roji.
++
++ -- Luk Claes <luk@debian.org>  Sun, 16 Nov 2008 17:53:05 +0100
++
++net-tools (1.60-21) unstable; urgency=low
++
++  * Update maintainer to net-tools Team.
++  * Support ipv6 stats in netstat (Closes: #453859).
++  * Fix closes statements in changelog entry.
++  * Add hardware support for InfiniBand (Closes: #294252).
++
++ -- Luk Claes <luk@debian.org>  Sat, 27 Sep 2008 19:40:40 +0200
++
++net-tools (1.60-20) unstable; urgency=low
++
++  * New maintainer (Closes: #486004).
++  * Don't segfault when /proc/net/dev is not available (Closes: #222209).
++  * Find IPv6 addresses for interfaces with ifindex > 255 (Closes: #433543).
++  * Skip . and .. in netstat as they are invalid (Closes: #234447).
++  * Fix hyphenation for manpages (Closes: #288343).
++
++ -- Luk Claes <luk@debian.org>  Tue, 16 Sep 2008 15:22:20 +0200
++
++net-tools (1.60-19) unstable; urgency=low
++
++  * fixed netstat(8) (interfaceS) reported by Liu Xing. (Closes: Bug#435690)
++  * fixed interface name truncation (Closes: Bug#405521)
++    Thank you Csaba Szep.
++  * fixed pt error string (Closes: Bug#403033)
++  * fixed route samples (Closes: Bug#400844, #368697) Thanks Danny Rathjens.
++  * fixed ifconfig(8) see also section (Closes: Bug#365916) Dan Jacobs.
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sun, 02 Dec 2007 06:27:41 +0100
++
++net-tools (1.60-18) unstable; urgency=low
++
++  * Thanks for the l10n NMU to Kenshi Muto
++  * fixed hostname compile problems
++  * better error handling and speedup for proc file reading
++  * improved mii-tool (more media types)
++  * fixed string length contraint in ipmaddr
++  * fixed ipx /proc/net (alternate naming)
++  * smaller fixed to netstat(8) (de) 2002-02-20 - still incomplete
++  * expanded arp(8) (en) 2007-12-01
++  * added -4 and -6 to netstat(8) 02 October 2003
++  * formatting fixed rarp(8)+slattach(8)  [en]
++  * formatting fixed arp(8), rarp(8), ifconfig(8), hostname(1) [fr]
++  * fixed slattach -L to not require HW handshake anymore
++  * netstat -n: show v4inv6 mapped addressses as v4
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sun, 02 Dec 2007 03:28:17 +0100
++
++net-tools (1.60-17.2) unstable; urgency=low
++
++  * l10n NMU
++  * Set conflict against ja-trans which has obsolete Japanese
++    translations only for net-tools. (closes: #447327)
++
++ -- Kenshi Muto <kmuto@debian.org>  Sat, 20 Oct 2007 18:00:34 +0900
++
++net-tools (1.60-17.1) unstable; urgency=low
++
++  * l10n NMU
++  * Updated net-tools.pot.
++  * Updated Japanese translation (closes: Bug#432338)
++  * Updated German translation (closes: #313808)
++
++ -- Kenshi Muto <kmuto@debian.org>  Thu, 11 Oct 2007 19:44:26 +0900
++
++net-tools (1.60-17) unstable; urgency=medium
++
++  * arp.c: bus error on sparc64 with latest gcc fixed. (Closes: Bug#340384)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sun, 04 Dec 2005 05:47:05 +0100
++
++net-tools (1.60-16) unstable; urgency=low
++
++  * spelling fix to slattach(8) (Closes: Bug#326124 (patch by A.Costa)
++  * inet.c: portability fix for 64bit.
++  * comment cleanups to aliagn with 1.65 cvs
++    * net-support.h, inet_sr.c, nstrcmp.c, arp.c, ether.h
++
++ -- Bernd Eckenfels <ecki@debian.org>  Mon, 24 Oct 2005 22:05:38 +0200
++
++net-tools (1.60-15) unstable; urgency=low
++
++  * minor formating fix to ifconfig(8)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Thu, 30 Jun 2005 21:49:52 +0200
++
++net-tools (1.60-14) unstable; urgency=low
++
++  * added iptables(8) in ifconfig(8) (thanks Toralf Förster)
++  * more usage updates in ifconfig.8 (used upstream HEAD=1.11)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Thu, 30 Jun 2005 20:51:18 +0200
++
++net-tools (1.60-13) unstable; urgency=low
++
++  * X25 code compiles with 2.4 and 2.6 kernel headers (Closes: Bug#271678)
++  * IMPORTANT: make ifconfig show alias interfaces in 2.6 again. 
++  * resort media type array to match kernel (Closes: Bug#199920)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Tue, 17 May 2005 01:28:51 +0200
++
++net-tools (1.60-12) unstable; urgency=low
++
++  * make TR hw address type work for new kernel (Closes: Bug #79462, #203400)
++  * update-po uses msgmerge, new net-tools.pot (Closes: Bug: 271426)
++  * de-support dontpub option in arp -? und arp.8 (Closes: Bug #203396)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Mon, 16 May 2005 06:33:48 +0200
++
++net-tools (1.60-11) unstable; urgency=low
++
++  * spelling fixes (Closes: Bug #305640, #305638, 305637)
++  * nameif.c avoid overflow by malicious kernel
++  * avoid overflow of the TX-OK Column (Closes: Bug #308922)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sat, 14 May 2005 01:48:45 +0200
++
++net-tools (1.60-10) unstable; urgency=low
++
++  * typo fix in po/de.po for german arp command output (Closes: Bug #176151)
++  * added diagnostics messages to mii-tool.8 (Closes: Bug #239229)
++  * new version of nstrcmp (Closes: Bug #226503)
++  * enable EUI64 support
++  * stadanrds version 3.6.1 (no changes)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Fri, 23 Apr 2004 00:57:20 +0200
++
++net-tools (1.60-9) unstable; urgency=medium
++
++  * debian/changelog: fixed in last entry fixed bug from 197925 to 197924
++  * include linux/sockios.h for SIOCGMIIPHY definition (new style)
++    which will fix MII reporting on 2.4 kernels. (Closes: Bug #133648)
++    NOTE: this will now require root to work, it will also not work on
++    older kernels.
++  * Rene Engelhard's patch to make AF X25 compile with 2.6 headers (Closes: Bug #223091)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Mon, 29 Dec 2003 13:42:20 +0100
++
++net-tools (1.60-8) unstable; urgency=medium
++
++  * lib/interface.c: backed off change which skipped reading ioctl 
++    interfacelist, if _proc interfacelist was ok, which does not work,
++    because alias interfaces are only in ioctl list available. It is 
++    also falling back to the original lib/nstrcml.c because the
++    comparision if : is present does not work.
++    (Closes: bug #197924, #197582, #197269)
++  * bumped standards version (no changes)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sat, 28 Jun 2003 02:56:38 +0200
++
++net-tools (1.60-7) unstable; urgency=low
++
++  * interfaces.c: cvs version fixes Connectiva Bug #5711 (Closes: #149576)
++    from Eduardo Pereira Habkost
++  * netstat.c: cvs version adds support for tcp6,udp6,icmp6 protocols
++  * netstat.c: cvs version adds support for -4 or -6 cmd line shortcut
++  * netstat.c: cvs version adds fix for inode 
++    signedness (Closes: #134600, #78932)
++  * ifconfig: removed -i from usage (Closes: #181528)
++  * make gcc 3.3 happy: added ull unsigned long long prefix to constant
++  * lib/ddp_gr.c+pathnames.h: first support for appletalk routing from cvs
++  * lib/eui64.c+hw.c+Makefile: forst support for new hw type from cvs
++  * lib/interface.c: cvs fix for column run-into (Closes: #161080)
++  * lib/irda.c,lib/ipx.c: cvs update
++  * lib/nstrcmp.c: new, faster version, fixes b-lookups for ifconfig
++  * hostanme.c: gcc 3.3 fix from cvs (not compiled in net-tools.deb)
++  * lib/interface: fixed memory globbering
++    (Closes: #135744, #149579, #185187)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Thu, 12 Jun 2003 05:44:38 +0200
++
++net-tools (1.60-6) unstable; urgency=low
++
++  * took route.c from upstream cvs: allow -6 and -4 option
++  * took statistics.c from upstream cvs: more complete netstat -S
++  * took README from upstream cvs: fix COPYING file title and removed
++    the line (Closes: #102139)
++  * took arp.c from upstream: fixed name "PUB", better not found handling,
++    implicite proxy arp mac changed from '*' to '<from_interface>',
++    usage line made shorter
++  * added mii-tool in control file (Closes: #172473)
++  * fixed description of binary multiple in man page (Closes: #182487)
++  * fixed interpunctation in netstat(8) (Closes: #191660)
++  * fixed compile warning in inet_sr.c by removing empty default: label in
++    switch
++
++ -- Bernd Eckenfels <ecki@debian.org>  Wed, 28 May 2003 22:35:12 +0200
++
++net-tools (1.60-5) unstable; urgency=low
++
++  * thanks Andrew for the 4.1 NMU
++  * NMU: Apply nameif patch from Matt Domsch. (Closes: #178209)
++  * Fix FTB bug (string concatenation in gcc 3.3) (Closes: #194995)
++  * Fix segfault in mii-tool by using cvs version (Closes: #139027)
++  * fixed plural of authors to make lintian happy (I JOIN YOU :)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Wed, 28 May 2003 22:04:14 +0200
++
++net-tools (1.60-4.1) unstable; urgency=low
++
++  * NMU
++  * Apply nameif patch from Matt Domsch. (Closes: #178209)
++
++ -- Andrew Suffield <asuffield@debian.org>  Wed,  9 Apr 2003 21:44:09 +0100
++
++net-tools (1.60-4) unstable; urgency=medium
++
++  * fixed (upstream) spurious newline in ifconfig
++    Thanks Jonathen, Closes: Bug #109379
++  * fixed SI-Units printout in ifconfig (Closes: Bug #110629, #97029, #100167)
++  * this is done by including lib/interfaces.c from upstream cvs
++  * also added ifconfig man page from upstream cvs
++  * fixed (upstream) man page about netstat's --interface opt. (Closes: Bug#120475)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sat, 24 Nov 2001 06:26:37 +0100
++
++net-tools (1.60-3) unstable; urgency=medium
++
++  * fixed upstream error where counters in ifconfig/netstat -i are 0
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sat, 10 Nov 2001 18:12:13 +0100
++
++net-tools (1.60-2) unstable; urgency=low
++
++  * Fixed the following bug: (Closes: #117837)
++  * inserted ifconfig.c from upstream cvs to do this
++  * bumped debian Standard 3.1.1 -> 3.5.6 and removed -g from linking
++
++ -- Bernd Eckenfels <ecki@debian.org>  Thu,  1 Nov 2001 02:51:33 +0100
++
++net-tools (1.60-1) unstable; urgency=low
++
++  * New upstream
++  * Phil fixed the following Bugs upstream: (Closes: #91919, #93048, #90282)
++
++ -- Bernd Eckenfels <ecki@debian.org>  Mon, 16 Apr 2001 02:28:12 +0200
++
++net-tools (1.59-1) unstable; urgency=low
++
++  * added Build Dependencies (closes bug: #89083)
++  * new upstream version
++  * removed dh_suidregister and a few comments from rules file
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sun, 18 Mar 2001 03:00:33 +0100
++
++net-tools (1.58-2) unstable; urgency=low
++
++  * backported ifconfig change from 1.59 to avoid closing socket too early
++    on some systems (depending on the protocols installed). 
++    Closes Bug: #85688, #85743
++
++ -- Bernd Eckenfels <ecki@debian.org>  Tue, 13 Feb 2001 01:39:59 +0100
++
++net-tools (1.58-1) unstable; urgency=low
++
++  * new upstream version
++  * removed local man pages for now (Closes: bug #83894)
++  * install nameif in /sbin
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sat, 10 Feb 2001 21:50:30 +0100
++
++net-tools (1.57-2) unstable; urgency=high
++
++  * rebuild, this is believed to closes: #75825
++
++ -- Bernd Eckenfels <ecki@debian.org>  Sat, 30 Dec 2000 22:43:01 +0100
++
++net-tools (1.57-1) unstable; urgency=low
++
++  * new debian maintainer (thanks Anthony for the Work!)
++  * new upstream version
++
++ -- Bernd Eckenfels <ecki@debian.org>  Mon, 14 Aug 2000 02:40:13 +0200
++
++net-tools (1.54-3) unstable; urgency=low
++
++  * Argggh. Don't use that horrible dh_installmanpages hack. (Closes:
++    Bug#68925, Bug#68879)
++
++ -- Anthony Towns <ajt@debian.org>  Sun, 13 Aug 2000 00:12:05 +1000
++
++net-tools (1.54-2) unstable; urgency=low
++
++  * Reapply slattach patch from netbase 3.16-3.
++
++ -- Anthony Towns <ajt@debian.org>  Thu, 10 Aug 2000 11:32:58 +1000
++
++net-tools (1.54-1) unstable; urgency=low
++
++  * Split from netbase.
++
++ -- Anthony Towns <ajt@debian.org>  Mon, 17 Jul 2000 07:34:12 +1000
++
++Local variables:
++mode: debian-changelog
++End:
+--- net-tools-1.60.orig/debian/watch
++++ net-tools-1.60/debian/watch
+@@ -0,0 +1,3 @@
++version=3
++
++http://download.berlios.de/net-tools/net-tools-(\d.*)\.tar\.(?:bz2|gz)
+--- net-tools-1.60.orig/debian/patches/CVS-20081003-config.in_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20081003-config.in_sync.patch
+@@ -0,0 +1,74 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.24 - Fri Oct 3 02:09:57 2008 UTC by ecki
++moved H suport for Infiniband to the right section
++
++Revision 1.23 - Fri Oct 3 01:55:07 2008 UTC by ecki
++Add hardware support for InfiniBand (Debian Bug #294252 Tom Duffy from Sun).
++
++Revision 1.22 - Fri Jun 4 00:06:50 2004 UTC by ecki
++default all options which work with recent systems  to on
++
++Revision 1.21 - Mon Nov 12 02:12:05 2001 UTC by ecki
++added EUI64 Hardware Address Family
++Daniel Stodden <stodden@in.tum.de>
++
++Index: net-tools/config.in
++===================================================================
++--- net-tools.orig/config.in
+++++ net-tools/config.in
++@@ -49,16 +49,16 @@ bool 'Does your system support GNU gette
++ * 
++ bool 'UNIX protocol family' HAVE_AFUNIX y
++ bool 'INET (TCP/IP) protocol family' HAVE_AFINET y
++-bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n
+++bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y
++ bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y
++ bool 'Appletalk DDP protocol family' HAVE_AFATALK y
++ bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y
++ bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y
++-bool 'Rose (packet radio) protocol family' HAVE_AFROSE n
+++bool 'Rose (packet radio) protocol family' HAVE_AFROSE y
++ bool 'X.25 (CCITT) protocol family' HAVE_AFX25 y
++-bool 'Econet protocol family' HAVE_AFECONET n
+++bool 'Econet protocol family' HAVE_AFECONET y
++ bool 'DECnet protocol family' HAVE_AFDECnet n
++-bool 'Ash protocol family' HAVE_AFASH n
+++bool 'Ash protocol family' HAVE_AFASH y
++ *
++ *
++ *            Device Hardware types.
++@@ -71,21 +71,23 @@ bool 'IPIP Tunnel support' HAVE_HWTUNNEL
++ bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y
++ bool 'Token ring (generic) support' HAVE_HWTR y
++ bool 'AX25 (packet radio) support' HAVE_HWAX25 y
++-bool 'Rose (packet radio) support' HAVE_HWROSE n
+++bool 'Rose (packet radio) support' HAVE_HWROSE y
++ bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y
++ bool 'X.25 (generic) support' HAVE_HWX25 y
++ bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y
++-bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT n
++-bool 'FDDI (generic) support' HAVE_HWFDDI n
++-bool 'HIPPI (generic) support' HAVE_HWHIPPI n
++-bool 'Ash hardware support' HAVE_HWASH n
++-bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB n
+++bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y
+++bool 'FDDI (generic) support' HAVE_HWFDDI y
+++bool 'HIPPI (generic) support' HAVE_HWHIPPI y
+++bool 'Ash hardware support' HAVE_HWASH y
+++bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB y
++ bool 'IrDA support' HAVE_HWIRDA y
++-bool 'Econet hardware support' HAVE_HWEC n
+++bool 'Econet hardware support' HAVE_HWEC y
+++bool 'Generic EUI-64 hardware support' HAVE_HWEUI64 y
+++bool 'InfiniBand hardware support' HAVE_HWIB y
++ *
++ *
++ *           Other Features.
++ *
++-bool 'IP Masquerading support' HAVE_FW_MASQUERADE n
++-bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n
++-bool 'Build mii-tool' HAVE_MII n
+++bool 'IP Masquerading support' HAVE_FW_MASQUERADE y
+++bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y
+++bool 'Build mii-tool' HAVE_MII y
+--- net-tools-1.60.orig/debian/patches/local-manpages.patch
++++ net-tools-1.60/debian/patches/local-manpages.patch
+@@ -0,0 +1,1759 @@
++Formatting fixes to manpages, not found upstream.
++
++Index: net-tools/man/de_DE/arp.8
++===================================================================
++--- net-tools.orig/man/de_DE/arp.8
+++++ net-tools/man/de_DE/arp.8
++@@ -1,12 +1,12 @@
++-.TH ARP 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH ARP 8 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ .SH NAME
++ arp \- Manipulation des ARP-Caches
++ .SH SYNOPSIS
++ .B arp 
++ .RB [ \-vn ] 
++ .RB [ "\-H Typ" ] 
++-.RB [ "-i Schnittstelle" ] 
++-.B -a 
+++.RB [ "\-i Schnittstelle" ] 
+++.B \-a 
++ .RB [ Rechnername ]
++ .PP
++ .B arp 
++@@ -19,14 +19,14 @@ arp \- Manipulation des ARP-Caches
++ .RB [ \-v ] 
++ .RB [ "\-H Typ" ] 
++ .RB [ "\-i Schnittstelle" ] 
++-.B -s Rechnername hw_adr
+++.B \-s Rechnername hw_adr
++ .RB [ temp ] 
++ .PP
++ .B arp 
++ .RB [ \-v ] 
++ .RB [ "\-H Typ" ] 
++ .RB [ "\-i Interface" ] 
++-.B -s Rechnername hw_adr
+++.B \-s Rechnername hw_adr
++ .RB [ "netmask nm" ] 
++ .B pub
++ .PP
++@@ -34,15 +34,15 @@ arp \- Manipulation des ARP-Caches
++ .RB [ \-v ] 
++ .RB [ "\-H Typ" ] 
++ .RB [ "\-i Schnittstelle" ] 
++-.B -Ds Rechnername ifa
+++.B \-Ds Rechnername ifa
++ .RB [ "netmask nm" ] 
++ .B pub
++ .PP
++ .B arp 
++ .RB [ \-vnD ]
++ .RB [ "\-H Typ" ] 
++-.RB [ "-i Schnittstelle" ]
++-.B -f [Dateiname]
+++.RB [ "\-i Schnittstelle" ]
+++.B \-f [Dateiname]
++ 
++ .SH BESCHREIBUNG
++ .B Arp
++@@ -61,7 +61,7 @@ Ausf\(:uhrlichere Ausgaben.
++ macht numerische Adressausgaben anstatt zu versuche, den symbolischen Rechner-,
++ Port- oder Benutzernamen zu ermitteln.
++ .TP
++-.B "\-H type, \-\-hw-type type"
+++.B "\-H type, \-\-hw\-type type"
++ Beim Setzen oder Auslesen des ARP-Caches schr\(:ankt diese Option
++ ein, auf welcher Klasse von Eintr\(:agen 
++ .B arp
++@@ -86,7 +86,7 @@ Argument verwendet, so werden alle Eintr
++ Alle Eintr\(:age f\(:ur den angegebenen Host entfernen.  Dies kann z.B.
++ benutzt werden, wenn ein System angehalten wird.
++ .TP
++-.B "\-D, \-\-use-device"
+++.B "\-D, \-\-use\-device"
++ Die Hardwareadresse der Netzwerksschnittstelle
++ .B ifa
++ verwenden.
++@@ -180,6 +180,6 @@ Flagge.
++ ethers(5), rarp(8), route(8), ifconfig(8), netstat(8)
++ .SH AUTOREN
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> mit vielen Verbesserungen vom
++-Verwalter der Net-Tools Bernd Eckenfels <net-tools@lina.inka.de>.
+++Verwalter der Net-Tools Bernd Eckenfels <net\-tools@lina.inka.de>.
++ .SH \(:Ubersetzung
++ Ralf B\(:achle <ralf@gnu.org>
++Index: net-tools/man/de_DE/hostname.1
++===================================================================
++--- net-tools.orig/man/de_DE/hostname.1
+++++ net-tools/man/de_DE/hostname.1
++@@ -3,7 +3,7 @@
++ .\"
++ .\" German translation by Ralf Baechle (ralf@gnu.org)
++ .\"
++-.TH HOSTNAME 1 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH HOSTNAME 1 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ 
++ .SH NAME
++ hostname \- den Rechnernamen anzeigen oder setzen.
++@@ -28,7 +28,7 @@ nodename \- den DECnet-Knotennamen anzei
++ .RB [ \-f ]
++ .RB [ \-\-fqdn ]
++ .RB [ \-i ]
++-.RB [ \-\-ip-address ]
+++.RB [ \-\-ip\-address ]
++ .RB [ \-\-long ]
++ .RB [ \-s ]
++ .RB [ \-\-short ]
++@@ -195,7 +195,7 @@ ge\(:andert werden.
++ .I "\-h, \-\-help"
++ Kurzanleitung ausdrucken und beenden.
++ .TP
++-.I "\-i, \-\-ip-address"
+++.I "\-i, \-\-ip\-address"
++ Die IP-Adresse(n) des Rechners anzeigen und beenden.
++ .TP
++ .I "\-n, \-\-node"
++@@ -220,9 +220,9 @@ Option gegeben wird, dann kann Root auch
++ .SH DATEIEN
++ .B /etc/hosts
++ .SH AUTOREN
++-Peter Tobias, <tobias@et-inf.fho-emden.de>
+++Peter Tobias, <tobias@et\-inf.fho\-emden.de>
++ .br
++-Bernd Eckenfels, <net-tools@lina.inka.de> (NIS and manpage).
+++Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS and manpage).
++ .br
++ Steve Whitehouse, <SteveW@ACM.org> (DECnet support and manpage).
++ .SH \(:Ubersetzung
++Index: net-tools/man/de_DE/ifconfig.8
++===================================================================
++--- net-tools.orig/man/de_DE/ifconfig.8
+++++ net-tools/man/de_DE/ifconfig.8
++@@ -1,4 +1,4 @@
++-.TH IFCONFIG 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ .SH NAME
++ ifconfig \- Konfiguration einer Netzwerkskarte
++ .SH SYNOPSIS
++@@ -19,7 +19,7 @@ Wird ein einzelne
++ .BR Schnittstelle nargument
++ angegeben, so zeigt es nur den Zustand der angegebenen Netzwerksschnittstelle
++ an.  Wird ein einzelne
++-.B -a
+++.B \-a
++ Option angegeben, zeigt es den Zustand aller Schnittstellen an, selbst wenn
++ diese inaktiviert sind.  Ansonsten konfiguriert
++ .B ifconfig
++@@ -130,13 +130,13 @@ sind
++ kann benutzt werden, damit der Treiber automatischen den Typ des Mediums
++ erkennt.  Wiederum unterst\(:utzen dies nicht alle Treiber.
++ .TP
++-.B "[-]broadcast [Adr]"
+++.B "[\-]broadcast [Adr]"
++ Wird das Adressargument gegeben, so wird die Protokolladresse f\(:ur Broadcast
++ f\(:ur diese Schnittstelle gesetzt.  Ansonsten wird die
++ .B IFF_BROADCAST
++ Flagge f\(:ur diese Schnittstelle gesetzt bzw. gel\(:oscht.
++ .TP
++-.B "[-]pointopoint [Adr]"
+++.B "[\-]pointopoint [Adr]"
++ Dieses Schl\(:usselwort aktiviert den
++ .B Punkt-zu-Punkt
++ Modus einer Schnittstelle.  Das bedeutet, da\(ss eine Verbindung zwischen zwei
++@@ -193,7 +193,7 @@ Kommando gemacht werden.
++ W\(:ahrend AppleTalk DDP und IPX Adressen angezeigt werden, k\(:onnen sie mit
++ diesem Kommando nicht ge\(:andert werden.
++ .SH SIEHE AUCH
++-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
+++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
++ .SH AUTOREN
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++ .br
++Index: net-tools/man/de_DE/netstat.8
++===================================================================
++--- net-tools.orig/man/de_DE/netstat.8
+++++ net-tools/man/de_DE/netstat.8
++@@ -9,7 +9,7 @@
++ .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
++ .\"
++ .\"
++-.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH NETSTAT 8 "2007-12-02" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ 
++ .SH NAME
++ netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen
++@@ -76,17 +76,17 @@ Ohne Optionen zeigt
++ den Zustand von offenen Sockets an.  Wird keine Adressfamilie angegeben, dann
++ werden die offenen Sockets aller konfigurierten Adressfamilien gedruckt.
++ Die Option
++-.B -e
+++.B \-e
++ gibt zus\(:atzliche Informationen aus (User ID).  Mit der Option
++-.B -v
+++.B \-v
++ gibt
++ .B netstat
++ zus\(:atzlich Fehlermeldungen \(:uber von Kernel nicht unterst\(:utzte
++ Adressfamilien aus.  Die Option
++-.B -p
+++.B \-p
++ gibt zus\(:atzlich die PID und den Namen des Programms, das den Socket
++ ge\(:offnet hat, aus.
++-.B -a
+++.B \-a
++ druckt alle Sockets einschlie\(sslich der auf Verbinungen wartenden
++ Serversockets aus.  Die Adressfamilie
++ .B inet
++@@ -96,9 +96,9 @@ zeigt RAW, UDP und TCP Sockets an.
++ Die
++ .BR \-r ", " \-\-route
++ Option gibt die Routentabellen des Kernels im gleichen Format wie
++-.B "route -e" 
+++.B "route \-e" 
++ aus.
++-.B "netstat -er" 
+++.B "netstat \-er" 
++ benutzt das Ausgabeformat von
++ .BR route .
++ Wegen Details siehe
++@@ -106,18 +106,18 @@ Wegen Details siehe
++ 
++ .SS "\-i, \-\-interfaces"
++ Wird die
++-.BR -i ", " --interfaces
+++.BR \-i ", " \-\-interfaces
++ Option verwendet,  so wird eine Tabelle aller Schnittstellen
++ ausgedruckt.  Die Ausgabe ist im Format von
++-.B "ifconfig -e"
+++.B "ifconfig \-e"
++ und wird in
++ .BR ifconfig (8)
++ beschrieben.
++-.B "netstat -ei" 
+++.B "netstat \-ei" 
++ druckt eine Tabelle f\(:ur Interfaces wie
++ .BR ifconfig .
++ Die
++-.B -a
+++.B \-a
++ Option schlie\(sst Schnittstellen, die gar nicht konfiguriert sind in die
++ Ausgabe ein, d.h. die die
++ .BR U = UP
++@@ -126,7 +126,7 @@ Flagge nicht gesetzt haben).
++ .SS "\-M, \-\-masquerade"
++ 
++ Eine Liste aller maskierten Sitzungen wird dargestellt.  Der
++-.B -e 
+++.B \-e 
++ Schalter schlie\(sst zus\(:atzlich Information \(:uber Sequenznummern und
++ Deltas, die durch das Umschreiben von FTP-Sitzungen (PORT Kommando) verursacht
++ werden.  Maskieren wird dazu verwendet um Maschinen mit inoffiziellen
++@@ -196,24 +196,24 @@ im Sekundenabstand die Ausgabe, bis es a
++ .SS "Proto" 
++ Das von Socket verwendete Protokoll (TCP, UDP, RAW).
++ 
++-.SS "Recv-Q"
+++.SS "Recv\-Q"
++ Die Anzahl von Bytes, die noch nicht von der Anwendung vom Socket abgeholt
++ wurden.
++ 
++-.SS "Send-Q"
+++.SS "Send\-Q"
++ Die Anzahl von Bytes, die von der Gegenseite noch nicht best\(:atigt wurde.
++ 
++ .SS "Lokale Adresse" 
++ Die lokale Adresse (lokaler Rechnername) und Portnummer des Sockets.  Au\(sser
++ bei Verwendung der
++-.B -n
+++.B \-n
++ Option wird die Socketadresse nach dem kanonischen Rechnernamen und die
++ Portnummer in den zugeh\(:origen Dienstenamen aufgel\(sst.
++ 
++ .SS "Gegenadresse"
++ Die Adresse und Portnummer der Gegenseite des Sockets.  Wie bei lokalen
++ Adressen schaltet der
++-.B -n
+++.B \-n
++ Schalter die Umwandlung von Rechneradresse und Portnummer ab.
++ 
++ .SS "State"
++@@ -267,7 +267,7 @@ Der Socket wartet auf eingehende Verbind
++ angezeit, wenn die
++ The socket is listening for incoming connections. Those sockets are only
++ displayed if the
++-.BR -a , --listening
+++.BR \-a , \-\-listening
++ Option gegeben wird.
++ .TP
++ .I
++@@ -285,7 +285,7 @@ Der Name oder die Benutzer-ID des Eigent
++ .SS "PID/Program name"
++ Durch einen Schr\(:agstrich abgetrenntes Paar von Prozess-ID und Programmname
++ des Programms, das diesen Socket besitzt.  Die Option
++-.B -p
+++.B \-p
++ schaltet die Anzeige dieser Spalte ein.  Es werden
++ .B root
++ Privilegien ben\(:otigt um die n\(:otigen Daten zu erhalten.  F\(:ur IPX
++@@ -359,7 +359,7 @@ Der Socket ist unbenutzt
++ H\(:Ort
++ Der Socket lauscht nach Verbindungsanfragen.  Diese Sockets werden nur
++ angezeigt, wenn die
++-.BR -a , --listening
+++.BR \-a , \-\-listening
++ Option gesetzt ist.
++ .TP
++ .I
++@@ -411,7 +411,7 @@ werden.)
++ 
++ .PP
++ .SH BEMERKUNGEN
++-Seit der Kern Version 2.2 zeigt netstat -i keine Schnittstellenstatistiken
+++Seit der Kern Version 2.2 zeigt netstat \-i keine Schnittstellenstatistiken
++ von Schnittstellenaliasen mehr an.  Um Statistiken per Schnittstelle zur
++ erhalten, m\(:ussen jetzt mit dem
++ .BR ipchains(8) 
++@@ -489,14 +489,14 @@ so kann unsinnige Information ausgegeben
++ unwahrscheinlich.
++ .br
++ Die
++-.B netstat -i
+++.B netstat \-i
++ die beschrieben wird sollte nach einigem S\(:aubern der BETA-Version des
++ Codes des Net-Tools Packets funktionieren.
++ 
++ .PP
++ .SH AUTOREN
++ Die Benutzerschnittstelle wurde von Fred Baumgarten
++-<dc6iq@insu1.etec.uni-karlsruhe.de> geschrieben, die Manpage zum gr\(:o\(ssten
+++<dc6iq@insu1.etec.uni\-karlsruhe.de> geschrieben, die Manpage zum gr\(:o\(ssten
++ Teil von Matt Welsh <mdw@tc.cornell.edu>.  Sie wurde von Alan Cox
++ <Alan.Cox@linux.org> aktualisiert, ben\(:otigt aber weitere Arbeit.
++ .br
++Index: net-tools/man/de_DE/plipconfig.8
++===================================================================
++--- net-tools.orig/man/de_DE/plipconfig.8
+++++ net-tools/man/de_DE/plipconfig.8
++@@ -1,4 +1,4 @@
++-.TH PLIPCONFIG 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH PLIPCONFIG 8 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ .SH NAME
++ plipconfig \- Einstellung von PLIP Schnittstellen-Parametern
++ .SH SYNOPSIS
++Index: net-tools/man/de_DE/rarp.8
++===================================================================
++--- net-tools.orig/man/de_DE/rarp.8
+++++ net-tools/man/de_DE/rarp.8
++@@ -1,14 +1,14 @@
++-.TH RARP 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH RARP 8 "6. M\(:arz 1999" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ .SH NAME
++ rarp \- Manipulation des RARP-Caches
++ .SH SYNOPSIS
++-.B "rarp [-V] [--version] [-h] [--help]"
+++.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]"
++ .br
++-.B "rarp -a"
+++.B "rarp \-a"
++ .br
++-.B "rarp [-v] -d Rechnername ..."
+++.B "rarp [\-v] \-d Rechnername ..."
++ .br
++-.B "rarp [-v] [-t type] -s Rechnername hw_addr"
+++.B "rarp [\-v] [\-t type] \-s Rechnername hw_addr"
++ .SH BESCHREIBUNG
++ .B Rarp
++ kann die RARP-Tabelle des Kernels auf verschiedene Arten manipulieren.  Die
++Index: net-tools/man/de_DE/route.8
++===================================================================
++--- net-tools.orig/man/de_DE/route.8
+++++ net-tools/man/de_DE/route.8
++@@ -1,4 +1,4 @@
++-.TH ROUTE 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH ROUTE 8 "2007-12-02" "net\-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ .SH NAME
++ route \- Anzeigen der IP-Routen-Tabelle
++ .SH SYNOPSIS
++@@ -51,11 +51,11 @@ Schnittstelle]
++ .RB [ \-V ] 
++ .RB [ \-\-version ]
++ .RB [ \-h ]
++-.RB [ \--help ]
+++.RB [ \-\-help ]
++ .SH BESCHREIBUNG
++ .B Route
++ wird zum \(:Andern der IP-Routing-Tabelle der Kernels verwendet.  Seine
++-prim\(:are Verwendung ist statische Routen f\*:ur bestimmte Rechner oder
+++prim\(:are Verwendung ist statische Routen f\(:ur bestimmte Rechner oder
++ Netzwerke \(:uber eine Schnittstelle einzutragen, nachdem diese mit dem
++ Programm
++ .BR ifconfig (8)
++@@ -92,13 +92,13 @@ Das
++ ist ein Netzwerk.
++ 
++ .TP
++-.B -host
+++.B \-host
++ daS
++ .B Ziel
++ ist ein Rechner
++ 
++ .TP 
++-.B -F
+++.B \-F
++ Zeit die FIB Routentabelle des Kerns an.  Das Ausgabeformat kann mit den
++ Optionen
++ .B \-e
++@@ -107,7 +107,7 @@ and
++ ge\(:andert werden.
++ 
++ .TP 
++-.B -C
+++.B \-C
++ zeigt den Routencache des Kernels an.
++ 
++ .TP
++@@ -120,8 +120,8 @@ f\(:ugt eine Route zu.
++ 
++ .TP
++ .B Ziel
++-Das Zielnetzwerk oder -System.  Die Angabe von sowohl IP-Adressen in Form
++-von dezimalen durch Punkt getrennten Quadrupeln als auch Rechner- und
+++Das Zielnetzwerk oder \(hySystem.  Die Angabe von sowohl IP-Adressen in Form
+++von dezimalen durch Punkt getrennten Quadrupeln als auch Rechner\(hy und
++ Netznamen ist zul\(:assig.
++ 
++ .TP
++@@ -130,7 +130,7 @@ Netznamen ist zul\(:assig.
++ 
++ .TP
++ .B gw Router
++-Alle IP-Pakete f\(:ur das Zielnetzwerk / -System werden zum angegebenen
+++Alle IP-Pakete f\(:ur das Zielnetzwerk / \(hySystem werden zum angegebenen
++ Router weitergeleitet.
++ 
++ .B ANMERKUNG:
++@@ -202,7 +202,7 @@ der Optionen (metric, netmask, gw und de
++ 
++ .SH BEISPIELE
++ .TP
++-.B route add -net 127.0.0.0
+++.B route add \-net 127.0.0.0
++ erzeugt die normale Loopbackroute mit der Netzmaske 255.0.0.0 (Netzwerk Klasse
++ A, ermittelt aus der Zieladresse) und assoziert sie mit der Schnittstelle lo
++ unter der Annahme, da\(ss dieses Ger\(:at vorher mit
++@@ -210,18 +210,18 @@ unter der Annahme, da\(ss dieses Ger\(:a
++ konfiguriert wurde. 
++ 
++ .TP 
++-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
+++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0
++ Legt eine Route zum Netzwerk 192.56.76.x \(:uber eth0 an.  Die Angabe der
++ Klasse C Netzmaske ist in diesem Fall nicht n\(:otig, 192.* Klasse C
++ IP-Adressen sind.  Das Wort dev darf in diesem Fall ausgelassen werden.
++ 
++ .TP
++-.B route add default gw mango-gw
+++.B route add default gw mango\-gw
++ legt eine Standardroute, d.h. eine Route die verwendet wird, wenn keine andere
++-Route passt, an.  Alle Pakete \(:uber diese Route werden \(:uber mango-gw
+++Route passt, an.  Alle Pakete \(:uber diese Route werden \(:uber mango\-gw
++ weitergeleitet.  Die Schnittstelle, die tats\(:achlich f\(:ur diese Route
++-verwendet wird, h\(:angt davon ab, wie mango-gw erreicht werden kann.  Zuvor
++-mu\(ss mango-gw bereits \(:uber eine andere Route erreicht werden k\(:onnen.
+++verwendet wird, h\(:angt davon ab, wie mango\-gw erreicht werden kann.  Zuvor
+++mu\(ss mango\-gw bereits \(:uber eine andere Route erreicht werden k\(:onnen.
++ 
++ .TP
++ .B route add ipx4 sl0
++@@ -229,7 +229,7 @@ Legt eine Route zum Rechner ipx4 \(:uber
++ wird angenommen da\(ss ipx4 der SLIP-Rechner auf der Gegenseite ist.
++ 
++ .TP
++-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
+++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4
++ Dieses Kommando sorgt daf\(:ur, dass das Netz 192.57.66.x \(:uber die
++ obige Route \(:uber die SLIP-Schnittstelle weitergeleitet wird.
++ 
++@@ -250,7 +250,7 @@ Dies installiert eine zur\(:uckweisende 
++ Die Ausgabe der Kernelroutentabelle besteht aus folgenden Spalten
++ .TP
++ .B Ziel
++-Das Zielnetzwerk oder -System.
+++Das Zielnetzwerk oder \(hySystem.
++ .TP
++ .B Router
++ Die Adresse des weiterleitenden Routers oder "*", wenn keine gesetzt ist.
++@@ -296,10 +296,10 @@ von Routend\(:amonen ben\(:otigt werden.
++ Anzahl der Referenzen auf diese Route.  Wird vom Linux Kern nicht benutzt.
++ .TP
++ .B Benutzer
++-Zahl der Suchvorg\(:ange nach dieser Route.  Abh\(:angig von -F und -C
++-werden entweder fehlgeschlagene Suchen im Cache (-F) oder Cache-Treffer (-C)
++-Count of lookups for the route.  Depending on the use of -F and -C this will
++-be either route cache misses (-F) or hits (-C).
+++Zahl der Suchvorg\(:ange nach dieser Route.  Abh\(:angig von \-F und \-C
+++werden entweder fehlgeschlagene Suchen im Cache (\-F) oder Cache-Treffer (\-C)
+++Count of lookups for the route.  Depending on the use of \-F and \-C this will
+++be either route cache misses (\-F) or hits (\-C).
++ .TP
++ .B Schnittstelle
++ Schnittstelle auf die Pakete f\(:ur diese Route geleitet werden.
++@@ -345,6 +345,6 @@ zugef\(:ugt.  Bernd Eckenfels hat schlie
++ irtt beigesteuert und den Code mit dem von Netstat vereinigt.
++ .SH AUTOREN
++ .B Route
++-wird zur Zeit von Phil Blundel (Philip.Blundell@pobox.com) gewartet.
+++wird zur Zeit von Phil Blundel <Philip.Blundell@pobox.com> und Bernd Eckenfels <net-tools@lina.inka.de> gewartet.
++ .SH \(:Ubersetzung
++ Ralf B\(:achle <ralf@gnu.org>
++Index: net-tools/man/de_DE/slattach.8
++===================================================================
++--- net-tools.orig/man/de_DE/slattach.8
+++++ net-tools/man/de_DE/slattach.8
++@@ -1,8 +1,8 @@
++-.TH SLATTACH 8 "6. M\(:arz 1999" "net-tools" "slattach"
+++.TH SLATTACH 8 "6. M\(:arz 1999" "net\-tools" "slattach"
++ .SH NAME
++ slattach \- Anbindung einer Netzwerksschnittstelle an eine serielle Verbindung
++ .SH SYNOPSIS
++-.B "slattach [-dehlLmnqv] [-c Kommando] [-p Protokoll] [-s Geschwindigkeit]
+++.B "slattach [\-dehlLmnqv] [\-c Kommando] [\-p Protokoll] [\-s Geschwindigkeit]
++ [Terminal]"
++ .br
++ .SH BESCHREIBUNG
++@@ -12,46 +12,46 @@ Reihe von m\(:oglichen Netzwerksmodi umz
++ m\(:oglich, es zur Verbindung mit anderen Computern zu verwenden.
++ .SH OPTIONEN
++ .TP
++-.B "[-c Kommando]"
+++.B "[\-c Kommando]"
++ Den Befehl
++ .B Kommando
++ beim Auflegen der Verbindung ausf\(:uhren.  Die kann benutzt werden um
++ Skripte laufen zu lassen oder eine Verbindung nach Abbruch wiederaufzubauen.
++ .TP
++-.B "[-d]"
+++.B "[\-d]"
++ Zus\(:atzliche Ausgaben zur Fehlersuche einschalten.  N\(:utzlich, wenn
++ eine Konfiguration nicht arbeitet.
++ .TP
++-.B "[-h]"
+++.B "[\-h]"
++ Beenden, wenn der Tr\(:ager verloren geht.  Dies funktioniert sowohl auf
++ /dev/tty als auch auf /dev/cua Ger\(:aten dadurch, da\(ss der Tr\(:ager
++ alle 15 Sekunden \(:uberpr\(:uft wird.
++-.B "[-v]"
+++.B "[\-v]"
++ Ausf\(:uhrliche Ausgaben.  Die ist n\(:utzlich in Shellskripten.
++ .TP
++-.B "[-q]"
+++.B "[\-q]"
++ Schaltet alle Ausgaben aus.
++ .TP
++-.B "[-l]"
+++.B "[\-l]"
++ Erzeugt eine Sperrdatei in /var/lock \(:ahnlich wie UUCP.
++ .TP
++-.B "[-n]"
+++.B "[\-n]"
++ Equivalent mit dem
++ .B mesg n
++ Befehl.
++ .TP
++-.B "[-m]"
+++.B "[\-m]"
++ Versetzt \fBnot\fP die Verbindung in den 8-bit raw-Modus.
++ .TP
++-.B "[-e]"
+++.B "[\-e]"
++ Beenden sofort nach der Initialisierung des Ger\(:ats anstelle darauf zu
++ warten, da\(ss die Leitung aufgelegt wird.
++ .TP
++-.B "[-L]"
+++.B "[\-L]"
++ Aktiviert 3-Draht-Betrieb.  Das Terminal wird in die CLOCAL Betriebsart
++ geschaltet und der Tr\(:ager wird nicht \(:uberwacht.
++ .TP
++-.B "[-p Protokoll]"
+++.B "[\-p Protokoll]"
++ Setzt ein spezifisches Protkoll um eine Leitung zu benutzen.  Die
++ Voreinstellung ist
++ .BR cslip ,
++@@ -79,7 +79,7 @@ Verbindungen sollte stattdessen das
++ .B axattach
++ Programm verwendet werden.
++ .TP
++-.B "[-s Geschwindigkeit]"
+++.B "[\-s Geschwindigkeit]"
++ Setzt eine von der Voreinstellung abweichende \(:Ubertragungseschwindigkeit.
++ .PP
++ Werden keine Argument gegeben, sie wird das aktuelle Terminal, das ist
++Index: net-tools/man/en_US/arp.8
++===================================================================
++--- net-tools.orig/man/en_US/arp.8
+++++ net-tools/man/en_US/arp.8
++@@ -1,4 +1,4 @@
++-.TH ARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH ARP 8 "2007-12-01" "net\-tools" "Linux Programmer's Manual"
++ .SH NAME
++ arp \- manipulate the system ARP cache
++ .SH SYNOPSIS
++@@ -167,8 +167,8 @@ used with 2.4 and newer kernels.
++ Similar to the
++ .B \-s
++ option, only this time the address info is taken from file
++-.B filename
++-.  This can be used if ARP entries for a lot of hosts have to be
+++.B filename.
+++This can be used if ARP entries for a lot of hosts have to be
++ set up.  The name of the data file is very often
++ .IR /etc/ethers , 
++ but this is not official. If no filename is specified /etc/ethers
++@@ -196,7 +196,7 @@ flag. Permanent entries are marked with
++ and published entries have the
++ .B P
++ flag.
++-.SH EXAMPLES
+++.SH EXSAMPLES
++ .B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub
++ 
++ This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for
++Index: net-tools/man/en_US/ethers.5
++===================================================================
++--- net-tools.orig/man/en_US/ethers.5
+++++ net-tools/man/en_US/ethers.5
++@@ -1,4 +1,4 @@
++-.TH ETHERS 5 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH ETHERS 5 "May 15th, 2005" "" "File formats"
++ .SH NAME \"{{{roff}}}\"{{{
++ ethers \- Ethernet address to IP number database
++ .\"}}}
++@@ -7,17 +7,17 @@ ethers \- Ethernet address to IP number 
++ IP numbers, one line for each IP number:
++ .sp
++ .RS
++-\fIEthernet\-address\fP  \fIIP\-number\fP
+++\fIEthernet-address\fP  \fIIP-number\fP
++ .RE
++ .sp
++ The two items are separated by any number of SPACE and/or TAB characters.
++ A \fB#\fP at the beginning of a line starts a comment
++-which extends to the end of the line.  The \fIEthernet\-address\fP is
+++which extends to the end of the line.  The \fIEthernet-address\fP is
++ written as
++ .IR x : x : x : x : x : x ,
++ where \fIx\fP is a hexadecimal number between \fB0\fP and \fBff\fP
++ which represents one byte of the address, which is in network byte
++-order (big-endian).  The \fIIP\-number\fP may be a hostname which
+++order (big-endian).  The \fIIP-number\fP may be a hostname which
++ can be resolved by DNS or a dot separated number.
++ .\"}}}
++ .SH EXAMPLES \"{{{
++Index: net-tools/man/en_US/hostname.1
++===================================================================
++--- net-tools.orig/man/en_US/hostname.1
+++++ net-tools/man/en_US/hostname.1
++@@ -1,4 +1,4 @@
++-.TH HOSTNAME 1 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH HOSTNAME 1 "28 Jan 1996" "net\-tools" "Linux Programmer's Manual"
++ 
++ .SH NAME
++ hostname \- show or set the system's host name
++Index: net-tools/man/en_US/ifconfig.8
++===================================================================
++--- net-tools.orig/man/en_US/ifconfig.8
+++++ net-tools/man/en_US/ifconfig.8
++@@ -1,4 +1,4 @@
++-.TH IFCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
++ .SH NAME
++ ifconfig \- configure a network interface
++ .SH SYNOPSIS
++@@ -45,7 +45,7 @@ supported address families include
++ display all interfaces which are currently available, even if down
++ .TP
++ .B -s
++-display a short list (like netstat -i)
+++display a short list (like netstat \-i)
++ .TP
++ .B -v
++ be more verbose for some error conditions
++Index: net-tools/man/en_US/mii-tool.8
++===================================================================
++--- net-tools.orig/man/en_US/mii-tool.8
+++++ net-tools/man/en_US/mii-tool.8
++@@ -1,7 +1,7 @@
++ .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
++ .\" mii-tool.8 1.5 2000/04/25 22:58:19
++ .\"
++-.TH MII\-TOOL 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH MII\-TOOL 8 "2004/03/28 23:30:00" "net\-tools"
++ 
++ .SH NAME
++ mii\-tool \- view, manipulate media-independent interface status
++Index: net-tools/man/en_US/nameif.8
++===================================================================
++--- net-tools.orig/man/en_US/nameif.8
+++++ net-tools/man/en_US/nameif.8
++@@ -1,4 +1,4 @@
++-.TH NAMEIF 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH NAMEIF 8 "18 Oct 2000" "net\-tools" "Linux's Administrator's Manual"
++ .SH NAME
++ nameif \- name network interfaces based on MAC addresses
++ .SH SYNOPSIS
++Index: net-tools/man/en_US/netstat.8
++===================================================================
++--- net-tools.orig/man/en_US/netstat.8
+++++ net-tools/man/en_US/netstat.8
++@@ -23,7 +23,7 @@ netstat \- Print network connections, ro
++ .RB [ \-\-listening | \-l ]
++ .RB [ \-\-all | \-a ]
++ .RB [ \-\-numeric | \-n ]
++-.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
+++.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric\-users ]
++ .RB [ \-\-symbolic | \-N ]
++ .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
++ .RB [ \-\-timers | \-o ]
++@@ -186,11 +186,9 @@ Print routing information from the route
++ .SS "Proto" 
++ The protocol (tcp, udp, raw) used by the socket. 
++ .SS "Recv\-Q"
++-Established: The count of bytes not copied by the user program connected to this socket.
++-Listening: Since Kernel 2.6.18 this column contains the current syn backlog.
+++The count of bytes not copied by the user program connected to this socket.
++ .SS "Send\-Q"
++-Established: The count of bytes not acknowledged by the remote host.
++-Listening: Since Kernel 2.6.18 this column contains the maximum size of the syn backlog.
+++The count of bytes not acknowledged by the remote host.
++ .SS "Local Address" 
++ Address and port number of the local end of the socket.  Unless the
++ .BR \-\-numeric " (" \-n )
++Index: net-tools/man/en_US/plipconfig.8
++===================================================================
++--- net-tools.orig/man/en_US/plipconfig.8
+++++ net-tools/man/en_US/plipconfig.8
++@@ -1,4 +1,4 @@
++-.TH PLIPCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH PLIPCONFIG 8 "17 February 1995" "" ""
++ .SH NAME
++ plipconfig \- fine tune PLIP device parameters 
++ .SH SYNOPSIS
++Index: net-tools/man/en_US/rarp.8
++===================================================================
++--- net-tools.orig/man/en_US/rarp.8
+++++ net-tools/man/en_US/rarp.8
++@@ -1,4 +1,4 @@
++-.TH RARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH RARP 8 "4 August 1997" "net\-tools" "Linux Programmer's Manual"
++ .SH NAME
++ rarp \- manipulate the system RARP table
++ .SH SYNOPSIS
++Index: net-tools/man/en_US/route.8
++===================================================================
++--- net-tools.orig/man/en_US/route.8
+++++ net-tools/man/en_US/route.8
++@@ -1,4 +1,4 @@
++-.TH ROUTE 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH ROUTE 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
++ .SH NAME
++ route \- show / manipulate the IP routing table
++ .SH SYNOPSIS
++Index: net-tools/man/en_US/slattach.8
++===================================================================
++--- net-tools.orig/man/en_US/slattach.8
+++++ net-tools/man/en_US/slattach.8
++@@ -1,4 +1,4 @@
++-.TH SLATTACH 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH SLATTACH 8 "10 Oct 2006" "" ""
++ .SH NAME
++ slattach \- attach a network interface to a serial line
++ .SH SYNOPSIS
++Index: net-tools/man/fr_FR/arp.8
++===================================================================
++--- net-tools.orig/man/fr_FR/arp.8
+++++ net-tools/man/fr_FR/arp.8
++@@ -1,12 +1,12 @@
++-.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual"
+++.TH ARP 8 "5 Jan 1999" "net\-tools" "Linux Programmer's Manual"
++ .SH NOM
++ arp \- manipule la table ARP du système
++ .SH SYNOPSIS
++ .B arp 
++ .RB [ \-vn ] 
++ .RB [ "\-H type" ] 
++-.RB [ "-i if" ] 
++-.B -a 
+++.RB [ "\-i if" ] 
+++.B \-a 
++ .RB [ nom_hôte ]
++ .PP
++ .B arp 
++@@ -19,14 +19,14 @@ arp \- manipule la table ARP du système
++ .RB [ \-v ] 
++ .RB [ "\-H type" ] 
++ .RB [ "\-i if" ] 
++-.B -s nom_hôte hw_addr
+++.B \-s nom_hôte hw_addr
++ .RB [ temp ] 
++ .PP
++ .B arp 
++ .RB [ \-v ] 
++ .RB [ "\-H type" ] 
++ .RB [ "\-i if" ] 
++-.B -s nom_hôte hw_addr
+++.B \-s nom_hôte hw_addr
++ .RB [ "netmask nm" ] 
++ .B pub
++ .PP
++@@ -34,15 +34,15 @@ arp \- manipule la table ARP du système
++ .RB [ \-v ] 
++ .RB [ "\-H type" ] 
++ .RB [ "\-i if" ] 
++-.B -Ds nom_hôte ifa
+++.B \-Ds nom_hôte ifa
++ .RB [ "netmask nm" ] 
++ .B pub
++ .PP
++ .B arp 
++ .RB [ \-vnD ]
++ .RB [ "\-H type" ] 
++-.RB [ "-i if" ]
++-.B -f nom_fichier
+++.RB [ "\-i if" ]
+++.B \-f nom_fichier
++ 
++ .SH DESCRIPTION
++ .B Arp
++@@ -61,7 +61,7 @@ Dit à l'utilisateur ce qui se passe en é
++ Affiche les adresses numériques au lieu d'essayer de déterminer les nom
++ d'hôtes symboliques.
++ .TP
++-.B "\-H type, \-\-hw-type type"
+++.B "\-H type, \-\-hw\-type type"
++ En positionnant ou lisant les entrées ARP, ce paramètre optionnel indique
++ à 
++ .B arp
++@@ -92,7 +92,7 @@ les entrées seront affichées.
++ Enlève une entrée pour l'hôte spécifié.  Ceci peut être
++ utilisé si l'hôte concerné ne fonctionne plus, par exemple.
++ .TP
++-.B "\-D, \-\-use-device"
+++.B "\-D, \-\-use\-device"
++ Utilise l'adresse matérielle de l'interface
++ .BR ifa
++ .
++@@ -178,7 +178,7 @@ et les entrées 'pub' ont l'indicateur
++ rarp(8), route(8), ifconfig(8), netstat(8)
++ .SH AUTEUR
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> avec les améliorations
++-apportées par le mainteneur des net-tools Bernd Eckenfels
++-<net-tools@lina.inka.de>.
+++apportées par le mainteneur des net\-tools Bernd Eckenfels
+++<net\-tools@lina.inka.de>.
++ .SH TRADUCTION
++ Jean Michel VANSTEENE (vanstee@worldnet.fr)
++Index: net-tools/man/fr_FR/hostname.1
++===================================================================
++--- net-tools.orig/man/fr_FR/hostname.1
+++++ net-tools/man/fr_FR/hostname.1
++@@ -1,4 +1,4 @@
++-.TH HOSTNAME 1 "15 Mars 1999" "net-tools" "Linux Programmer's Manual"
+++.TH HOSTNAME 1 "15 Mars 1999" "net\-tools" "Linux Programmer's Manual"
++ .SH NOM
++ hostname \- affiche ou définit le nom d'hôte du système
++ .br
++@@ -22,7 +22,7 @@ nodename \- affiche ou définit le nom de
++ .RB [ \-f ]
++ .RB [ \-\-fqdn ]
++ .RB [ \-i ]
++-.RB [ \-\-ip-address ]
+++.RB [ \-\-ip\-address ]
++ .RB [ \-\-long ]
++ .RB [ \-s ]
++ .RB [ \-\-short ]
++@@ -177,7 +177,7 @@ le nom FQDN et le nom de domaine (qui fa
++ .I "\-h, \-\-help"
++ Affiche un message d'aide et se termine.
++ .TP
++-.I "\-i, \-\-ip-address"
+++.I "\-i, \-\-ip\-address"
++ Affiche la (les) adresse(s) IP de l'hôte.
++ .TP
++ .I "\-n, \-\-node"
++@@ -203,9 +203,9 @@ Affiche le nom de domaine NIS. Si un par
++ .SH FICHIERS
++ .B /etc/hosts
++ .SH AUTEURS
++-Peter Tobias, <tobias@et-inf.fho-emden.de>
+++Peter Tobias, <tobias@et\-inf.fho\-emden.de>
++ .br
++-Bernd Eckenfels, <net-tools@lina.inka.de> (NIS et pages de manuel).
+++Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS et pages de manuel).
++ .br
++ Steve Whitehouse, <SteveW@ACM.org> (Support DECnet et pages de manuel).
++ .SH TRADUCTION
++Index: net-tools/man/fr_FR/ifconfig.8
++===================================================================
++--- net-tools.orig/man/fr_FR/ifconfig.8
+++++ net-tools/man/fr_FR/ifconfig.8
++@@ -1,4 +1,4 @@
++-.TH IFCONFIG 8 "4 August 1997" "net-tools" "Linux Programmer's Manual"
+++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
++ .SH NOM
++ ifconfig \- configure une interface réseau
++ .SH SYNOPSIS
++@@ -20,7 +20,7 @@ seul le paramètre
++ .B interface
++ est donné, il affiche seulement l'état de l'interface correspondante;
++ si seul le paramètre
++-.B -a
+++.B \-a
++ est fourni, il affiche l'état de toutes les interfaces, même celles qui
++ ne sont pas actives.
++ Autrement, il considère qu'il faut positionner de nouvelles valeurs.
++@@ -128,14 +128,14 @@ permet d'indiquer au pilote de détecter 
++ utilisé. Une fois de plus, tous les périphériques ne supportent pas cette
++ option.
++ .TP
++-.B "[-]broadcast [adr]"
+++.B "[\-]broadcast [adr]"
++ Si l'adresse est également donnée, définit l'adresse broadcast
++ protocolaire pour cette interface. Autrement, il permet d'armer (ou désarmer)
++ l'indicateur
++ .B IFF_BROADCAST
++ de l'interface.
++ .TP
++-.B "[-]pointopoint [adr]"
+++.B "[\-]pointopoint [adr]"
++ Ce mot clé valide le mode
++ .B point-à-point
++ d'une interface, signifiant qu'il existe un lien direct entre 2 machines,
++@@ -196,7 +196,7 @@ comptabilité particulières pour l'adress
++ Même si les adresses appletalk DDP et IPX peuvent être affichées,
++ elles ne peuvent être modifiées avec cette commande.
++ .SH VOIR AUSSI
++-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
+++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
++ .SH AUTHORS
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++ .br
++Index: net-tools/man/fr_FR/netstat.8
++===================================================================
++--- net-tools.orig/man/fr_FR/netstat.8
+++++ net-tools/man/fr_FR/netstat.8
++@@ -8,7 +8,7 @@
++ .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
++ .\"
++ .\"
++-.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
+++.TH NETSTAT 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
++ 
++ .SH NAME
++ netstat \- Affiche les connexions réseau, les tables de routage, les
++@@ -76,17 +76,17 @@ ouvertes. C'est l'option par défaut : si
++ d'adresses, les sockets actives de toutes les familles d'adresses seront
++ affichées.
++ Avec le paramètre
++-.B -e
+++.B \-e
++ vous obtenez quelques informations supplémentaires (userid). Avec le paramètre
++-.B -v
+++.B \-v
++ vous pouvez demander à netstat de signaler des familles d'adresses connues
++ non supportées par le noyau. Le paramètre
++-.B -o
+++.B \-o
++ affiche des informations supplémentaires sur les timers réseau. En donnant
++ le paramètre
++-.B -p
+++.B \-p
++ vous verrez le PID et le nom du processus à qui appartient la socket. Le paramètre
++-.B -a
+++.B \-a
++ affiche toutes les sockets, y compris les sockets d'écoute des serveurs. La famille
++ d'adresses
++ .B inet
++@@ -97,9 +97,9 @@ Avec le paramètre
++ .BR \-r ", " \-\-route
++ vous pouvez visualiser les tables de routage dans le même format qu'avec la
++ commande
++-.B "route -e" 
+++.B "route \-e" 
++ .
++-.B "netstat -er" 
+++.B "netstat \-er" 
++ utilisera le format de la commande
++ .BR route .
++ Veuillez consulter
++@@ -108,19 +108,19 @@ pour plus de détails.
++ 
++ .SS "\-i, \-\-interfaces \fIiface\fI"
++ Si vous utilisez l'option
++-.BR -i ", " --interfaces
+++.BR \-i ", " \-\-interfaces
++ , une table de toutes (ou de l'interface
++ .IR iface 
++ spécifiée) les interfaces réseau sera affichée. Le format de sortie est le
++ même que celui de la commande
++-.B "ifconfig -e"
+++.B "ifconfig \-e"
++ , et est décrit dans
++ .BR ifconfig (8).
++-.B "netstat -ei"
+++.B "netstat \-ei"
++ affiche une table ou une seule entrée d'interface comme la commande 
++ .BR ifconfig .
++ Avec le paramètre
++-.B -a
+++.B \-a
++ , vous pouvez inclure les interfaces qui ne sont pas configurées (c.a.d qui
++ n'ont pas l'indicateur
++ .BR U = UP
++@@ -129,7 +129,7 @@ armé).
++ .SS "\-M, \-\-masquerade"
++ 
++ Permet de voir les sessions ayant de l'IP-masquerade. Avec le paramètre
++-.B -e 
+++.B \-e 
++ vous pouvez inclure quelques informations concernant les numéros de
++ séquence et les deltas causés par des réécritures de données sur des
++ sessions FTP (commande PORT). Le support de l'IP-Masquerade est utilisé
++@@ -197,24 +197,24 @@ l'interrompiez.
++ .SS "Proto" 
++ Le protocole (TCP, UDP, RAW) utilisé par la socket. 
++ 
++-.SS "Recv-Q"
+++.SS "Recv\-Q"
++ Le nombre d'octets non encore lus par le programme utilisateur connecté
++ à cette socket.
++ 
++-.SS "Send-Q"
+++.SS "Send\-Q"
++ Le nombre d'octets non encore acquittés par l'hôte distant.
++ 
++ .SS "Local Address (Adresse locale)" 
++ L'adresse locale (nom d'hôte local) et numéro de port de la
++ socket. Sauf si l'option
++-.B -n
+++.B \-n
++ est donnée, l'adresse de la prise est traduite en nom d'hôte,
++ et le numéro de port est traduit en nom de service correspondant.
++ 
++ .SS "Foreign Address (Adresse distante)"
++ L'adresse distante (nom d'hôte distant) et le numéro de port de
++ la prise. Comme pour l'adresse locale et le numéro de port, l'option
++-.B -n
+++.B \-n
++ invalide la traduction du nom d'hôte et de service.
++ 
++ .SS "State (Etat)"
++@@ -264,7 +264,7 @@ Le distant termine, et la socket est fer
++ LISTEN
++ La socket est à l'écoute de connexions entrantes. Ces sockets ne sont
++ affichées que si le paramètre
++-.BR -a , --listening
+++.BR \-a , \-\-listening
++ est fourni.
++ .TP
++ .I
++@@ -282,7 +282,7 @@ Le nom d'utilisateur ou l'UID du proprié
++ .SS "PID/Program name (PID/Nom de Programme)"
++ Le PID et le nom du programme (séparés par un slash) propriétaire de la
++ socket. Le paramètre
++-.B -p
+++.B \-p
++ active l'affichage de cette colonne. Vous devez avoir les droits de
++ .B root
++ puisque vous devez avoir les droits d'accès aux processus pour visualiser
++@@ -357,7 +357,7 @@ La socket n'est pas allouée
++ LISTENING
++ La socket est à l'écoute de demandes de connexions. Ces sockets ne sont
++ affichées que si le paramètre
++-.BR -a , --listening
+++.BR \-a , \-\-listening
++ est fourni.
++ .TP
++ .I
++@@ -406,7 +406,7 @@ Affiche le chemin correspondant à l'atta
++ 
++ .PP
++ .SH NOTES
++-Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques
+++Depuis la version 2.2 du noyau, netstat \-i n'affiche plus les statistiques
++ des interfaces alias. Pour obtenir les compteurs par interface alias, vous
++ devez définir des règles spécifiques à l'aide de la commande
++ .BR ipchains (8).
++@@ -482,18 +482,18 @@ si une socket change d'état au moment ou
++ Ceci est peut probable.
++ .br
++ Le paramètre
++-.B netstat -i
+++.B netstat \-i
++ est décrit tel qu'il fonctionnera lorsque le code de la version BETA du
++-paquetage net-tools aura été nettoyé.
+++paquetage net\-tools aura été nettoyé.
++ 
++ .PP
++ .SH AUTEURS
++ L'interface utilisateur de netstat a été développée par
++-Fred Baumgarten <dc6iq@insu1.etec.uni-karlsruhe.de>. Les pages du
+++Fred Baumgarten <dc6iq@insu1.etec.uni\-karlsruhe.de>. Les pages du
++ manuel essentiellement écrites par Matt Welsh
++ <mdw@tc.cornell.edu>. Mis à jour par Alan Cox <Alan.Cox@linux.org>.
++ .br
++-La page de manuel et la commande incluse dans le paquetage net-tools
+++La page de manuel et la commande incluse dans le paquetage net\-tools
++ a été totallement réécrite par Bernd Eckenfels 
++ <ecki@linux.de>.
++ .SH TRADUCTION
++Index: net-tools/man/fr_FR/rarp.8
++===================================================================
++--- net-tools.orig/man/fr_FR/rarp.8
+++++ net-tools/man/fr_FR/rarp.8
++@@ -1,14 +1,14 @@
++-.TH RARP 8 "4 Août 1997" "net-tools" "Linux Programmer's Manual"
+++.TH RARP 8 "4 Août 1997" "net\-tools" "Linux Programmer's Manual"
++ .SH NOM
++ rarp \- manipule la table système RARP
++ .SH SYNOPSIS
++-.B "rarp [-V] [--version] [-h] [--help]"
+++.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]"
++ .br
++-.B "rarp -a"
+++.B "rarp \-a"
++ .br
++-.B "rarp [-v] -d nom_d_hote ..."
+++.B "rarp [\-v] \-d nom_d_hote ..."
++ .br
++-.B "rarp [-v] [-t type] -s nom_d_hote adr_materiel"
+++.B "rarp [\-v] [\-t type] \-s nom_d_hote adr_materiel"
++ .SH DESCRIPTION
++ .B Rarp
++ manipule la table RARP du noyau de différentes façons.  Les options de base
++Index: net-tools/man/fr_FR/route.8
++===================================================================
++--- net-tools.orig/man/fr_FR/route.8
+++++ net-tools/man/fr_FR/route.8
++@@ -1,4 +1,4 @@
++-.TH ROUTE 8 "8 Août 1997" "net-tools" "Linux Programmer's Manual"
+++.TH ROUTE 8 "2007-12-02" "net\-tools" "Linux Programmer's Manual"
++ .SH NAME
++ route \- affiche / manipule la table de routage IP
++ .SH SYNOPSIS
++@@ -51,7 +51,7 @@ If]
++ .RB [ \-V ] 
++ .RB [ \-\-version ]
++ .RB [ \-h ]
++-.RB [ \--help ]
+++.RB [ \-\-help ]
++ .SH DESCRIPTION
++ .B Route
++ manipule la table de routage IP du noyau.  Son utilisation première
++@@ -77,7 +77,7 @@ savoir pourquoi la route vers votre serv
++ .TP
++ .B \-e
++ utilise
++-.BR netstat (8)-format
+++.BR netstat (8)\-format
++ pour l'affichage de la table de routage.
++ .B \-ee 
++ Génère une très longue ligne avec tous les paramètres à partir de la table
++@@ -90,13 +90,13 @@ la
++ est un réseau.
++ 
++ .TP
++-.B -host
+++.B \-host
++ la
++ .B cible 
++ est un hôte.
++ 
++ .TP 
++-.B -F
+++.B \-F
++ affiche la table de routage FIB du noyau. L'organisation peut être changée avec
++ .B \-e
++ et
++@@ -104,7 +104,7 @@ et
++ .
++ 
++ .TP 
++-.B -C
+++.B \-C
++ affiche le cache de routage du noyau. 
++ 
++ .TP
++@@ -188,25 +188,25 @@ modificateurs de route (metric - netmask
++ 
++ .SH EXEMPLES
++ .TP
++-.B route add -net 127.0.0.0
+++.B route add \-net 127.0.0.0
++ ajoute l'entrée loopback normale, en utilisant le masque 255.0.0.0 (réseau
++ de classe A, selon l'adresse de destination) et associée avec l'interface 
++ "lo" (en supposant que ce périphérique a été correctement configuré avec
++ .BR ifconfig (8)). 
++ 
++ .TP 
++-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
+++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0
++ ajoute une route vers le réseau 192.56.76.x via 
++ "eth0". Le masque de classe C n'est pas vraiment nécessaire ici car
++ 192.* est une adresse IP de classe C. Le mot "dev" peut être omis. 
++ 
++ .TP
++-.B route add default gw mango-gw
+++.B route add default gw mango\-gw
++ ajoute une route par défaut (qui sera utilisée si aucune autre route ne
++ convient). Tous les paquets empreintant cette route passeront par
++-"mango-gw". Le périphérique qui sera effectivement utilisé pour cette route
++-dépend de la façon dont on atteint "mango-gw" - la route statique vers
++-"mango-gw" devra être préalablement configurée. 
+++"mango\-gw". Le périphérique qui sera effectivement utilisé pour cette route
+++dépend de la façon dont on atteint "mango\-gw" - la route statique vers
+++"mango\-gw" devra être préalablement configurée. 
++ 
++ .TP
++ .B route add ipx4 sl0
++@@ -214,7 +214,7 @@ ajoute une route vers l'hôte "ipx4" via 
++ "ipx4" est l'hôte SLIP).
++ 
++ .TP
++-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
+++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4
++ Cette commande route le réseau "192.57.66.x" par l'ancienne route vers l'interface SLIP.
++ 
++ .TP
++@@ -285,8 +285,8 @@ de routage.
++ Nombre de références à cette route. (Pas utilisé dans le noyau Linux.)
++ .TP
++ .B Use
++-Count of lookups for the route.  Depending on the use of -F and -C this will
++-be either route cache misses (-F) or hits (-C).
+++Count of lookups for the route.  Depending on the use of \-F and \-C this will
+++be either route cache misses (\-F) or hits (\-C).
++ .TP
++ .B Iface
++ Interface vers laquelle les paquets empruntant cette route seront envoyés.
++@@ -330,6 +330,6 @@ Linus Torvalds pour pl15. Alan Cox a ajo
++ la gestion des fenêtres et MSS pour Linux 1.1.22. Le support de irtt 
++ et la fusion avec netstat ont été réalisés par Bernd Eckenfels.
++ .SH AUTEUR
++-Maintenu par Phil Blundell <Philip.Blundell@pobox.com>.
+++Maintenu par Phil Blundell <Philip.Blundell@pobox.com> et Bernd Eckenfels <net-tools@lina.inka.de>.
++ .SH TRADUCTION
++-Jean-Michel VANSTEENE (vanstee@worldnet.fr)
+++Jean-Michel VANSTEENE <vanstee@worldnet.fr>
++Index: net-tools/man/fr_FR/slattach.8
++===================================================================
++--- net-tools.orig/man/fr_FR/slattach.8
+++++ net-tools/man/fr_FR/slattach.8
++@@ -2,7 +2,7 @@
++ .SH NOM
++ slattach \- attache une interface réseau à une ligne série
++ .SH SYNOPSIS
++-.B "slattach [-dehlLmnqv] [-c commande] [-p proto] [-s vitesse] [tty]"
+++.B "slattach [\-dehlLmnqv] [\-c commande] [\-p proto] [\-s vitesse] [tty]"
++ .br
++ .SH DESCRIPTION
++ .B Slattach
++@@ -12,46 +12,46 @@ ceci vous permettant de l'utiliser pour 
++ vers d'autres systèmes.
++ .SH OPTIONS
++ .TP
++-.B "[-c commande]"
+++.B "[\-c commande]"
++ Exécute
++ .B `commande'
++ lorsque la ligne est suspendue. Ceci peut être utilisé pour lancer
++ des scripts ou réétablir des connexions quand un lien tombe.
++ .TP
++-.B "[-d]"
+++.B "[\-d]"
++ Valide le débogage.  Utile pour déterminer pourquoi une configuration
++ ne fonctionne pas.
++ .TP
++-.B "[-h]"
+++.B "[\-h]"
++ Termine lorsque la porteuse est perdue. Ceci fonctionne à la fois sur
++ les périphériques /dev/tty et /dev/cua en contrôlant directement
++ l'état de la porteuse toutes les 15 secondes.
++ .TP
++-.B "[-v]"
+++.B "[\-v]"
++ Valide le mode verbeux.  Utile pour les shell scripts.
++ .TP
++-.B "[-q]"
+++.B "[\-q]"
++ Opère en mode silencieux - pas de messages du tout.
++ .TP
++-.B "[-l]"
+++.B "[\-l]"
++ Crée un fichier de vérouillage pour le périphérique comme
++ pour UUCP dans /var/lock.
++ .TP
++-.B "[-n]"
+++.B "[\-n]"
++ Equivalent à la commande "mesg n".
++ .TP
++-.B "[-m]"
+++.B "[\-m]"
++ \fBn'\fPinitialise \fBpas\fP la ligne en mode raw 8 bits.
++ .TP
++-.B "[-e]"
+++.B "[\-e]"
++ Termine correctement après l'initialisation du périphérique,
++ au lieu d'attendre que la ligne soit suspendue.
++ .TP
++-.B "[-L]"
+++.B "[\-L]"
++ Valide les opérations 3 lignes. Le terminal est mis en mode CLOCAL, 
++ la surveillance de porteuse est invalidée.
++ .TP
++-.B "[-p proto]"
+++.B "[\-p proto]"
++ Définit le protocole spécifique à utiliser sur la ligne.
++ La valeur par défaut est 
++ .B "cslip"
++@@ -75,7 +75,7 @@ pour être actif sur la ligne. Pour les c
++ .B axattach
++ doit être utilisé.
++ .TP
++-.B "[-s vitesse]"
+++.B "[\-s vitesse]"
++ Définit la vitesse de la ligne, différente de la valeur par défaut.
++ .PP
++ Si aucun argument n'est donné, la ligne courante du terminal
++Index: net-tools/man/pt_BR/arp.8
++===================================================================
++--- net-tools.orig/man/pt_BR/arp.8
+++++ net-tools/man/pt_BR/arp.8
++@@ -1,12 +1,12 @@
++-.TH ARP 8 "22 de junho de 1996" "net-tools" "Manual do Programador Linux"
+++.TH ARP 8 "22 de junho de 1996" "net\-tools" "Manual do Programador Linux"
++ .SH NOME
++ arp \- manipula o cache ARP do sistema
++ .SH SINOPSE
++ .B arp 
++ .RB [ \-vn ] 
++ .RB [ "\-H tipo" ] 
++-.RB [ "-i if" ] 
++-.B -a 
+++.RB [ "\-i if" ] 
+++.B \-a 
++ .RB [ máquina ]
++ .PP
++ .B arp 
++@@ -20,7 +20,7 @@ arp \- manipula o cache ARP do sistema
++ .RB [ \-v ] 
++ .RB [ "\-H tipo" ] 
++ .RB [ "\-i if" ] 
++-.B -s máquina endereço_hardware
+++.B \-s máquina endereço_hardware
++ .RB [ temp ] 
++ .RB [ nopub ]
++ .PP
++@@ -28,7 +28,7 @@ arp \- manipula o cache ARP do sistema
++ .RB [ \-v ] 
++ .RB [ "\-H tipo" ] 
++ .RB [ "\-i if" ] 
++-.B -s máquina endereço_hardware
+++.B \-s máquina endereço_hardware
++ .RB [ "netmask nm" ] 
++ .B pub
++ .PP
++@@ -36,15 +36,15 @@ arp \- manipula o cache ARP do sistema
++ .RB [ \-v ] 
++ .RB [ "\-H tipo" ] 
++ .RB [ "\-i if" ] 
++-.B -Ds máquina ifa
+++.B \-Ds máquina ifa
++ .RB [ "netmask nm" ] 
++ .B pub
++ .PP
++ .B arp 
++ .RB [ \-vnD ]
++ .RB [ "\-H tipo" ] 
++-.RB [ "-i if" ]
++-.B -f arquivo
+++.RB [ "\-i if" ]
+++.B \-f arquivo
++ 
++ .SH DESCRIÇÃO
++ .B arp
++@@ -62,7 +62,7 @@ Mostra ao usuário o que está acontecendo
++ mostra endereços numéricos, ao invés de tentar determinar os nomes simbólicos da
++ máquina, porta e usuário.
++ .TP
++-.B "\-H type, \-\-hw-type type"
+++.B "\-H type, \-\-hw\-type type"
++ Quando configurando ou lendo o cache ARP, este parâmetro opcional informa ao
++ .B arp
++ que classe de entradas devem ser verificadas. O valor padrão deste parâmetro é
++@@ -96,7 +96,7 @@ ou
++ para decidir se uma entrada pública ou privada deve ser removida. Se você
++ não informar uma destas flags as duas entradas serão removidas.
++ .TP
++-.B "\-D, \-\-use-device"
+++.B "\-D, \-\-use\-device"
++ Usa o endereço de hardware da interface 
++ .BR ifa
++ .TP
++@@ -170,7 +170,7 @@ e entradas publicadas tem uma flag 
++ .I /etc/ethers
++ .SH AUTOR
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> com muitas melhorias
++-feitas pelo mantenedor do net-tools, Bernd Eckenfels <net-tools@lina.inka.de>.
+++feitas pelo mantenedor do net\-tools, Bernd Eckenfels <net\-tools@lina.inka.de>.
++ Tradução para a língua portuguesa feita por
++ Arnaldo Carvalho de Melo <acme@conectiva.com.br> em 11/abril/1998.
++ Revisado por 
++Index: net-tools/man/pt_BR/hostname.1
++===================================================================
++--- net-tools.orig/man/pt_BR/hostname.1
+++++ net-tools/man/pt_BR/hostname.1
++@@ -1,4 +1,4 @@
++-.TH HOSTNAME 1 "28 de janeiro de 1996" "net-tools" "Manual do Programador Linux"
+++.TH HOSTNAME 1 "28 de janeiro de 1996" "net\-tools" "Manual do Programador Linux"
++ 
++ .SH NOME
++ hostname \- mostra ou configura o nome da máquina 
++@@ -21,7 +21,7 @@ ypdomainname \- mostra ou configura o no
++ .RB [ \-f ]
++ .RB [ \-\-fqdn ]
++ .RB [ \-i ]
++-.RB [ \-\-ip-address ]
+++.RB [ \-\-ip\-address ]
++ .RB [ \-\-long ]
++ .RB [ \-s ]
++ .RB [ \-\-short ]
++@@ -161,7 +161,7 @@ do domínio DNS (que é parte do FQDN) no 
++ .I "\-h, \-\-help"
++ Mostra uma mensagem sobre como utilizar o comando e termina.
++ .TP
++-.I "\-i, \-\-ip-address"
+++.I "\-i, \-\-ip\-address"
++ Mostra o(s) endereço(s) IP da máquina.
++ .TP
++ .I "\-s, \-\-short"
++@@ -180,9 +180,9 @@ Mostra o nome do domínio NIS. Se um parâ
++ .SH ARQUIVOS
++ .B /etc/hosts
++ .SH AUTOR
++-Peter Tobias, <tobias@et-inf.fho-emden.de>
+++Peter Tobias, <tobias@et\-inf.fho\-emden.de>
++ .BR
++-Bernd Eckenfels, <net-tools@lina.inka.de> (NIS e página man).
+++Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS e página man).
++ .BR
++ Arnaldo Carvalho de Melo, <acme@conectiva.com.br> Tradução para a língua
++ portuguesa.
++Index: net-tools/man/pt_BR/ifconfig.8
++===================================================================
++--- net-tools.orig/man/pt_BR/ifconfig.8
+++++ net-tools/man/pt_BR/ifconfig.8
++@@ -1,4 +1,4 @@
++-.TH IFCONFIG 8 "10 de fevereiro de 1996" "net-tools" "Manual do Programador Linux"
+++.TH IFCONFIG 8 "2007-12-02" "net\-tools" "Manual do Programador Linux"
++ .SH NOME
++ ifconfig \- configura uma interface de rede
++ .SH SINOPSE
++@@ -61,7 +61,7 @@ o sinal de menos (\-) estiver presente a
++ .TP
++ .B "[\-]trailers" 
++ Habilita ou desabilita o uso de trailer em frames Ethernet. Não é
++-utilizada na implementação atual do pacote net-tools.
+++utilizada na implementação atual do pacote net\-tools.
++ .TP
++ .B "[\-]allmulti" 
++ Habilita ou desabilita o modo
++@@ -97,7 +97,7 @@ uso de sub-redes.
++ Configura a linha de interrupção (IRQ) usada por este dispositivo. Muitos
++ dispositivos não suportam configuração dinâmica de IRQ.
++ .TP
++-.B "[-]broadcast [endereço]"
+++.B "[\-]broadcast [endereço]"
++ Se o argumento endereço for informado, configura o endereço de protocolo
++ broadcast para esta interface. De outra forma ele somente configura a flag
++ .B IFF_BROADCAST
++@@ -105,7 +105,7 @@ da interface.  Se a palavra-chave for pr
++ .B (-)
++ , então a flag é removida.
++ .TP
++-.B "[-]pointopoint [endereço]"
+++.B "[\-]pointopoint [endereço]"
++ Esta palavra-chave habilita o modo
++ .B ponto-a-ponto
++ da interface, significando que ela é um link direto entre duas máquinas
++@@ -169,7 +169,7 @@ endereços usando o comando
++ Os endereços appletalk DDP e IPX serão mostrados, mas não podem ser alterados
++ com este comando.
++ .SH VEJA TAMBÉM
++-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
+++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
++ .SH AUTORES
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++ Alan Cox, <Alan.Cox@linux.org>
++Index: net-tools/man/pt_BR/netstat.8
++===================================================================
++--- net-tools.orig/man/pt_BR/netstat.8
+++++ net-tools/man/pt_BR/netstat.8
++@@ -8,7 +8,7 @@
++ .\" Traduzido para português por Arnaldo Carvalho de Melo <acme@conectiva.com.br>
++ .\" Revisado por Jorge Luiz Godoy Filho <jorge@bestway.com.br>
++ .\"
++-.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
+++.TH NETSTAT 8 "2007-12-02" "net\-tools" "Manual do Programador Linux"
++ 
++ .SH NOME
++ netstat \- Mostra conexões de rede, tabelas de roteamento, estatísticas de interface e conexões
++@@ -72,14 +72,14 @@ Você pode ver o estado das conexões de r
++ abertos. Esta é a operação padrão: se você não especificar nenhuma
++ família de endereços, os sockets ativos de todas as famílias de endereços
++ configuradas serão mostrados. Com
++-.B -e
+++.B \-e
++ você obterá informações adicionais (userid). Com a chave
++-.B -v
+++.B \-v
++ você poderá fazer com que o netstat reclame sobre famílias de endereços
++ conhecidas que não sejam suportadas pelo kernel. A opção
++-.B -o
+++.B \-o
++ mostra algumas informações adicionais sobre temporizadores de rede.
++-.B -a
+++.B \-a
++ mostra todos os sockets, incluindo sockets de servidores. A família de
++ endereços
++ .B inet
++@@ -89,8 +89,8 @@ mostrará sockets raw, udp e tcp.
++ Com a opção
++ .BR \-r ", " \-\-route
++ você obterá as tabelas de roteamento do kernel no mesmo formato usado por
++-.BR "route -e" .
++-.B "netstat -er" 
+++.BR "route \-e" .
+++.B "netstat \-er" 
++ usará o formato de apresentação do comando
++ .BR route .
++ Por favor veja
++@@ -99,18 +99,18 @@ para maiores detalhes.
++ 
++ .SS "\-i, \-\-interfaces \fIiface\fI"
++ Se você usar a opção
++-.BR -i ", " --interfaces
+++.BR \-i ", " \-\-interfaces
++ , uma tabela de todas (ou da
++ .IR iface
++ especificada) as interfaces de rede será mostrada. A saída usa o formato
++-.B "ifconfig -e"
+++.B "ifconfig \-e"
++ , e é descrita em
++ .BR ifconfig (8).
++-.B "netstat -ei" 
+++.B "netstat \-ei" 
++ mostrará uma tabela ou uma entrada de interface como
++ .B ifconfig
++ mostra. Com a chave
++-.B -a
+++.B \-a
++ , você pode incluir interfaces que não estejam configuradas (i.e. não tem
++ a flag 
++ .BR U = UP
++@@ -119,7 +119,7 @@ configurada).
++ .SS "\-M, \-\-masquerade"
++ 
++ Uma lista de todas as sessões mascaradas também pode ser vista. Com a chave
++-.B -e 
+++.B \-e 
++ você pode incluir mais algumas informações sobre numeração sequencial e deltas
++ , causados por reescritas de dados em sessões FTP (comando PORT).
++ O suporte a mascaramento é usado para esconder máquinas em endereços de
++@@ -179,23 +179,23 @@ você o interrompa.
++ .SS "Proto" 
++ O protocolo (tcp, udp, raw) usado pelo socket.
++ 
++-.SS "Recv-Q"
+++.SS "Recv\-Q"
++ O contador de bytes não copiados pelo programa conectado a este socket.
++ 
++-.SS "Send-Q"
+++.SS "Send\-Q"
++ O contador de bytes não confirmados pela máquina remota.
++ 
++ .SS "Endereço Local" 
++ O endereço local (nome da máquina local) e o numero da porta do socket. A menos
++ que a chave
++-.B -n
+++.B \-n
++ seja especificada o endereço do socket será resolvido para seu nome de máquina
++ canônico e o número da porta será traduzido para o serviço correspondente.
++ 
++ .SS "Endereço Remoto"
++ O endereço remoto (nome da máquina remota) e o número da porta do socket. Como
++ com o endereço local, a chave
++-.B -n
+++.B \-n
++ desliga a resolução do nome da máquina e do serviço.
++ 
++ .SS "Estado"
++@@ -245,7 +245,7 @@ confirmação.
++ OUVINDO
++ O socket está ouvindo por conexões. Estes socket são somente mostrados se
++ a chave
++-.BR -a , --listening
+++.BR \-a , \-\-listening
++ for especificada.
++ .TP
++ .I
++@@ -329,7 +329,7 @@ Este socket não está alocado.
++ LISTENING
++ O socket está aguardando por uma solicitação de conexão. São mostrados
++ apenas se as opções
++-.BR -a , --listening
+++.BR \-a , \-\-listening
++ forem selecionadas.
++ .TP
++ .I
++@@ -372,7 +372,7 @@ Mostra o caminho (path) do processo do q
++ 
++ .PP
++ .SH NOTAS
++-Desde o kernel 2.2 o netstat -i não mostra estatísticas para apelidos (aliases)
+++Desde o kernel 2.2 o netstat \-i não mostra estatísticas para apelidos (aliases)
++ de interfaces. Para obter contadores por apelido de interface você precisa
++ configurar regras explícitas usando o comando
++ +.BR ipchains(8)
++@@ -447,20 +447,20 @@ Ocasionalmente informações estranhas pod
++ enquanto é visualizado. Isso é incomum.
++ .br
++ As opções descritas para
++-.B netstat -i
+++.B netstat \-i
++ foram descritas como deverão funcionar após alguma limpeza da liberação
++-BETA do pacote net-tools.
+++BETA do pacote net\-tools.
++ 
++ .PP
++ .SH AUTORES
++ A interface com o usuário foi escrita por Fred Baumgarten
++-<dc6iq@insu1.etec.uni-karlsruhe.de> a página do manual basicamente
+++<dc6iq@insu1.etec.uni\-karlsruhe.de> a página do manual basicamente
++ por Matt Welsh <mdw@tc.cornell.edu>. Foi atualizada por
++ Alan Cox <Alan.Cox@linux.org> mas poderia ter sido feita com um pouco
++ mais de trabalho.
++ .BR
++ .LP
++-A página do manual e os comandos incluídos no pacote net-tools
+++A página do manual e os comandos incluídos no pacote net\-tools
++ foram totalmente reescritos desde Bernd Eckenfels
++ <ecki@linux.de>.
++ .BR
++Index: net-tools/man/pt_BR/rarp.8
++===================================================================
++--- net-tools.orig/man/pt_BR/rarp.8
+++++ net-tools/man/pt_BR/rarp.8
++@@ -1,12 +1,12 @@
++-.TH RARP 8 "10 de fevereiro de 1996" "net-tools" "Manual do Programador Linux"
+++.TH RARP 8 "10 de fevereiro de 1996" "net\-tools" "Manual do Programador Linux"
++ .SH NOME
++ rarp \- manipula a tabela RARP do sistema
++ .SH SINOPSE
++-.B "rarp [-v] [-t tipo] -a [máquina]"
+++.B "rarp [\-v] [\-t tipo] \-a [máquina]"
++ .br
++-.B "rarp [-v] -d máquina ..."
+++.B "rarp [\-v] \-d máquina ..."
++ .br
++-.B "rarp [-v] [-t tipo] -s máquina endereço_hardware"
+++.B "rarp [\-v] [\-t tipo] \-s máquina endereço_hardware"
++ .SH DESCRIÇÃO
++ .B Rarp
++ manipula as tabelas RARP do kernel de varias formas. As opções principais
++Index: net-tools/man/pt_BR/route.8
++===================================================================
++--- net-tools.orig/man/pt_BR/route.8
+++++ net-tools/man/pt_BR/route.8
++@@ -1,4 +1,4 @@
++-.TH ROUTE 8 "27 Jan 1996" "net-tools" "Manual do Programador Linux"
+++.TH ROUTE 8 "2007-12-02" "net\-tools" "Manual do Programador Linux"
++ .SH NOME
++ route \- mostra / manipula a tabela de roteamento IP
++ .SH SINOPSE
++@@ -47,7 +47,7 @@ If]
++ .RB [ \-V ] 
++ .RB [ \-\-version ]
++ .RB [ \-h ]
++-.RB [ \--help ]
+++.RB [ \-\-help ]
++ .SH DESCRICAO
++ .B Route
++ manipula a tabela de roteamento IP do kernel. Seu principal uso é
++@@ -186,7 +186,7 @@ modificadores do route (metric - netmask
++ 
++ .SH EXEMPLOS
++ .TP
++-.B route add -net 127.0.0.0
+++.B route add \-net 127.0.0.0
++ Adiciona a entrada para a interface loopback normal, usando mascara igual
++ a 255.0.0.0 (rede classe A, determinada a partir do endereço de destino),
++ associada ao dispositivo "lo" (assumindo que este dispositivo tenha sido
++@@ -194,17 +194,17 @@ previamente configurado com o
++ .BR ifconfig (8)). 
++ 
++ .TP 
++-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
+++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0
++ Adiciona uma rota para a rede 192.56.76.x através da interface "eth0". O 
++ modificador de mascara classe C não é realmente necessário aqui por que
++ 192.* é um endereço IP de classe C. A palavra "dev" pode ser omitida aqui.
++ 
++ .TP
++-.B route add default gw mango-gw
+++.B route add default gw mango\-gw
++ Adiciona uma rota default (que será usada se nenhuma outra rota for encontrada).
++-Todos os pacotes que usarem esta rota serão passados para a máquina "mango-gw".
+++Todos os pacotes que usarem esta rota serão passados para a máquina "mango\-gw".
++ O dispositivo que será utilizado para esta rota depende de como é possível
++-alcançar "mango-gw" - a rota estática para "mango-gw" terá que ser configurada
+++alcançar "mango\-gw" - a rota estática para "mango\-gw" terá que ser configurada
++ previamente.
++ 
++ .TP
++@@ -213,12 +213,12 @@ Adiciona uma rota para a máquina "ipx4" 
++ que "ipx4" é a máquina SLIP).
++ 
++ .TP
++-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
+++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4
++ Este comando adiciona a rede "192.57.66.x" para ser alcançada através da
++ rota anterior através da interface SLIP.
++ 
++ .TP
++-.B route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0
+++.B route add \-net 224.0.0.0 netmask 240.0.0.0 dev eth0
++ Isto é bem obscura, documentada para que as pessoas saibam como usá-la. 
++ Configura para que todas as rotas IP classe D (multicast) vão através da
++ interface "eth0". Esta é a linha de configuração normal a ser usada com
++@@ -239,8 +239,8 @@ A rede ou máquina de destino.
++ A máquina roteador ou '*' se nenhuma estiver configurada.
++ .TP
++ .B Mascara Genérica
++-A mascara para a rede destino. '255.255.255.255' para uma máquina de destino,
++-'0.0.0.0' para a rota
+++A mascara para a rede destino. '255.255.255.255' para uma máquina de
+++destino, '0.0.0.0' para a rota
++ .B default
++ .
++ .TP
++@@ -321,7 +321,7 @@ para o linux foi originalmente escrito p
++ Linus Torvalds para a versão pl15. Alan Cox adicionou as opções para
++ mss e window no kernel 1.1.22. O suporte a irtt (compartilhado com o
++ netstat) foi feito por Bernd Eckenfels.
+++.SH AUTHOR
+++Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>.
++ .SH TRADUÇÃO
++ Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 13/04/1998
++-.SH BUGS
++-nenhum :)
+--- net-tools-1.60.orig/debian/patches/CVS-20020730-route.c_opts_64.patch
++++ net-tools-1.60/debian/patches/CVS-20020730-route.c_opts_64.patch
+@@ -0,0 +1,39 @@
++Add support for -6 & -4 flags to route.c
++From upstream CVS
++Index: net-tools/route.c
++===================================================================
++--- net-tools.orig/route.c
+++++ net-tools/route.c
++@@ -2,7 +2,7 @@
++  * route        This file contains an implementation of the command
++  *              that manages the IP routing table in the kernel.
++  *
++- * Version:     $Id: route.c,v 1.9 2001/04/15 14:41:17 pb Exp $
+++ * Version:     $Id: route.c,v 1.10 2002/07/30 05:24:20 ecki Exp $
++  *
++  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
++  *
++@@ -142,7 +142,7 @@ int main(int argc, char **argv)
++     }
++ 
++     /* Fetch the command-line arguments. */
++-    while ((i = getopt_long(argc, argv, "A:eCFhnNVv?", longopts, &lop)) != EOF)
+++    while ((i = getopt_long(argc, argv, "A:eCFhnN64Vv?", longopts, &lop)) != EOF)
++ 	switch (i) {
++ 	case -1:
++ 	    break;
++@@ -176,6 +176,14 @@ int main(int argc, char **argv)
++ 	    if ((i = aftrans_opt(optarg)))
++ 		exit(i);
++ 	    break;
+++	case '6':
+++	    if ((i = aftrans_opt("inet6")))
+++		exit(i);
+++	    break;
+++	case '4':
+++	    if ((i = aftrans_opt("inet")))
+++		exit(i);
+++	    break;
++ 	case 'V':
++ 	    version();
++ 	case 'h':
+--- net-tools-1.60.orig/debian/patches/CVS-lib_sync.patch
++++ net-tools-1.60/debian/patches/CVS-lib_sync.patch
+@@ -0,0 +1,1873 @@
++Sync with upstream CVS, for most files in lib/
++
++Index: net-tools/lib/Makefile
++===================================================================
++--- net-tools.orig/lib/Makefile
+++++ net-tools/lib/Makefile
++@@ -16,7 +16,7 @@
++ #
++ 
++ 
++-HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o
+++HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o eui64.o ib.o
++ AFOBJS	 = unix.o inet.o inet6.o ax25.o ipx.o ddp.o ipx.o netrom.o af.o rose.o econet.o x25.o
++ AFGROBJS = inet_gr.o inet6_gr.o ipx_gr.o ddp_gr.o netrom_gr.o ax25_gr.o rose_gr.o getroute.o x25_gr.o
++ AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o x25_sr.o
++Index: net-tools/lib/ddp_gr.c
++===================================================================
++--- net-tools.orig/lib/ddp_gr.c
+++++ net-tools/lib/ddp_gr.c
++@@ -1,3 +1,20 @@
+++/*
+++ * lib/ddp_gr.c         Prinbting of DDP (AppleTalk) routing table
+++ *                      used by the NET-LIB.
+++ *
+++ * NET-LIB      
+++ *
+++ * Version:     $Id: ddp_gr.c,v 1.4 2002/06/02 05:25:15 ecki Exp $
+++ *
+++ * Author:      Ajax <ajax@firest0rm.org>
+++ *
+++ * Modification:
+++ *  2002-06-02 integrated into main source by Bernd Eckenfels
+++ *
+++ */
+++
+++/* TODO: name lookups (/etc/atalk.names?  NBP?) */
+++
++ #include "config.h"
++ 
++ #if HAVE_AFATALK
++@@ -16,9 +33,61 @@
++ #include "pathnames.h"
++ #include "intl.h"
++ 
+++/* stolen from inet_gr.c */
+++#define flags_decode(i,o) do {                  \
+++        o[0] = '\0';                            \
+++        if (i & RTF_UP) strcat(o, "U");         \
+++        if (i & RTF_GATEWAY) strcat(o, "G");    \
+++        if (i & RTF_REJECT) strcat(o, "!");     \
+++        if (i & RTF_HOST) strcat(o, "H");       \
+++        if (i & RTF_REINSTATE) strcat(o, "R");  \
+++        if (i & RTF_DYNAMIC) strcat(o, "D");    \
+++        if (i & RTF_MODIFIED) strcat(o, "M");   \
+++        if (i & RTF_DEFAULT) strcat(o, "d");    \
+++        if (i & RTF_ALLONLINK) strcat(o, "a");  \
+++        if (i & RTF_ADDRCONF) strcat(o, "c");   \
+++        if (i & RTF_NONEXTHOP) strcat(o, "o");  \
+++        if (i & RTF_EXPIRES) strcat(o, "e");    \
+++        if (i & RTF_CACHE) strcat(o, "c");      \
+++        if (i & RTF_FLOW) strcat(o, "f");       \
+++        if (i & RTF_POLICY) strcat(o, "p");     \
+++        if (i & RTF_LOCAL) strcat(o, "l");      \
+++        if (i & RTF_MTU) strcat(o, "u");        \
+++        if (i & RTF_WINDOW) strcat(o, "w");     \
+++        if (i & RTF_IRTT) strcat(o, "i");       \
+++        if (i & RTF_NOTCACHED) strcat(o, "n");  \
+++    } while (0)
+++
++ int DDP_rprint(int options)
++ {
++-    fprintf(stderr, _("Routing table for `ddp' not yet supported.\n"));
++-    return (1);
+++    FILE *fp;
+++    char *dest, *gw, *dev, *flags;
+++    char oflags[32];
+++    char *hdr = "Destination     Gateway         Device          Flags";
+++
+++    fp = fopen(_PATH_PROCNET_ATALK_ROUTE, "r");
+++
+++    if (!fp) {
+++        perror("Error opening " _PATH_PROCNET_ATALK_ROUTE);
+++        fprintf(stderr, "DDP (AppleTalk) not configured on this system.\n");
+++        return 1;
+++    }
+++
+++    fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev);
+++    free(dest); free(gw); free(dev); free(flags);
+++
+++    printf("%s\n", hdr);
+++
+++    while (fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev) == 4) {
+++        int iflags = atoi(flags);
+++        flags_decode(iflags, oflags);
+++        printf("%-16s%-16s%-16s%-s\n", dest, gw, dev, oflags);
+++        free(dest); free(gw); free(dev); free(flags);
+++    }
+++
+++    fclose(fp);
+++    
+++    return 0;
+++
++ }
++ #endif
++Index: net-tools/lib/ether.c
++===================================================================
++--- net-tools.orig/lib/ether.c
+++++ net-tools/lib/ether.c
++@@ -2,7 +2,7 @@
++  * lib/ether.c        This file contains an implementation of the "Ethernet"
++  *              support functions.
++  *
++- * Version:     $Id: ether.c,v 1.7 1999/09/27 11:00:47 philip Exp $
+++ * Version:     $Id: ether.c,v 1.8 2002/07/30 05:17:29 ecki Exp $
++  *
++  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++  *              Copyright 1993 MicroWalt Corporation
++@@ -39,7 +39,7 @@ static char *pr_ether(unsigned char *ptr
++ {
++     static char buff[64];
++ 
++-    snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X",
+++    snprintf(buff, sizeof(buff), "%02x:%02x:%02x:%02x:%02x:%02x",
++ 	     (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
++ 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
++ 	);
++Index: net-tools/lib/hw.c
++===================================================================
++--- net-tools.orig/lib/hw.c
+++++ net-tools/lib/hw.c
++@@ -2,7 +2,7 @@
++  * lib/hw.c   This file contains the top-level part of the hardware
++  *              support functions module.
++  *
++- * Version:     $Id: hw.c,v 1.17 2000/05/20 13:38:10 pb Exp $
+++ * Version:     $Id: hw.c,v 1.19 2008/10/03 01:52:04 ecki Exp $
++  *
++  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
++  *
++@@ -73,6 +73,10 @@ extern struct hwtype irda_hwtype;
++ 
++ extern struct hwtype ec_hwtype;
++ 
+++extern struct hwtype ib_hwtype;
+++
+++extern struct hwtype eui64_hwtype;
+++
++ static struct hwtype *hwtypes[] =
++ {
++ 
++@@ -144,6 +148,12 @@ static struct hwtype *hwtypes[] =
++ #if HAVE_HWX25
++     &x25_hwtype,
++ #endif
+++#if HAVE_HWIB
+++    &ib_hwtype,
+++#endif
+++#if HAVE_HWEUI64
+++    &eui64_hwtype,
+++#endif
++     &unspec_hwtype,
++     NULL
++ };
++@@ -217,6 +227,12 @@ void hwinit()
++ #if HAVE_HWEC
++     ec_hwtype.title = _("Econet");
++ #endif
+++#if HAVE_HWIB
+++    ib_hwtype.title = _("InfiniBand");
+++#endif
+++#if HAVE_HWEUI64
+++    eui64_hwtype.title = _("Generic EUI-64");
+++#endif
++     sVhwinit = 1;
++ }
++ 
++Index: net-tools/lib/inet.c
++===================================================================
++--- net-tools.orig/lib/inet.c
+++++ net-tools/lib/inet.c
++@@ -3,7 +3,7 @@
++  *              support functions for the net-tools.
++  *              (NET-3 base distribution).
++  *
++- * Version:    $Id: inet.c,v 1.13 1999/12/11 13:35:56 freitag Exp $
+++ * Version:    $Id: inet.c,v 1.14 2003/10/19 11:57:37 pb Exp $
++  *
++  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++  *              Copyright 1993 MicroWalt Corporation
++@@ -144,7 +144,7 @@ static int INET_rresolve(char *name, siz
++     struct hostent *ent;
++     struct netent *np;
++     struct addr *pn;
++-    unsigned long ad, host_ad;
+++    u_int32_t ad, host_ad;
++     int host = 0;
++ 
++     /* Grmpf. -FvK */
++@@ -155,7 +155,7 @@ static int INET_rresolve(char *name, siz
++ 	errno = EAFNOSUPPORT;
++ 	return (-1);
++     }
++-    ad = (unsigned long) sin->sin_addr.s_addr;
+++    ad = sin->sin_addr.s_addr;
++ #ifdef DEBUG
++     fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x \n", ad, netmask, numeric);
++ #endif
++Index: net-tools/lib/inet6.c
++===================================================================
++--- net-tools.orig/lib/inet6.c
+++++ net-tools/lib/inet6.c
++@@ -3,7 +3,7 @@
++  *              support functions for the net-tools.
++  *              (most of it copied from lib/inet.c 1.26).
++  *
++- * Version:     $Id: inet6.c,v 1.10 2000/10/28 11:04:00 pb Exp $
+++ * Version:     $Id: inet6.c,v 1.12 2002/12/10 01:03:09 ecki Exp $
++  *
++  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++  *              Copyright 1993 MicroWalt Corporation
++@@ -44,6 +44,21 @@
++ 
++ extern int h_errno;		/* some netdb.h versions don't export this */
++ 
+++char * fix_v4_address(char *buf, struct in6_addr *in6) 
+++{ 
+++	if (IN6_IS_ADDR_V4MAPPED(in6->s6_addr)) { 
+++			char *s =strchr(buf, '.'); 
+++			if (s) { 
+++				while (s > buf && *s != ':')
+++					--s;
+++				if (*s == ':') ++s; 	
+++				else s = NULL; 
+++			} 	
+++			if (s) return s;
+++	} 
+++	return buf; 
+++} 
+++
++ static int INET6_resolve(char *name, struct sockaddr_in6 *sin6)
++ {
++     struct addrinfo req, *ai;
++@@ -83,14 +98,14 @@ static int INET6_rresolve(char *name, st
++ 	return (-1);
++     }
++     if (numeric & 0x7FFF) {
++-	inet_ntop(AF_INET6, &sin6->sin6_addr, name, 80);
+++	inet_ntop( AF_INET6, &sin6->sin6_addr, name, 80);
++ 	return (0);
++     }
++     if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
++         if (numeric & 0x8000)
++ 	    strcpy(name, "default");
++ 	else
++-	    strcpy(name, "*");
+++	    strcpy(name, "[::]");
++ 	return (0);
++     }
++ 
++@@ -109,13 +124,14 @@ static void INET6_reserror(char *text)
++ }
++ 
++ 
+++
++ /* Display an Internet socket address. */
++ static char *INET6_print(unsigned char *ptr)
++ {
++     static char name[80];
++ 
++     inet_ntop(AF_INET6, (struct in6_addr *) ptr, name, 80);
++-    return name;
+++	return fix_v4_address(name, (struct in6_addr *)ptr);
++ }
++ 
++ 
++@@ -129,13 +145,14 @@ static char *INET6_sprint(struct sockadd
++ 	return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff));
++     if (INET6_rresolve(buff, (struct sockaddr_in6 *) sap, numeric) != 0)
++ 	return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff));
++-    return (buff);
+++    return (fix_v4_address(buff, &((struct sockaddr_in6 *)sap)->sin6_addr));
++ }
++ 
++ 
++ static int INET6_getsock(char *bufp, struct sockaddr *sap)
++ {
++     struct sockaddr_in6 *sin6;
+++	char *p;
++ 
++     sin6 = (struct sockaddr_in6 *) sap;
++     sin6->sin6_family = AF_INET6;
++@@ -143,7 +160,9 @@ static int INET6_getsock(char *bufp, str
++ 
++     if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0)
++ 	return (-1);
++-
+++	p = fix_v4_address(bufp, &sin6->sin6_addr);
+++	if (p != bufp) 
+++		memcpy(bufp, p, strlen(p)+1); 
++     return 16;			/* ?;) */
++ }
++ 
++Index: net-tools/lib/inet6_gr.c
++===================================================================
++--- net-tools.orig/lib/inet6_gr.c
+++++ net-tools/lib/inet6_gr.c
++@@ -1,4 +1,4 @@
++-/*
+++ /*
++    Modifications:
++    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets,
++    snprintf instead of sprintf
++@@ -71,11 +71,15 @@ int rprint_fib6(int ext, int numeric)
++         printf(_("INET6 (IPv6) not configured in this system.\n"));
++ 	return 1;
++     }
++-    printf(_("Kernel IPv6 routing table\n"));
++ 
++-    printf(_("Destination                                 "
++-	     "Next Hop                                "
++-	     "Flags Metric Ref    Use Iface\n"));
+++    if (numeric & RTF_CACHE)
+++    	printf(_("Kernel IPv6 routing cache\n"));
+++    else
+++    	printf(_("Kernel IPv6 routing table\n"));
+++
+++    printf(_("Destination                    "
+++	     "Next Hop                   "
+++	     "Flag Met Ref Use If\n"));
++ 
++     while (fgets(buff, 1023, fp)) {
++ 	num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %s\n",
++@@ -87,13 +91,19 @@ int rprint_fib6(int ext, int numeric)
++ 		     &slen,
++ 		     naddr6p[0], naddr6p[1], naddr6p[2], naddr6p[3],
++ 		     naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7],
++-		     &metric, &use, &refcnt, &iflags, iface);
+++		     &metric, &refcnt, &use, &iflags, iface);
++ #if 0
++ 	if (num < 23)
++ 	    continue;
++ #endif
++-	if (!(iflags & RTF_UP))
++-	    continue;
+++	if (iflags & RTF_CACHE) {
+++		if (!(numeric & RTF_CACHE))
+++			continue;
+++	} else {
+++		if (numeric & RTF_CACHE)
+++			continue;
+++	}
+++			
++ 	/* Fetch and resolve the target address. */
++ 	snprintf(addr6, sizeof(addr6), "%s:%s:%s:%s:%s:%s:%s:%s",
++ 		 addr6p[0], addr6p[1], addr6p[2], addr6p[3],
++@@ -112,7 +122,12 @@ int rprint_fib6(int ext, int numeric)
++ 		 inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1));
++ 
++ 	/* Decode the flags. */
++-	strcpy(flags, "U");
+++
+++	flags[0]=0;
+++	if (iflags & RTF_UP)
+++	    strcat(flags, "U");
+++	if (iflags & RTF_REJECT)
+++	    strcat(flags, "!");
++ 	if (iflags & RTF_GATEWAY)
++ 	    strcat(flags, "G");
++ 	if (iflags & RTF_HOST)
++@@ -123,9 +138,19 @@ int rprint_fib6(int ext, int numeric)
++ 	    strcat(flags, "A");
++ 	if (iflags & RTF_CACHE)
++ 	    strcat(flags, "C");
+++	if (iflags & RTF_ALLONLINK)
+++	    strcat(flags, "a");
+++	if (iflags & RTF_EXPIRES)
+++	    strcat(flags, "e");
+++	if (iflags & RTF_MODIFIED)
+++	    strcat(flags, "m");
+++	if (iflags & RTF_NONEXTHOP)
+++	    strcat(flags, "n");
+++	if (iflags & RTF_FLOW)
+++	    strcat(flags, "f");
++ 
++ 	/* Print the info. */
++-	printf("%-43s %-39s %-5s %-6d %-2d %7d %-8s\n",
+++	printf("%-30s %-26s %-4s %-3d %-1d%6d %s\n",
++ 	       addr6, naddr6, flags, metric, refcnt, use, iface);
++     }
++ 
++@@ -144,8 +169,7 @@ int rprint_cache6(int ext, int numeric)
++     char addr6p[8][5], haddrp[6][3];
++ 
++     if (!fp) {
++-	ESYSNOT("nd_print", "ND Table");
++-	return 1;
+++	return rprint_fib6(ext, numeric | RTF_CACHE);
++     }
++     printf(_("Kernel IPv6 Neighbour Cache\n"));
++ 
++Index: net-tools/lib/inet_sr.c
++===================================================================
++--- net-tools.orig/lib/inet_sr.c
+++++ net-tools/lib/inet_sr.c
++@@ -3,6 +3,7 @@
++    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets
++    1999-10-07 - Kurt Garloff		 - for -host and gws: prefer host names
++ 						over networks (or even reject)
+++   2003-10-11 - Maik Broemme		 - gcc 3.x warnign fixes (default: break;)
++  */
++ 
++ #include "config.h"
++@@ -104,7 +105,6 @@ static int INET_setroute(int action, int
++        isnet = 1; break;
++     case 2:
++        isnet = 0; break;
++-    default:
++     }
++ 
++     /* Fill in the other fields. */
++Index: net-tools/lib/interface.c
++===================================================================
++--- net-tools.orig/lib/interface.c
+++++ net-tools/lib/interface.c
++@@ -7,7 +7,7 @@
++    8/2000  Andi Kleen make the list operations a bit more efficient.
++    People are crazy enough to use thousands of aliases now.
++ 
++-   $Id: interface.c,v 1.14 2001/02/10 19:31:15 pb Exp $
+++   $Id: interface.c,v 1.30 2005/08/23 22:46:51 ecki Exp $
++  */
++ 
++ #include "config.h"
++@@ -23,6 +23,7 @@
++ #include <string.h>
++ #include <unistd.h>
++ #include <ctype.h>
+++#include <string.h>
++ 
++ #if HAVE_AFIPX
++ #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
++@@ -87,14 +88,20 @@ int procnetdev_vsn = 1;
++ 
++ int ife_short;
++ 
+++int if_list_all = 0;	/* do we have requested the complete proc list, yet? */
+++
++ static struct interface *int_list, *int_last;
++ 
++ static int if_readlist_proc(char *);
++ 
++-static struct interface *add_interface(char *name)
+++static struct interface *if_cache_add(char *name)
++ {
++     struct interface *ife, **nextp, *new;
++ 
+++    if (!int_list)
+++    	int_last = NULL;
+++
+++    /* the cache is sorted, so if we hit a smaller if, exit */
++     for (ife = int_last; ife; ife = ife->prev) {
++ 	    int n = nstrcmp(ife->name, name); 
++ 	    if (n == 0) 
++@@ -104,7 +111,7 @@ static struct interface *add_interface(c
++     }
++     new(new); 
++     safe_strncpy(new->name, name, IFNAMSIZ); 
++-    nextp = ife ? &ife->next : &int_list;
+++    nextp = ife ? &ife->next : &int_list; // keep sorting
++     new->prev = ife;
++     new->next = *nextp; 
++     if (new->next) 
++@@ -117,19 +124,22 @@ static struct interface *add_interface(c
++ 
++ struct interface *lookup_interface(char *name)
++ {
++-    struct interface *ife = NULL;
++-
++-    if (if_readlist_proc(name) < 0) 
++-	    return NULL; 
++-    ife = add_interface(name); 
++-    return ife;
+++   /* if we have read all, use it */
+++   if (if_list_all)
+++   	return if_cache_add(name);
+++
+++   /* otherwise we read a limited list */
+++   if (if_readlist_proc(name) < 0)
+++   	return NULL;
+++ 
+++   return if_cache_add(name);
++ }
++ 
++ int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie)
++ {
++     struct interface *ife;
++ 
++-    if (!int_list && (if_readlist() < 0))
+++    if (!if_list_all && (if_readlist() < 0))
++ 	return -1;
++     for (ife = int_list; ife; ife = ife->next) {
++ 	int err = doit(ife, cookie);
++@@ -139,13 +149,15 @@ int for_all_interfaces(int (*doit) (stru
++     return 0;
++ }
++ 
++-int free_interface_list(void)
+++int if_cache_free(void)
++ {
++     struct interface *ife;
++     while ((ife = int_list) != NULL) {
++ 	int_list = ife->next;
++ 	free(ife);
++     }
+++    int_last = NULL;
+++    if_list_all = 0;
++     return 0;
++ }
++ 
++@@ -180,7 +192,7 @@ static int if_readconf(void)
++ 	}
++ 	if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) {
++ 	    /* assume it overflowed and try again */
++-	    numreqs += 10;
+++	    numreqs *= 2;
++ 	    continue;
++ 	}
++ 	break;
++@@ -188,7 +200,7 @@ static int if_readconf(void)
++ 
++     ifr = ifc.ifc_req;
++     for (n = 0; n < ifc.ifc_len; n += sizeof(struct ifreq)) {
++-	add_interface(ifr->ifr_name);
+++	if_cache_add(ifr->ifr_name);
++ 	ifr++;
++     }
++     err = 0;
++@@ -198,7 +210,7 @@ out:
++     return err;
++ }
++ 
++-static char *get_name(char *name, char *p)
+++char *get_name(char *name, char *p)
++ {
++     while (isspace(*p))
++ 	p++;
++@@ -206,16 +218,19 @@ static char *get_name(char *name, char *
++ 	if (isspace(*p))
++ 	    break;
++ 	if (*p == ':') {	/* could be an alias */
++-	    char *dot = p, *dotname = name;
++-	    *name++ = *p++;
++-	    while (isdigit(*p))
++-		*name++ = *p++;
++-	    if (*p != ':') {	/* it wasn't, backup */
++-		p = dot;
++-		name = dotname;
+++		char *dot = p++;
+++ 		while (*p && isdigit(*p)) p++;
+++		if (*p == ':') {
+++			/* Yes it is, backup and copy it. */
+++			p = dot;
+++			*name++ = *p++;
+++			while (*p && isdigit(*p)) {
+++				*name++ = *p++;
+++			}
+++		} else {
+++			/* No, it isn't */
+++			p = dot;
++ 	    }
++-	    if (*p == '\0')
++-		return NULL;
++ 	    p++;
++ 	    break;
++ 	}
++@@ -225,7 +240,7 @@ static char *get_name(char *name, char *
++     return p;
++ }
++ 
++-static int procnetdev_version(char *buf)
+++int procnetdev_version(char *buf)
++ {
++     if (strstr(buf, "compressed"))
++ 	return 3;
++@@ -234,12 +249,12 @@ static int procnetdev_version(char *buf)
++     return 1;
++ }
++ 
++-static int get_dev_fields(char *bp, struct interface *ife)
+++int get_dev_fields(char *bp, struct interface *ife)
++ {
++     switch (procnetdev_vsn) {
++     case 3:
++ 	sscanf(bp,
++-	"%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu",
+++	"%Lu %Lu %lu %lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu %lu",
++ 	       &ife->stats.rx_bytes,
++ 	       &ife->stats.rx_packets,
++ 	       &ife->stats.rx_errors,
++@@ -259,7 +274,7 @@ static int get_dev_fields(char *bp, stru
++ 	       &ife->stats.tx_compressed);
++ 	break;
++     case 2:
++-	sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu",
+++	sscanf(bp, "%Lu %Lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu",
++ 	       &ife->stats.rx_bytes,
++ 	       &ife->stats.rx_packets,
++ 	       &ife->stats.rx_errors,
++@@ -277,7 +292,7 @@ static int get_dev_fields(char *bp, stru
++ 	ife->stats.rx_multicast = 0;
++ 	break;
++     case 1:
++-	sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu",
+++	sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu",
++ 	       &ife->stats.rx_packets,
++ 	       &ife->stats.rx_errors,
++ 	       &ife->stats.rx_dropped,
++@@ -300,22 +315,16 @@ static int get_dev_fields(char *bp, stru
++ 
++ static int if_readlist_proc(char *target)
++ {
++-    static int proc_read; 
++     FILE *fh;
++     char buf[512];
++     struct interface *ife;
++     int err;
++ 
++-    if (proc_read) 
++-	    return 0; 
++-    if (!target) 
++-	    proc_read = 1;
++-
++     fh = fopen(_PATH_PROCNET_DEV, "r");
++     if (!fh) {
++ 		fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"),
++ 			_PATH_PROCNET_DEV, strerror(errno)); 
++-		return if_readconf();
+++		return -2;
++ 	}	
++     fgets(buf, sizeof buf, fh);	/* eat line */
++     fgets(buf, sizeof buf, fh);
++@@ -350,7 +359,7 @@ static int if_readlist_proc(char *target
++     while (fgets(buf, sizeof buf, fh)) {
++ 	char *s, name[IFNAMSIZ];
++ 	s = get_name(name, buf);    
++-	ife = add_interface(name);
+++	ife = if_cache_add(name);
++ 	get_dev_fields(s, ife);
++ 	ife->statistics_valid = 1;
++ 	if (target && !strcmp(target,name))
++@@ -359,7 +368,6 @@ static int if_readlist_proc(char *target
++     if (ferror(fh)) {
++ 	perror(_PATH_PROCNET_DEV);
++ 	err = -1;
++-	proc_read = 0; 
++     }
++ 
++ #if 0
++@@ -371,9 +379,16 @@ static int if_readlist_proc(char *target
++ 
++ int if_readlist(void) 
++ { 
++-    int err = if_readlist_proc(NULL); 
++-    if (!err)
++-	    err = if_readconf();
+++    /* caller will/should check not to call this too often 
+++     *   (i.e. only if if_list_all == 0 
+++     */
+++    int err = 0;
+++
+++    err |= if_readlist_proc(NULL); 
+++    err |= if_readconf();
+++
+++    if_list_all = 1;
+++
++     return err;
++ } 
++ 
++@@ -580,10 +595,10 @@ int do_if_print(struct interface *ife, v
++ void ife_print_short(struct interface *ptr)
++ {
++     printf("%-5.5s ", ptr->name);
++-    printf("%5d %3d", ptr->mtu, ptr->metric);
+++    printf("%5d %-2d ", ptr->mtu, ptr->metric);
++     /* If needed, display the interface statistics. */
++     if (ptr->statistics_valid) {
++-	printf("%8llu %6lu %6lu %6lu",
+++	printf("%8llu %6lu %6lu %-6lu ",
++ 	       ptr->stats.rx_packets, ptr->stats.rx_errors,
++ 	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors);
++ 	printf("%8llu %6lu %6lu %6lu ",
++@@ -636,9 +651,10 @@ void ife_print_long(struct interface *pt
++     int hf;
++     int can_compress = 0;
++     unsigned long long rx, tx, short_rx, short_tx;
++-    char Rext[5]="b";
++-    char Text[5]="b";
++-
+++    const char *Rext = "B";
+++    const char *Text = "B";
+++    static char flags[200];
+++    
++ #if HAVE_AFIPX
++     static struct aftype *ipxtype = NULL;
++ #endif
++@@ -670,32 +686,70 @@ void ife_print_long(struct interface *pt
++     if (hw == NULL)
++ 	hw = get_hwntype(-1);
++ 
++-    printf(_("%-9.9s Link encap:%s  "), ptr->name, hw->title);
++-    /* For some hardware types (eg Ash, ATM) we don't print the 
++-       hardware address if it's null.  */
++-    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
++-				  hw->suppress_null_addr)))
++-	printf(_("HWaddr %s  "), hw->print(ptr->hwaddr));
++-#ifdef IFF_PORTSEL
++-    if (ptr->flags & IFF_PORTSEL) {
++-	printf(_("Media:%s"), if_port_text[ptr->map.port][0]);
++-	if (ptr->flags & IFF_AUTOMEDIA)
++-	    printf(_("(auto)"));
++-    }
+++    sprintf(flags, "flags=%d<", ptr->flags);
+++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
+++    if (ptr->flags == 0)
+++	strcat(flags,">");
+++    if (ptr->flags & IFF_UP)
+++	strcat(flags,_("UP,"));
+++    if (ptr->flags & IFF_BROADCAST)
+++	strcat(flags,_("BROADCAST,"));
+++    if (ptr->flags & IFF_DEBUG)
+++	strcat(flags,_("DEBUG,"));
+++    if (ptr->flags & IFF_LOOPBACK)
+++	strcat(flags,_("LOOPBACK,"));
+++    if (ptr->flags & IFF_POINTOPOINT)
+++	strcat(flags,_("POINTOPOINT,"));
+++    if (ptr->flags & IFF_NOTRAILERS)
+++	strcat(flags,_("NOTRAILERS,"));
+++    if (ptr->flags & IFF_RUNNING)
+++	strcat(flags,_("RUNNING,"));
+++    if (ptr->flags & IFF_NOARP)
+++	strcat(flags,_("NOARP,"));
+++    if (ptr->flags & IFF_PROMISC)
+++	strcat(flags,_("PROMISC,"));
+++    if (ptr->flags & IFF_ALLMULTI)
+++	strcat(flags,_("ALLMULTI,"));
+++    if (ptr->flags & IFF_SLAVE)
+++	strcat(flags,_("SLAVE,"));
+++    if (ptr->flags & IFF_MASTER)
+++	strcat(flags,_("MASTER,"));
+++    if (ptr->flags & IFF_MULTICAST)
+++	strcat(flags,_("MULTICAST,"));
+++#ifdef HAVE_DYNAMIC
+++    if (ptr->flags & IFF_DYNAMIC)
+++	strcat(flags,_("DYNAMIC,"));
+++#endif
+++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
+++    if (flags[strlen(flags)-1] == ',')
+++      flags[strlen(flags)-1] = '>';
+++    else
+++      flags[strlen(flags)-1] = 0;
+++      
+++
+++    printf(_("%s: %s  mtu %d  metric %d"),
+++	   ptr->name, flags, ptr->mtu, ptr->metric ? ptr->metric : 1);
+++#ifdef SIOCSKEEPALIVE
+++    if (ptr->outfill || ptr->keepalive)
+++	printf(_("  outfill %d  keepalive %d"),
+++	       ptr->outfill, ptr->keepalive);
++ #endif
++     printf("\n");
++ 
+++
+++
++ #if HAVE_AFINET
++     if (ptr->has_ip) {
++-	printf(_("          %s addr:%s "), ap->name,
+++	printf(_("        %s %s"), ap->name,
++ 	       ap->sprint(&ptr->addr, 1));
++-	if (ptr->flags & IFF_POINTOPOINT) {
++-	    printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1));
++-	}
+++	printf(_("  netmask %s"), ap->sprint(&ptr->netmask, 1));
++ 	if (ptr->flags & IFF_BROADCAST) {
++-	    printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1));
+++	    printf(_("  broadcast %s"), ap->sprint(&ptr->broadaddr, 1));
+++	}
+++	if (ptr->flags & IFF_POINTOPOINT) {
+++	    printf(_("  destination %s"), ap->sprint(&ptr->dstaddr, 1));
++ 	}
++-	printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1));
+++	printf("\n");
++     }
++ #endif
++ 
++@@ -712,29 +766,30 @@ void ife_print_long(struct interface *pt
++ 			addr6p[0], addr6p[1], addr6p[2], addr6p[3],
++ 			addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
++ 		inet6_aftype.input(1, addr6, (struct sockaddr *) &sap);
++-		printf(_("          inet6 addr: %s/%d"),
++-		 inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen);
++-		printf(_(" Scope:"));
++-		switch (scope) {
++-		case 0:
++-		    printf(_("Global"));
++-		    break;
++-		case IPV6_ADDR_LINKLOCAL:
++-		    printf(_("Link"));
++-		    break;
++-		case IPV6_ADDR_SITELOCAL:
++-		    printf(_("Site"));
++-		    break;
++-		case IPV6_ADDR_COMPATv4:
++-		    printf(_("Compat"));
++-		    break;
++-		case IPV6_ADDR_LOOPBACK:
++-		    printf(_("Host"));
++-		    break;
++-		default:
++-		    printf(_("Unknown"));
+++		printf(_("        %s %s  prefixlen %d"),
+++			inet6_aftype.name, 
+++			inet6_aftype.sprint((struct sockaddr *) &sap, 1), 
+++			plen);
+++		printf(_("  scopeid 0x%x"), scope);
+++
+++		flags[0] = '<'; flags[1] = 0;
+++		if (scope & IPV6_ADDR_COMPATv4) {
+++		    	strcat(flags, _("compat,"));
+++		    	scope -= IPV6_ADDR_COMPATv4;
++ 		}
++-		printf("\n");
+++		if (scope == 0)
+++			strcat(flags, _("global,"));
+++		if (scope & IPV6_ADDR_LINKLOCAL)
+++			strcat(flags, _("link,"));
+++		if (scope & IPV6_ADDR_SITELOCAL)
+++			strcat(flags, _("site,"));
+++		if (scope & IPV6_ADDR_LOOPBACK)
+++			strcat(flags, _("host,"));
+++		if (flags[strlen(flags)-1] == ',')
+++			flags[strlen(flags)-1] = '>';
+++		else
+++			flags[strlen(flags)-1] = 0;
+++		printf("%s\n", flags);
++ 	    }
++ 	}
++ 	fclose(f);
++@@ -747,17 +802,17 @@ void ife_print_long(struct interface *pt
++ 
++     if (ipxtype != NULL) {
++ 	if (ptr->has_ipx_bb)
++-	    printf(_("          IPX/Ethernet II addr:%s\n"),
++-		   ipxtype->sprint(&ptr->ipxaddr_bb, 1));
+++	    printf(_("        %s Ethernet-II   %s\n"),
+++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1));
++ 	if (ptr->has_ipx_sn)
++-	    printf(_("          IPX/Ethernet SNAP addr:%s\n"),
++-		   ipxtype->sprint(&ptr->ipxaddr_sn, 1));
+++	    printf(_("        %s Ethernet-SNAP %s\n"),
+++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1));
++ 	if (ptr->has_ipx_e2)
++-	    printf(_("          IPX/Ethernet 802.2 addr:%s\n"),
++-		   ipxtype->sprint(&ptr->ipxaddr_e2, 1));
+++	    printf(_("        %s Ethernet802.2 %s\n"),
+++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1));
++ 	if (ptr->has_ipx_e3)
++-	    printf(_("          IPX/Ethernet 802.3 addr:%s\n"),
++-		   ipxtype->sprint(&ptr->ipxaddr_e3, 1));
+++	    printf(_("        %s Ethernet802.3 %s\n"),
+++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1));
++     }
++ #endif
++ 
++@@ -766,7 +821,7 @@ void ife_print_long(struct interface *pt
++ 	ddptype = get_afntype(AF_APPLETALK);
++     if (ddptype != NULL) {
++ 	if (ptr->has_ddp)
++-	    printf(_("          EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1));
+++	    printf(_("        %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1));
++     }
++ #endif
++ 
++@@ -775,53 +830,30 @@ void ife_print_long(struct interface *pt
++ 	ectype = get_afntype(AF_ECONET);
++     if (ectype != NULL) {
++ 	if (ptr->has_econet)
++-	    printf(_("          econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1));
+++	    printf(_("        %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1));
++     }
++ #endif
++ 
++-    printf("          ");
++-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
++-    if (ptr->flags == 0)
++-	printf(_("[NO FLAGS] "));
++-    if (ptr->flags & IFF_UP)
++-	printf(_("UP "));
++-    if (ptr->flags & IFF_BROADCAST)
++-	printf(_("BROADCAST "));
++-    if (ptr->flags & IFF_DEBUG)
++-	printf(_("DEBUG "));
++-    if (ptr->flags & IFF_LOOPBACK)
++-	printf(_("LOOPBACK "));
++-    if (ptr->flags & IFF_POINTOPOINT)
++-	printf(_("POINTOPOINT "));
++-    if (ptr->flags & IFF_NOTRAILERS)
++-	printf(_("NOTRAILERS "));
++-    if (ptr->flags & IFF_RUNNING)
++-	printf(_("RUNNING "));
++-    if (ptr->flags & IFF_NOARP)
++-	printf(_("NOARP "));
++-    if (ptr->flags & IFF_PROMISC)
++-	printf(_("PROMISC "));
++-    if (ptr->flags & IFF_ALLMULTI)
++-	printf(_("ALLMULTI "));
++-    if (ptr->flags & IFF_SLAVE)
++-	printf(_("SLAVE "));
++-    if (ptr->flags & IFF_MASTER)
++-	printf(_("MASTER "));
++-    if (ptr->flags & IFF_MULTICAST)
++-	printf(_("MULTICAST "));
++-#ifdef HAVE_DYNAMIC
++-    if (ptr->flags & IFF_DYNAMIC)
++-	printf(_("DYNAMIC "));
++-#endif
++-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
++-    printf(_(" MTU:%d  Metric:%d"),
++-	   ptr->mtu, ptr->metric ? ptr->metric : 1);
++-#ifdef SIOCSKEEPALIVE
++-    if (ptr->outfill || ptr->keepalive)
++-	printf(_("  Outfill:%d  Keepalive:%d"),
++-	       ptr->outfill, ptr->keepalive);
+++    /* For some hardware types (eg Ash, ATM) we don't print the 
+++       hardware address if it's null.  */
+++    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
+++				  hw->suppress_null_addr)))
+++	printf(_("        %s %s"), hw->name, hw->print(ptr->hwaddr));
+++    else
+++	printf(_("        %s"), hw->name);
+++    if (ptr->tx_queue_len != -1)
+++    	printf(_("  txqueuelen %d"), ptr->tx_queue_len);
+++    printf("  (%s)\n", hw->title);
+++
+++#ifdef IFF_PORTSEL
+++    if (ptr->flags & IFF_PORTSEL) {
+++	printf(_("        media %s"), if_port_text[ptr->map.port][0]);
+++	if (ptr->flags & IFF_AUTOMEDIA)
+++	    printf(_("autoselect"));
+++    	printf("\n");
+++    }
++ #endif
++-    printf("\n");
+++
++ 
++     /* If needed, display the interface statistics. */
++ 
++@@ -830,55 +862,87 @@ void ife_print_long(struct interface *pt
++ 	 *      not for the aliases, although strictly speaking they're shared
++ 	 *      by all addresses.
++ 	 */
++-	printf("          ");
++-
++-	printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"),
++-	       ptr->stats.rx_packets, ptr->stats.rx_errors,
++-	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
++-	       ptr->stats.rx_frame_errors);
++-	if (can_compress)
++-	    printf(_("             compressed:%lu\n"), ptr->stats.rx_compressed);
++-
++ 	rx = ptr->stats.rx_bytes;  
++-	tx = ptr->stats.tx_bytes;
++ 	short_rx = rx * 10;  
+++	if (rx > 1125899906842624ull) {
+++	    short_rx /= 1125899906842624ull;
+++	    Rext = "PiB";
+++	} else if (rx > 1099511627776ull) {
+++	    short_rx /= 1099511627776ull;
+++	    Rext = "TiB";
+++	} else if (rx > 1073741824ull) {
+++	    short_rx /= 1073741824ull;
+++	    Rext = "GiB";
+++	} else if (rx > 1048576) {
+++	    short_rx /= 1048576;
+++	    Rext = "MiB";
+++	} else if (rx > 1024) {
+++	    short_rx /= 1024;
+++	    Rext = "KiB";
+++	}
+++	tx = ptr->stats.tx_bytes;
++ 	short_tx = tx * 10;
++-	if (rx > 1048576) { short_rx /= 1048576;  strcpy(Rext, "Mb"); }
++-	else if (rx > 1024) { short_rx /= 1024;  strcpy(Rext, "Kb"); }
++-	if (tx > 1048576) { short_tx /= 1048576;  strcpy(Text, "Mb"); }
++-	else if (tx > 1024) { short_tx /= 1024;  strcpy(Text, "Kb"); }
++-
++-	printf("          ");
++-	printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),
++-	       ptr->stats.tx_packets, ptr->stats.tx_errors,
++-	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
++-	       ptr->stats.tx_carrier_errors);
++-	printf(_("          collisions:%lu "), ptr->stats.collisions);
++-	if (can_compress)
++-	    printf(_("compressed:%lu "), ptr->stats.tx_compressed);
++-	if (ptr->tx_queue_len != -1)
++-	    printf(_("txqueuelen:%d "), ptr->tx_queue_len);
++-	printf("\n          ");
++-	printf(_("RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"),
+++	if (tx > 1125899906842624ull) {
+++	    short_tx /= 1125899906842624ull;
+++	    Text = "PiB";
+++	} else 	if (tx > 1099511627776ull) {
+++	    short_tx /= 1099511627776ull;
+++	    Text = "TiB";
+++	} else if (tx > 1073741824ull) {
+++	    short_tx /= 1073741824ull;
+++	    Text = "GiB";
+++	} else if (tx > 1048576) {
+++	    short_tx /= 1048576;
+++	    Text = "MiB";
+++	} else if (tx > 1024) {
+++	    short_tx /= 1024;
+++	    Text = "KiB";
+++	}
+++
+++	printf("        ");
+++	printf(_("RX packets %llu  bytes %llu (%lu.%lu %s)\n"), 
+++		ptr->stats.rx_packets, 
++ 	       rx, (unsigned long)(short_rx / 10), 
++-	       (unsigned long)(short_rx % 10), Rext, 
++-	       tx, (unsigned long)(short_tx / 10), 
++-	       (unsigned long)(short_tx % 10), Text);
+++	       (unsigned long)(short_rx % 10), Rext);
+++	if (can_compress) {
+++  	    printf("        ");
+++	    printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed);
+++	}
+++	printf("        ");
+++	printf(_("RX errors %lu  dropped %lu  overruns %lu  frame %lu\n"),
+++	       ptr->stats.rx_errors, ptr->stats.rx_dropped, 
+++	       ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors);
+++
+++
+++	printf("        ");
+++	printf(_("TX packets %llu  bytes %llu (%lu.%lu %s)\n"),
+++		ptr->stats.tx_packets, 
+++	        tx, (unsigned long)(short_tx / 10), 
+++	        (unsigned long)(short_tx % 10), Text);
+++	if (can_compress) {
+++  	    printf("        ");
+++	    printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed);
+++	}
+++	printf("        ");
+++	printf(_("TX errors %lu  dropped %lu overruns %lu  carrier %lu  collisions %lu\n"),
+++	       ptr->stats.tx_errors,
+++	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
+++	       ptr->stats.tx_carrier_errors, ptr->stats.collisions);
++     }
++ 
++     if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma ||
++-	 ptr->map.base_addr)) {
++-	printf("          ");
+++	 ptr->map.base_addr >= 0x100)) {
+++	printf("        device ");
++ 	if (ptr->map.irq)
++-	    printf(_("Interrupt:%d "), ptr->map.irq);
+++	    printf(_("interrupt %d  "), ptr->map.irq);
++ 	if (ptr->map.base_addr >= 0x100)	/* Only print devices using it for 
++ 						   I/O maps */
++-	    printf(_("Base address:0x%x "), ptr->map.base_addr);
+++	    printf(_("base 0x%x  "), ptr->map.base_addr);
++ 	if (ptr->map.mem_start) {
++-	    printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end);
+++	    printf(_("memory 0x%lx-%lx  "), ptr->map.mem_start, ptr->map.mem_end);
++ 	}
++ 	if (ptr->map.dma)
++-	    printf(_("DMA chan:%x "), ptr->map.dma);
+++	    printf(_("  dma 0x%x"), ptr->map.dma);
++ 	printf("\n");
++     }
++     printf("\n");
++Index: net-tools/lib/ipx.c
++===================================================================
++--- net-tools.orig/lib/ipx.c
+++++ net-tools/lib/ipx.c
++@@ -133,6 +133,9 @@ static int IPX_input(int type, char *buf
++     char *ep;
++     int nbo;
++ 
+++    if (!sai)
+++    	return (-1);
+++    	
++     sai->sipx_family = AF_IPX;
++     sai->sipx_network = htonl(0);
++     sai->sipx_node[0] = sai->sipx_node[1] = sai->sipx_node[2] =
++Index: net-tools/lib/ipx_gr.c
++===================================================================
++--- net-tools.orig/lib/ipx_gr.c
+++++ net-tools/lib/ipx_gr.c
++@@ -38,21 +38,27 @@ int IPX_rprint(int options)
++     char net[128], router_net[128];
++     char router_node[128];
++     int num;
++-    FILE *fp = fopen(_PATH_PROCNET_IPX_ROUTE, "r");
+++    FILE *fp;
++     struct aftype *ap;
++     struct sockaddr sa;
++ 
++-    if ((ap = get_afntype(AF_IPX)) == NULL) {
++-	EINTERN("lib/ipx_rt.c", "AF_IPX missing");
++-	return (-1);
++-    }
+++    fp = fopen(_PATH_PROCNET_IPX_ROUTE1, "r");
++ 
++     if (!fp) {
++-        perror(_PATH_PROCNET_IPX_ROUTE);
++-        printf(_("IPX not configured in this system.\n"));
+++        fp = fopen(_PATH_PROCNET_IPX_ROUTE2, "r");
+++    }
+++    
+++    if (!fp) {
+++        perror(NULL);
+++        printf(_("IPX routing not in file %s or %s found.\n"), _PATH_PROCNET_IPX_ROUTE1, _PATH_PROCNET_IPX_ROUTE2);
++ 	return 1;
++     }
++ 
+++    if ((ap = get_afntype(AF_IPX)) == NULL) {
+++	EINTERN("lib/ipx_rt.c", "AF_IPX missing");
+++	return (-1);
+++    }
+++
++     printf(_("Kernel IPX routing table\n"));	/* xxx */
++     printf(_("Destination               Router Net                Router Node\n"));
++ 
++Index: net-tools/lib/irda.c
++===================================================================
++--- net-tools.orig/lib/irda.c
+++++ net-tools/lib/irda.c
++@@ -1,13 +1,15 @@
++ /*********************************************************************
++  *                
++  * Filename:      irda.c
++- * Version:       0.1
++- * Description:   A first attempt to make ifconfig understand IrDA
+++ * Version:       0.2
+++ * Description:   A second attempt to make ifconfig understand IrDA
++  * Status:        Experimental.
++  * Author:        Dag Brattli <dagb@cs.uit.no>
++  * Created at:    Wed Apr 21 09:03:09 1999
++  * Modified at:   Wed Apr 21 09:17:05 1999
++  * Modified by:   Dag Brattli <dagb@cs.uit.no>
+++ * Modified at:   Wed May  1 11:51:44 CEST 2002
+++ * Modified by:   Christoph Bartelmus <christoph@bartelmus.de>
++  * 
++  *     This program is free software; you can redistribute it and/or 
++  *     modify it under the terms of the GNU General Public License as 
++@@ -59,9 +61,9 @@
++  */
++ static char *irda_print(unsigned char *ptr)
++ {
++-    static char buff[8];
+++    static char buff[12];
++ 
++-    sprintf(&buff[strlen(buff)], "%02x:%02x:%02x:%02x", ptr[3], ptr[2], 
+++    snprintf(buff, 12, "%02x:%02x:%02x:%02x", ptr[3], ptr[2], 
++ 	    ptr[1], ptr[0]);
++ 
++     return (buff);
++Index: net-tools/lib/net-features.h
++===================================================================
++--- net-tools.orig/lib/net-features.h
+++++ net-tools/lib/net-features.h
++@@ -295,6 +295,13 @@ static char *Features =
++ "-"
++ #endif
++ "HDLC/LAPB "
+++
+++#if HAVE_HWEUI64
+++"+"
+++#else
+++"-"
+++#endif
+++"EUI64 "
++ ;
++ 
++ 
++Index: net-tools/lib/nstrcmp.c
++===================================================================
++--- net-tools.orig/lib/nstrcmp.c
+++++ net-tools/lib/nstrcmp.c
++@@ -1,34 +1,157 @@
++ /* Copyright 1998 by Andi Kleen. Subject to the GPL. */
++-/* $Id: nstrcmp.c,v 1.2 1998/11/15 20:11:38 freitag Exp $ */ 
+++/* rewritten by bernd eckenfels because of complicated alias semantic */
+++/* $Id: nstrcmp.c,v 1.4 2004/06/03 22:49:17 ecki Exp $ */ 
++ #include <ctype.h>
++ #include <stdlib.h>
+++#include <string.h>
++ #include "util.h"
++ 
++-/* like strcmp(), but knows about numbers */
++-int nstrcmp(const char *astr, const char *b)
+++
+++/* return numerical :999 suffix or null. sideeffect: replace ':' with \0 */
+++char* cutalias(char* name)
++ {
++-    const char *a = astr;
+++	int digit = 0;
+++	int pos;
+++	
+++	for(pos=strlen(name); pos>0; pos--)
+++	{
+++		if (name[pos-1]==':' && digit)
+++		{
+++			name[pos-1]='\0';
+++			return name+pos;
+++		}
+++		if (!isdigit(name[pos-1]))
+++			break;
+++		digit = 1;
+++	}
+++	return NULL;
+++}
++ 
++-    while (*a == *b) {
++-	if (*a == '\0')
++-	    return 0;
++-	a++;
++-	b++;
++-    }
++-    if (isdigit(*a)) {
++-	if (!isdigit(*b))
++-	    return -1;
++-	while (a > astr) {
++-	    a--;
++-	    if (!isdigit(*a)) {
++-		a++;
++-		break;
++-	    }
++-	    if (!isdigit(*b))
++-		return -1;
++-	    b--;
+++
+++/* return index of last non digit or -1 if it does not end with digits */
+++int rindex_nondigit(char *name)
+++{
+++	int pos = strlen(name);
+++
+++	for(pos=strlen(name); pos>0; pos--)
+++	{
+++		if (!isdigit(name[pos-1]))
+++			return pos;
++ 	}
++-	return atoi(a) > atoi(b) ? 1 : -1;
++-    }
++-    return *a - *b;
+++	return 0;
+++}
+++
+++
+++/* like strcmp(), but knows about numbers and ':' alias suffix */
+++int nstrcmp(const char *ap, const char *bp)
+++{
+++	char *a = (char*)strdup(ap);
+++	char *b = (char*)strdup(bp);
+++	char *an, *bn;
+++	int av = 0, bv = 0;
+++	char *aalias=cutalias(a);
+++	char *balias=cutalias(b);
+++	int aindex=rindex_nondigit(a);
+++	int bindex=rindex_nondigit(b);
+++	int complen=(aindex<bindex)?aindex:bindex;
+++	int res = strncmp(a, b, complen);
+++
+++	if (res != 0)
+++		{ free(a); free(b); return res; }
+++		
+++	if (aindex > bindex)
+++		{ free(a); free(b); return 1; }
+++		
+++	if (aindex < bindex)
+++		{ free(a); free(b); return -1; }
+++		
+++	an = a+aindex;
+++	bn = b+bindex;
+++	
+++	av = atoi(an);
+++	bv = atoi(bn);
+++	
+++	if (av < bv)
+++		{ free(a); free(b); return -1; }
+++		
+++	if (av > bv)
+++		{ free(a); free(b); return 1; }
+++		
+++	av = -1;
+++	if (aalias != NULL)
+++		av = atoi(aalias);
+++	
+++	bv = -1;
+++	if (balias != NULL)
+++		bv = atoi(balias);
+++	
+++	free(a); free(b);
+++	
+++	if (av < bv)
+++		return -1;
+++		
+++	if (av > bv)
+++		return 1;
+++		
+++	return 0;
+++}
+++
+++
+++#ifdef NSTRCMP_TEST
+++
+++int cs(int s)
+++{
+++	if (s < 0) return -1;
+++	if (s > 0) return 1;
+++	return 0;
+++}
+++
+++
+++int dotest(char* a, char* b, int exp)
+++{
+++	int res = nstrcmp(a, b);
+++	int err = (cs(res) != cs(exp));
+++	printf("nstrcmp(\"%s\", \"%s\")=%d %d %s\n", a, b, res, exp, err?"WRONG":"OK");
+++	return err;
++ }
+++
+++int main()
+++{
+++	int err = 0;
+++	
+++	err |= dotest("eth1", "eth1", 0);
+++	err |= dotest("eth0:1", "eth0:1", 0);
+++	err |= dotest("lan", "lan", 0);
+++	err |= dotest("100", "100", 0);
+++	err |= dotest("", "", 0);
+++	err |= dotest(":", ":", 0);
+++	err |= dotest("a:b:c", "a:b:c", 0);
+++	err |= dotest("a:", "a:", 0);
+++	err |= dotest(":a", ":a", 0);
+++
+++	err |= dotest("a", "aa", -1);	
+++	err |= dotest("eth0", "eth1", -1);
+++	err |= dotest("eth1", "eth20", -1);
+++	err |= dotest("eth20", "eth100", -1);
+++	err |= dotest("eth1", "eth13", -1);
+++	err |= dotest("eth", "eth2", -1);
+++	err |= dotest("eth0:1", "eth0:2", -1);
+++	err |= dotest("eth1:10", "eth13:10", -1);
+++	err |= dotest("eth1:1", "eth1:13", -1);
+++	err |= dotest("a", "a:", -1);
+++	
+++	err |= dotest("aa", "a", 1);
+++	err |= dotest("eth2", "eth1", 1);
+++	err |= dotest("eth13", "eth1", 1);	
+++	err |= dotest("eth2", "eth", 1);
+++	err |= dotest("eth2:10", "eth2:1", 1);
+++	err |= dotest("eth2:5", "eth2:4", 1);
+++	err |= dotest("eth3:2", "eth2:3", 1);
+++	err |= dotest("eth13:1", "eth1:0", 1);
+++	err |= dotest("a:", "a", 1);
+++	err |= dotest("a1b12", "a1b2", 1);
+++
+++	return err;
+++}
+++
+++#endif
++Index: net-tools/lib/pathnames.h
++===================================================================
++--- net-tools.orig/lib/pathnames.h
+++++ net-tools/lib/pathnames.h
++@@ -1,4 +1,3 @@
++-
++ /*
++  * lib/pathnames.h    This file contains the definitions of the path 
++  *                      names used by the NET-LIB.
++@@ -29,8 +28,10 @@
++ #define _PATH_PROCNET_NR_NODES		"/proc/net/nr_nodes"
++ #define _PATH_PROCNET_ARP		"/proc/net/arp"
++ #define _PATH_PROCNET_AX25		"/proc/net/ax25"
++-#define _PATH_PROCNET_IPX		"/proc/net/ipx"
++-#define _PATH_PROCNET_IPX_ROUTE		"/proc/net/ipx_route"
+++#define _PATH_PROCNET_IPX_SOCKET1	"/proc/net/ipx/socket"
+++#define _PATH_PROCNET_IPX_SOCKET2	"/proc/net/ipx"
+++#define _PATH_PROCNET_IPX_ROUTE1	"/proc/net/ipx/route"
+++#define _PATH_PROCNET_IPX_ROUTE2	"/proc/net/ipx_route"
++ #define _PATH_PROCNET_ATALK		"/proc/net/appletalk"
++ #define _PATH_PROCNET_IP_BLK		"/proc/net/ip_block"
++ #define _PATH_PROCNET_IP_FWD		"/proc/net/ip_forward"
++@@ -45,6 +46,7 @@
++ #define _PATH_PROCNET_X25              "/proc/net/x25"
++ #define _PATH_PROCNET_X25_ROUTE                "/proc/net/x25_routes"
++ #define _PATH_PROCNET_DEV_MCAST		"/proc/net/dev_mcast"
+++#define _PATH_PROCNET_ATALK_ROUTE	"/proc/net/atalk_route"
++ 
++ /* pathname for the netlink device */
++ #define _PATH_DEV_ROUTE	"/dev/route"
++Index: net-tools/lib/proc.c
++===================================================================
++--- net-tools.orig/lib/proc.c
+++++ net-tools/lib/proc.c
++@@ -1,11 +1,12 @@
++ /* Tolerant /proc file parser. Copyright 1998 Andi Kleen */
++-/* $Id: proc.c,v 1.4 1999/01/05 20:54:00 philip Exp $ */ 
+++/* $Id: proc.c,v 1.5 2007/12/01 18:44:57 ecki Exp $ */ 
++ /* Fixme: cannot currently cope with removed fields */ 
++ 
++ #include <string.h>
++ #include <stdarg.h>
++ #include <stdio.h>
++ #include <ctype.h>
+++#include <unistd.h>
++ 
++ /* Caller must free return string. */
++ 
++@@ -72,3 +73,22 @@ int proc_guess_fmt(char *name, FILE *fh,
++     va_end(ap);
++     return flag;
++ }
+++
+++
+++FILE *proc_fopen(const char *name)
+++{
+++    static char *buffer;
+++    static size_t pagesz;
+++    FILE *fd = fopen(name, "r");
+++
+++    if (fd == NULL)
+++      return NULL;
+++      
+++    if (!buffer) {
+++      pagesz = getpagesize();
+++      buffer = malloc(pagesz);
+++    }
+++    
+++    setvbuf(fd, buffer, _IOFBF, pagesz);
+++    return fd;
+++}
++Index: net-tools/lib/proc.h
++===================================================================
++--- net-tools.orig/lib/proc.h
+++++ net-tools/lib/proc.h
++@@ -1,5 +1,7 @@
++-
++-
++-/* Generate a suitable scanf format for a column title line */
+++/* 
+++ * prototypes for proc.c
+++ */
++ char *proc_gen_fmt(char *name, int more, FILE * fh,...);
++ int   proc_guess_fmt(char *name, FILE* fh,...);
+++FILE *proc_fopen(const char *name);
+++
++Index: net-tools/lib/tr.c
++===================================================================
++--- net-tools.orig/lib/tr.c
+++++ net-tools/lib/tr.c
++@@ -2,7 +2,7 @@
++  * lib/tr.c   This file contains an implementation of the "Tokenring"
++  *              support functions.
++  *
++- * Version:     $Id: tr.c,v 1.8 2000/02/02 08:56:30 freitag Exp $
+++ * Version:     $Id: tr.c,v 1.9 2005/05/16 03:15:12 ecki Exp $
++  *
++  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++  *              Copyright 1993 MicroWalt Corporation
++@@ -30,8 +30,14 @@
++ #include "net-support.h"
++ #include "pathnames.h"
++ #include "intl.h"
+++#include "util.h"
++ 
+++
+++/* actual definition at the end of file */
++ extern struct hwtype tr_hwtype;
+++#ifdef ARPHRD_IEEE802_TR
+++extern struct hwtype tr_hwtype1;
+++#endif
++ 
++ static char *pr_tr(unsigned char *ptr)
++ {
++@@ -42,7 +48,7 @@ static char *pr_tr(unsigned char *ptr)
++ 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
++ 	);
++     return (buff);
++-}
+++      }
++ 
++ 
++ static int in_tr(char *bufp, struct sockaddr *sap)
++@@ -51,7 +57,17 @@ static int in_tr(char *bufp, struct sock
++     char c, *orig;
++     int i, val;
++ 
+++#ifdef ARPHRD_IEEE802_TR
+++    if (kernel_version() < KRELEASE(2,3,30)) { 
+++        sap->sa_family = tr_hwtype.type;
+++    } else { 
+++        sap->sa_family = tr_hwtype1.type;
+++    } 	
+++#else
++     sap->sa_family = tr_hwtype.type;
+++    #warning "Limited functionality, no support for ARPHRD_IEEE802_TR (old kernel headers?)"
+++#endif
+++
++     ptr = sap->sa_data;
++ 
++     i = 0;
++Index: net-tools/lib/util-ank.c
++===================================================================
++--- net-tools.orig/lib/util-ank.c
+++++ net-tools/lib/util-ank.c
++@@ -293,7 +293,7 @@ int inet_addr_match(inet_prefix *a, inet
++ 	return 0;
++ }
++ 
++-const char *format_host(int af, void *addr, __u8 *abuf, int alen)
+++const char *format_host(int af, void *addr, char *abuf, int alen)
++ {
++ #ifdef RESOLVE_HOSTNAMES
++ 	if (resolve_hosts) {
++Index: net-tools/lib/util.h
++===================================================================
++--- net-tools.orig/lib/util.h
+++++ net-tools/lib/util.h
++@@ -14,3 +14,6 @@ int nstrcmp(const char *, const char *);
++ 
++ char *safe_strncpy(char *dst, const char *src, size_t size); 
++ 
+++
+++#define netmin(a,b) ((a)<(b) ? (a) : (b))
+++#define netmax(a,b) ((a)>(b) ? (a) : (b))
++Index: net-tools/lib/x25_sr.c
++===================================================================
++--- net-tools.orig/lib/x25_sr.c
+++++ net-tools/lib/x25_sr.c
++@@ -67,7 +67,7 @@ static int X25_setroute(int action, int 
++   strcpy(target, *args++);
++ 
++   /* Clean out the x25_route_struct structure. */
++-  memset((char *) &rt, 0, sizeof(struct x25_route_struct));
+++  memset((char *) &rt, 0, sizeof(rt));
++ 
++ 
++   if ((sigdigits = x25_aftype.input(0, target, (struct sockaddr *)&sx25)) < 0) {
++@@ -76,8 +76,8 @@ static int X25_setroute(int action, int 
++   }
++   rt.sigdigits=sigdigits;
++ 
++-  /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
++-  memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
+++  /* this works with 2.4 and 2.6 headers struct x25_address vs. typedef */
+++  memcpy(&rt.address, &sx25.sx25_addr, sizeof(sx25.sx25_addr));
++ 
++   while (*args) {
++ 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
++Index: net-tools/lib/eui64.c
++===================================================================
++--- /dev/null
+++++ net-tools/lib/eui64.c
++@@ -0,0 +1,155 @@
+++/*
+++ * lib/eui64.c  This file contains support for generic EUI-64 hw addressing
+++ *
+++ * Version:     $Id: eui64.c,v 1.1 2001/11/12 02:12:05 ecki Exp $
+++ *
+++ * Author:      Daniel Stodden <stodden@in.tum.de>
+++ *              Copyright 2001 Daniel Stodden
+++ *
+++ *              blueprinted from ether.c 
+++ *              Copyright 1993 MicroWalt Corporation
+++ *
+++ *              This program is free software; you can redistribute it
+++ *              and/or  modify it under  the terms of  the GNU General
+++ *              Public  License as  published  by  the  Free  Software
+++ *              Foundation;  either  version 2 of the License, or  (at
+++ *              your option) any later version.
+++ */
+++#include "config.h"
+++
+++#if HAVE_HWEUI64
+++
+++#include <sys/types.h>
+++#include <sys/ioctl.h>
+++#include <sys/socket.h>
+++#include <net/if_arp.h>
+++#include <stdlib.h>
+++#include <stdio.h>
+++#include <ctype.h>
+++#include <errno.h>
+++#include <fcntl.h>
+++#include <string.h>
+++#include <termios.h>
+++#include <unistd.h>
+++#include "net-support.h"
+++#include "pathnames.h"
+++#include "intl.h"
+++
+++/*
+++ * EUI-64 constants
+++ */
+++
+++#define EUI64_ALEN	8
+++
+++#ifndef ARPHRD_EUI64
+++#define ARPHRD_EUI64	27
+++#warning "ARPHRD_EUI64 not defined in <net/if_arp.h>. Using private value 27"
+++#endif
+++
+++struct hwtype eui64_hwtype;
+++
+++/* Display an EUI-64 address in readable format. */
+++static char *pr_eui64( unsigned char *ptr )
+++{
+++	static char buff[64];
+++
+++	snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
+++		 (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), (ptr[3] & 0377), 
+++		 (ptr[4] & 0377), (ptr[5] & 0377), (ptr[6] & 0377), (ptr[7] & 0377)
+++		);
+++	return (buff);
+++}
+++
+++/* Start the PPP encapsulation on the file descriptor. */
+++static int in_eui64( char *bufp, struct sockaddr *sap )
+++{
+++	unsigned char *ptr;
+++	char c, *orig;
+++	int i;
+++	unsigned val;
+++
+++	sap->sa_family = eui64_hwtype.type;
+++	ptr = sap->sa_data;
+++
+++	i = 0;
+++	orig = bufp;
+++	
+++	while ((*bufp != '\0') && (i < EUI64_ALEN)) {
+++		val = 0;
+++		c = *bufp++;
+++		if (isdigit(c))
+++			val = c - '0';
+++		else if (c >= 'a' && c <= 'f')
+++			val = c - 'a' + 10;
+++		else if (c >= 'A' && c <= 'F')
+++			val = c - 'A' + 10;
+++		else {
+++#ifdef DEBUG
+++			fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), 
+++				 orig );
+++#endif
+++			errno = EINVAL;
+++			return (-1);
+++		}
+++
+++		val <<= 4;
+++		c = *bufp;
+++		if (isdigit(c))
+++			val |= c - '0';
+++		else if (c >= 'a' && c <= 'f')
+++			val |= c - 'a' + 10;
+++		else if (c >= 'A' && c <= 'F')
+++			val |= c - 'A' + 10;
+++		else if (c == ':' || c == 0)
+++			val >>= 4;
+++		else {
+++#ifdef DEBUG
+++			fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), 
+++				 orig );
+++#endif
+++			errno = EINVAL;
+++			return (-1);
+++		}
+++
+++		if (c != 0)
+++			bufp++;
+++
+++		*ptr++ = (unsigned char) (val & 0377);
+++		i++;
+++		
+++		/* We might get a semicolon here - not required. */
+++		if (*bufp == ':') {
+++			if (i == EUI64_ALEN) {
+++#ifdef DEBUG
+++				fprintf(stderr, _("in_eui64(%s): trailing : ignored!\n"),
+++					orig)
+++#endif
+++					; /* nothing */
+++			}
+++			bufp++;
+++		}
+++	}
+++
+++	/* That's it.  Any trailing junk? */
+++	if ((i == EUI64_ALEN) && (*bufp != '\0')) {
+++#ifdef DEBUG
+++		fprintf(stderr, _("in_eui64(%s): trailing junk!\n"), orig);
+++		errno = EINVAL;
+++		return (-1);
+++#endif
+++	}
+++#ifdef DEBUG
+++	fprintf(stderr, "in_eui64(%s): %s\n", orig, pr_eui64(sap->sa_data));
+++#endif
+++
+++    return (0);
+++}
+++
+++struct hwtype eui64_hwtype =
+++{
+++	"eui64", NULL, /*"EUI-64 addressing", */ ARPHRD_EUI64, EUI64_ALEN,
+++	pr_eui64, in_eui64, NULL, 0
+++};
+++
+++
+++#endif				/* HAVE_EUI64 */
++Index: net-tools/lib/ib.c
++===================================================================
++--- /dev/null
+++++ net-tools/lib/ib.c
++@@ -0,0 +1,147 @@
+++/*
+++ * lib/ib.c        This file contains an implementation of the "Infiniband"
+++ *              support functions.
+++ *
+++ * Version:     $Id: ib.c,v 1.1 2005/02/06 11:00:47 tduffy Exp $
+++ *
+++ * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
+++ *              Copyright 1993 MicroWalt Corporation
+++ *		Tom Duffy <tduffy@sun.com>
+++ *
+++ *              This program is free software; you can redistribute it
+++ *              and/or  modify it under  the terms of  the GNU General
+++ *              Public  License as  published  by  the  Free  Software
+++ *              Foundation;  either  version 2 of the License, or  (at
+++ *              your option) any later version.
+++ */
+++#include "config.h"
+++
+++#if HAVE_HWIB
+++#include <sys/types.h>
+++#include <sys/socket.h>
+++#include <net/if_arp.h>
+++#include <linux/if_infiniband.h>
+++#include <stdlib.h>
+++#include <stdio.h>
+++#include <errno.h>
+++#include <ctype.h>
+++#include <string.h>
+++#include <unistd.h>
+++#include "net-support.h"
+++#include "pathnames.h"
+++#include "intl.h"
+++#include "util.h"
+++
+++extern struct hwtype ib_hwtype;
+++
+++
+++/* Display an InfiniBand address in readable format. */
+++static char *pr_ib(unsigned char *ptr)
+++{
+++    static char buff[128];
+++    char *pos;
+++    unsigned int i;
+++
+++    pos = buff;
+++    for (i = 0; i < INFINIBAND_ALEN; i++) {
+++	pos += sprintf(pos, "%02X:", (*ptr++ & 0377));
+++    }
+++    buff[strlen(buff) - 1] = '\0';
+++
+++    /* snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X",
+++	     (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
+++	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
+++	);
+++    */
+++    return (buff);
+++}
+++
+++
+++/* Input an Infiniband address and convert to binary. */
+++static int in_ib(char *bufp, struct sockaddr *sap)
+++{
+++    unsigned char *ptr;
+++    char c, *orig;
+++    int i;
+++    unsigned val;
+++
+++    sap->sa_family = ib_hwtype.type;
+++    ptr = sap->sa_data;
+++
+++    i = 0;
+++    orig = bufp;
+++    while ((*bufp != '\0') && (i < INFINIBAND_ALEN)) {
+++	val = 0;
+++	c = *bufp++;
+++	if (isdigit(c))
+++	    val = c - '0';
+++	else if (c >= 'a' && c <= 'f')
+++	    val = c - 'a' + 10;
+++	else if (c >= 'A' && c <= 'F')
+++	    val = c - 'A' + 10;
+++	else {
+++#ifdef DEBUG
+++	    fprintf(stderr, _("in_ib(%s): invalid infiniband address!\n"), orig);
+++#endif
+++	    errno = EINVAL;
+++	    return (-1);
+++	}
+++	val <<= 4;
+++	c = *bufp;
+++	if (isdigit(c))
+++	    val |= c - '0';
+++	else if (c >= 'a' && c <= 'f')
+++	    val |= c - 'a' + 10;
+++	else if (c >= 'A' && c <= 'F')
+++	    val |= c - 'A' + 10;
+++	else if (c == ':' || c == 0)
+++	    val >>= 4;
+++	else {
+++#ifdef DEBUG
+++	    fprintf(stderr, _("in_ib(%s): invalid infiniband address!\n"), orig);
+++#endif
+++	    errno = EINVAL;
+++	    return (-1);
+++	}
+++	if (c != 0)
+++	    bufp++;
+++	*ptr++ = (unsigned char) (val & 0377);
+++	i++;
+++
+++	/* We might get a semicolon here - not required. */
+++	if (*bufp == ':') {
+++	    if (i == INFINIBAND_ALEN) {
+++#ifdef DEBUG
+++		fprintf(stderr, _("in_ib(%s): trailing : ignored!\n"),
+++			orig)
+++#endif
+++		    ;		/* nothing */
+++	    }
+++	    bufp++;
+++	}
+++    }
+++
+++    /* That's it.  Any trailing junk? */
+++    if ((i == INFINIBAND_ALEN) && (*bufp != '\0')) {
+++#ifdef DEBUG
+++	fprintf(stderr, _("in_ib(%s): trailing junk!\n"), orig);
+++	errno = EINVAL;
+++	return (-1);
+++#endif
+++    }
+++#ifdef DEBUG
+++    fprintf(stderr, "in_ib(%s): %s\n", orig, pr_ib(sap->sa_data));
+++#endif
+++
+++    return (0);
+++}
+++
+++
+++struct hwtype ib_hwtype =
+++{
+++    "infiniband", NULL, ARPHRD_INFINIBAND, INFINIBAND_ALEN,
+++    pr_ib, in_ib, NULL
+++};
+++
+++
+++#endif				/* HAVE_HWIB */
+--- net-tools-1.60.orig/debian/patches/CVS-20051204-slttach.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20051204-slttach.c_sync.patch
+@@ -0,0 +1,43 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.11 - Sun Dec 4 05:15:36 2005 UTC by ecki
++use file version
++
++Revision 1.10 - Sun Dec 4 05:14:08 2005 UTC by ecki
++make slattach 3-wire -L mode work (no RTSCTS) (Debian Bug #175743)
++
++Index: net-tools/slattach.c
++===================================================================
++--- net-tools.orig/slattach.c
+++++ net-tools/slattach.c
++@@ -73,7 +73,7 @@
++ 
++ 
++ const char *Release = RELEASE,
++-	   *Version = "@(#) slattach 1.21 (1999-11-21)",
+++	   *Version = "$Id: slattach.c,v 1.11 2005/12/04 05:15:36 ecki Exp $",
++ 	   *Signature = "net-tools, Fred N. van Kempen et al.";
++ 
++ 
++@@ -115,7 +115,7 @@ int		opt_h = 0;		/* "hangup" on carrier 
++ int		opt_k = 0;		/* "keepalive" value		*/
++ #endif
++ int		opt_l = 0;		/* "lock it" flag		*/
++-int		opt_L = 0;		/* clocal flag			*/
+++int		opt_L = 0;		/* 3-wire mode flag		*/
++ int		opt_m = 0;		/* "set RAW mode" flag		*/
++ int		opt_n = 0;		/* "set No Mesg" flag		*/
++ #ifdef SIOCSOUTFILL
++@@ -342,9 +342,11 @@ tty_set_raw(struct termios *tty)
++   tty->c_oflag = (0);				/* output flags		*/
++   tty->c_lflag = (0);				/* local flags		*/
++   speed = (tty->c_cflag & CBAUD);		/* save current speed	*/
++-  tty->c_cflag = (CRTSCTS | HUPCL | CREAD);	/* UART flags		*/
+++  tty->c_cflag = (HUPCL | CREAD);		/* UART flags		*/
++   if (opt_L) 
++ 	tty->c_cflag |= CLOCAL;
+++  else
+++	tty->c_cflag |= CRTSCTS;
++   tty->c_cflag |= speed;			/* restore speed	*/
++   return(0);
++ }
+--- net-tools-1.60.orig/debian/patches/CVS-20071202-rarp.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20071202-rarp.c_sync.patch
+@@ -0,0 +1,41 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.9 - Sun Dec 2 02:19:52 2007 UTC by ecki
++more backoff
++
++Revision 1.8 - Sat Dec 1 19:36:55 2007 UTC by ecki
++backoff proc_fopen usage from etherfile.
++
++Revision 1.7 - Sat Dec 1 18:51:09 2007 UTC by ecki
++Page aligned fopen buffer
++
++Index: net-tools/rarp.c
++===================================================================
++--- net-tools.orig/rarp.c
+++++ net-tools/rarp.c
++@@ -3,7 +3,7 @@
++  *              that maintains the kernel's RARP cache.  It is derived
++  *              from Fred N. van Kempen's arp command.
++  *
++- * Version:	$Id: rarp.c,v 1.6 2001/04/08 17:05:05 pb Exp $
+++ * Version:	$Id: rarp.c,v 1.9 2007/12/02 02:19:52 ecki Exp $
++  *
++  * Usage:       rarp -d hostname                      Delete entry
++  *              rarp -s hostname ethernet_address     Add entry
++@@ -40,6 +40,7 @@
++ #include "net-support.h"
++ #include "version.h"
++ #include "pathnames.h"
+++#include "proc.h"
++ 
++ static char no_rarp_message[] = N_("This kernel does not support RARP.\n");
++ 
++@@ -154,7 +155,7 @@ static int rarp_file(int fd, const char 
++ 
++ static int display_cache(void)
++ {
++-    FILE *fd = fopen(_PATH_PROCNET_RARP, "r");
+++    FILE *fd = proc_fopen(_PATH_PROCNET_RARP);
++     char buffer[256];
++     if (fd == NULL) {
++ 	if (errno == ENOENT)
+--- net-tools-1.60.orig/debian/patches/CVS-20081003-statistics.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20081003-statistics.c_sync.patch
+@@ -0,0 +1,385 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.21 - Fri Oct 3 00:05:20 2008 UTC by ecki
++Enable netstat -s for IPv6 (Debian Bug #453859 from Varun Chandramohan)
++
++Revision 1.20 - Sat Dec 1 18:44:56 2007 UTC by ecki
++Faster pagesize aligned fopen for netstat -s (Eric Dumazet)
++
++Revision 1.19 - Sat Dec 1 18:29:05 2007 UTC by ecki
++Better netstat -s error handling and larger buffers
++
++Revision 1.18 - Wed Feb 12 03:30:57 2003 UTC by ak
++Add text for two new TCP statistics and fix some existing descriptions
++
++Revision 1.17 - Sun Apr 28 15:41:01 2002 UTC by ak
++Fix some counter descriptions.  Noted by Jamal Hadi.
++
++Revision 1.16 - Wed Oct 24 11:57:05 2001 UTC by ak
++(Finally) update netstat -s for 2.4 statistics.
++
++Revision 1.15 - Fri Oct 19 09:28:01 2001 UTC by ak
++Only print unknown statistics when their counter is > 0.
++
++Index: net-tools/statistics.c
++===================================================================
++--- net-tools.orig/statistics.c
+++++ net-tools/statistics.c
++@@ -1,6 +1,6 @@
++ /*
++  * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL. 
++- * $Id: statistics.c,v 1.14 2001/02/02 18:01:23 pb Exp $
+++ * $Id: statistics.c,v 1.21 2008/10/03 00:05:20 ecki Exp $
++  * 19980630 - i18n - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 
++  * 19981113 - i18n fixes - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 
++  * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels 
++@@ -11,6 +11,7 @@
++ #include <string.h>
++ #include "config.h"
++ #include "intl.h"
+++#include "proc.h"
++ 
++ /* #define WARN 1 */
++ 
++@@ -83,6 +84,32 @@ struct entry Iptab[] =
++     {"FragCreates", N_("%u fragments created"), opt_number}
++ };
++ 
+++struct entry Ip6tab[] =
+++{
+++    {"Ip6InReceives", N_("%u total packets received"), number},
+++    {"Ip6InHdrErrors", N_("%u with invalid headers"), opt_number},
+++    {"Ip6InTooBigErrors", N_("%u with packets too big"), opt_number},
+++    {"Ip6InNoRoutes", N_("%u incoming packets with no route"), opt_number},
+++    {"Ip6InAddrErrors", N_("%u with invalid addresses"), opt_number},
+++    {"Ip6InUnknownProtos", N_("%u with unknown protocol"), opt_number},
+++    {"Ip6InTruncatedPkts", N_("%u with truncated packets"), opt_number},
+++    {"Ip6InDiscards", N_("%u incoming packets discarded"), number},
+++    {"Ip6InDelivers", N_("%u incoming packets delivered"), number},
+++    {"Ip6OutForwDatagrams", N_("%u forwarded"), number},
+++    {"Ip6OutRequests", N_("%u requests sent out"), number},     /*? */
+++    {"Ip6OutDiscards", N_("%u outgoing packets dropped"), opt_number},
+++    {"Ip6OutNoRoutes", N_("%u dropped because of missing route"), opt_number},
+++    {"Ip6ReasmTimeout", N_("%u fragments dropped after timeout"), opt_number},
+++    {"Ip6ReasmReqds", N_("%u reassemblies required"), opt_number}, /* ? */
+++    {"Ip6ReasmOKs", N_("%u packets reassembled ok"), opt_number},
+++    {"Ip6ReasmFails", N_("%u packet reassembles failed"), opt_number},
+++    {"Ip6FragOKs", N_("%u fragments received ok"), opt_number},
+++    {"Ip6FragFails", N_("%u fragments failed"), opt_number},
+++    {"Ip6FragCreates", N_("%u fragments created"), opt_number},
+++    {"Ip6InMcastPkts", N_("%u incoming multicast packets"), opt_number},
+++    {"Ip6OutMcastPkts", N_("%u outgoing multicast packets"), opt_number}
+++};
+++
++ struct entry Icmptab[] =
++ {
++     {"InMsgs", N_("%u ICMP messages received"), number},
++@@ -113,6 +140,41 @@ struct entry Icmptab[] =
++     {"OutAddrMaskReps", N_("address mask replies: %u"), i_outp_icmp | I_TITLE},
++ };
++ 
+++struct entry Icmp6tab[] =
+++{
+++    {"Icmp6InMsgs", N_("%u ICMP messages received"), number},
+++    {"Icmp6InErrors", N_("%u input ICMP message failed."), number},
+++    {"Icmp6InDestUnreachs", N_("destination unreachable: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InPktTooBigs", N_("packets too big: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InTimeExcds", N_("received ICMPv6 time exceeded: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InParmProblems", N_("parameter problem: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InEchos", N_("echo requests: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InEchoReplies", N_("echo replies: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InGroupMembQueries", N_("group member queries: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InGroupMembResponses", N_("group member responses: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InGroupMembReductions", N_("group member reductions: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InRouterSolicits", N_("router solicits: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InRouterAdvertisements", N_("router advertisement: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InNeighborSolicits", N_("neighbour solicits: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InNeighborAdvertisements", N_("neighbour advertisement: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6InRedirects", N_("redirects: %u"), i_inp_icmp | I_TITLE},
+++    {"Icmp6OutMsgs", N_("%u ICMP messages sent"), number},
+++    {"Icmp6OutDestUnreachs", N_("destination unreachable: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutPktTooBigs", N_("packets too big: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutTimeExcds", N_("sent ICMPv6 time exceeded: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutParmProblems", N_("parameter problem: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutEchos", N_("echo requests: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutEchoReplies", N_("echo replies: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutGroupMembQueries", N_("group member queries: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutGroupMembResponses", N_("group member responses: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutGroupMembReductions", N_("group member reductions: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutRouterSolicits", N_("router solicits: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutRouterAdvertisements ", N_("router advertisement: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutNeighborSolicits", N_("neighbor solicits: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutNeighborAdvertisements", N_("neighbor advertisements: %u"), i_outp_icmp | I_TITLE},
+++    {"Icmp6OutRedirects", N_("redirects: %u"), i_outp_icmp | I_TITLE},
+++};
+++
++ struct entry Tcptab[] =
++ {
++     {"RtoAlgorithm", N_("RTO algorithm is %s"), i_rto_alg | I_STATIC},
++@@ -139,6 +201,14 @@ struct entry Udptab[] =
++     {"OutDatagrams", N_("%u packets sent"), number},
++ };
++ 
+++struct entry Udp6tab[] =
+++{
+++    {"Udp6InDatagrams", N_("%u packets received"), number},
+++    {"Udp6NoPorts", N_("%u packets to unknown port received."), number},
+++    {"Udp6InErrors", N_("%u packet receive errors"), number},
+++    {"Udp6OutDatagrams", N_("%u packets sent"), number},
+++};
+++
++ struct entry Tcpexttab[] =
++ {
++     {"SyncookiesSent", N_("%u SYN cookies sent"), opt_number},
++@@ -172,19 +242,59 @@ struct entry Tcpexttab[] =
++     { "DelayedACKLost", N_("Quick ack mode was activated %u times"), opt_number },
++     { "ListenOverflows", N_("%u times the listen queue of a socket overflowed"),
++       opt_number },
++-    { "ListenDrops", N_("%u SYNs to LISTEN sockets ignored"), opt_number },
+++    { "ListenDrops", N_("%u SYNs to LISTEN sockets dropped"), opt_number },
++     { "TCPPrequeued", N_("%u packets directly queued to recvmsg prequeue."), 
++       opt_number },
++-    { "TCPDirectCopyFromBacklog", N_("%u packets directly received"
++-				     " from backlog"), opt_number },
++-    { "TCPDirectCopyFromPrequeue", N_("%u packets directly received"
++-				      " from prequeue"), opt_number },
+++    { "TCPDirectCopyFromBacklog", N_("%u bytes directly in process context from backlog"), opt_number },
+++    { "TCPDirectCopyFromPrequeue", N_("%u bytes directly received in process context from prequeue"),
+++				      opt_number },
++     { "TCPPrequeueDropped", N_("%u packets dropped from prequeue"), opt_number },
++-    { "TCPHPHits", N_("%u packets header predicted"), number },
+++    { "TCPHPHits", N_("%u packet headers predicted"), number },
++     { "TCPHPHitsToUser", N_("%u packets header predicted and "
++ 			    "directly queued to user"), opt_number },
++     { "SockMallocOOM", N_("Ran %u times out of system memory during " 
++ 			  "packet sending"), opt_number }, 
+++    { "TCPPureAcks", N_("%u acknowledgments not containing data payload received"), opt_number },
+++    { "TCPHPAcks", N_("%u predicted acknowledgments"), opt_number },
+++    { "TCPRenoRecovery", N_("%u times recovered from packet loss due to fast retransmit"), opt_number },
+++    { "TCPSackRecovery", N_("%u times recovered from packet loss by selective acknowledgements"), opt_number },
+++    { "TCPSACKReneging", N_("%u bad SACK blocks received"), opt_number },
+++    { "TCPFACKReorder", N_("Detected reordering %u times using FACK"), opt_number },
+++    { "TCPSACKReorder", N_("Detected reordering %u times using SACK"), opt_number },
+++    { "TCPTSReorder", N_("Detected reordering %u times using time stamp"), opt_number },
+++    { "TCPRenoReorder", N_("Detected reordering %u times using reno fast retransmit"), opt_number },
+++    { "TCPFullUndo", N_("%u congestion windows fully recovered without slow start"), opt_number }, 
+++    { "TCPPartialUndo", N_("%u congestion windows partially recovered using Hoe heuristic"), opt_number },
+++    { "TCPDSackUndo", N_("%u congestion window recovered without slow start using DSACK"), opt_number },
+++    { "TCPLossUndo", N_("%u congestion windows recovered without slow start after partial ack"), opt_number },
+++    { "TCPLostRetransmits", N_("%u retransmits lost"), opt_number },
+++    { "TCPRenoFailures",  N_("%u timeouts after reno fast retransmit"), opt_number },
+++    { "TCPSackFailures",  N_("%u timeouts after SACK recovery"), opt_number },
+++    { "TCPLossFailures",  N_("%u timeouts in loss state"), opt_number },
+++    { "TCPFastRetrans", N_("%u fast retransmits"), opt_number },
+++    { "TCPForwardRetrans", N_("%u forward retransmits"), opt_number }, 
+++    { "TCPSlowStartRetrans", N_("%u retransmits in slow start"), opt_number },
+++    { "TCPTimeouts", N_("%u other TCP timeouts"), opt_number },
+++    { "TCPRenoRecoveryFailed", N_("%u reno fast retransmits failed"), opt_number },
+++    { "TCPSackRecoveryFail", N_("%u SACK retransmits failed"), opt_number },
+++    { "TCPSchedulerFailed", N_("%u times receiver scheduled too late for direct processing"), opt_number },
+++    { "TCPRcvCollapsed", N_("%u packets collapsed in receive queue due to low socket buffer"), opt_number },
+++    { "TCPDSACKOldSent", N_("%u DSACKs sent for old packets"), opt_number },
+++    { "TCPDSACKOfoSent", N_("%u DSACKs sent for out of order packets"), opt_number },
+++    { "TCPDSACKRecv", N_("%u DSACKs received"), opt_number },
+++    { "TCPDSACKOfoRecv", N_("%u DSACKs for out of order packets received"), opt_number },
+++    { "TCPAbortOnSyn", N_("%u connections reset due to unexpected SYN"), opt_number },
+++    { "TCPAbortOnData", N_("%u connections reset due to unexpected data"), opt_number },
+++    { "TCPAbortOnClose", N_("%u connections reset due to early user close"), opt_number },
+++    { "TCPAbortOnMemory", N_("%u connections aborted due to memory pressure"), opt_number },
+++    { "TCPAbortOnTimeout", N_("%u connections aborted due to timeout"), opt_number },
+++    { "TCPAbortOnLinger", N_("%u connections aborted after user close in linger timeout"), opt_number },
+++    { "TCPAbortFailed", N_("%u times unabled to send RST due to no memory"), opt_number }, 
+++    { "TCPMemoryPressures", N_("TCP ran low on memory %u times"), opt_number }, 
+++    { "TCPLoss", N_("%u TCP data loss events"), opt_number },
+++    { "TCPDSACKUndo", N_("%u congestion windows recovered without slow start by DSACK"), 
+++	opt_number },
+++    { "TCPRenoRecoveryFail", N_("%u classic Reno fast retransmits failed"), opt_number },
++ };
++ 
++ struct tabtab {
++@@ -204,6 +314,15 @@ struct tabtab snmptabs[] =
++     {NULL}
++ };
++ 
+++struct tabtab snmp6tabs[] =
+++{
+++    {"Ip6", Ip6tab, sizeof(Ip6tab), &f_raw},
+++    {"Icmp6", Icmp6tab, sizeof(Icmp6tab), &f_raw},
+++    {"Udp6", Udp6tab, sizeof(Udp6tab), &f_udp},
+++    {"Tcp6", Tcptab, sizeof(Tcptab), &f_tcp},
+++    {NULL}
+++};
+++
++ /* XXX IGMP */
++ 
++ int cmpentries(const void *a, const void *b)
++@@ -222,7 +341,8 @@ void printval(struct tabtab *tab, char *
++ 	    ent = bsearch(&key, tab->tab, tab->size / sizeof(struct entry),
++ 			  sizeof(struct entry), cmpentries);
++     if (!ent) {			/* try our best */
++-	printf("%*s%s: %d\n", states[state].indent, "", title, val);
+++	if (val) 
+++		printf("%*s%s: %d\n", states[state].indent, "", title, val);
++ 	return;
++     }
++     type = ent->type;
++@@ -289,14 +409,17 @@ struct tabtab *newtable(struct tabtab *t
++ 	return &dummytab;
++ }
++ 
++-void process_fd(FILE *f)
+++int process_fd(FILE *f, int all, char *filter)
++ {
++-    char buf1[1024], buf2[1024];
+++    char buf1[2048], buf2[2048];
++     char *sp, *np, *p;
++     while (fgets(buf1, sizeof buf1, f)) {
++ 	int endflag;
++ 	struct tabtab *tab;
++ 
+++        if (buf1[0] == '\n') // skip empty first line in 2.6 kernels
+++            continue;
+++            
++ 	if (!fgets(buf2, sizeof buf2, f))
++ 	    break;
++ 	sp = strchr(buf1, ':');
++@@ -305,6 +428,10 @@ void process_fd(FILE *f)
++ 	    goto formaterr;
++ 	*sp = '\0';
++ 
+++        if (!all)
+++           if (strncmp(buf1, filter, strlen(filter)))
+++               continue;
+++
++ 	tab = newtable(snmptabs, buf1);
++ 	if (tab == NULL) {
++ 		printf("unknown %s\n", buf1);
++@@ -330,13 +457,47 @@ void process_fd(FILE *f)
++ 	    sp = p + 1;
++ 	}
++     }
++-  return;
+++  return 0;
++   
++ formaterr:
++-  perror(_("error parsing /proc/net/snmp"));
++-  return;
+++  return -1;
+++}
+++
+++void cpytitle(char *original, char *new)
+++{
+++     char *ptr = original;
+++     while(*ptr != '6' && *ptr != '\0') {
+++           *new = *ptr;
+++            new++;
+++            ptr++;
+++     }
+++    *new = *ptr;
+++    new++;
+++    *new = '\0';
++ }
++ 
+++void process6_fd(FILE *f)
+++{
+++   char buf1[1024],buf2[50],buf3[1024];
+++   unsigned long val;
+++   struct tabtab *tab = NULL;
+++   int cpflg = 0;
+++
+++   while (fgets(buf1, sizeof buf1, f)) {
+++          sscanf(buf1, "%s %lu", buf2, &val);
+++          if(!cpflg) {
+++             cpytitle(buf2, buf3);
+++             tab = newtable(snmp6tabs, buf3);
+++             cpflg = 1;
+++          }
+++          if(!strstr(buf2, buf3)) {
+++             cpytitle(buf2, buf3);
+++             tab = newtable(snmp6tabs, buf3);
+++          }
+++          printval(tab, buf2, val);
+++   }
+++
+++}
++ 
++ void parsesnmp(int flag_raw, int flag_tcp, int flag_udp)
++ {
++@@ -344,22 +505,25 @@ void parsesnmp(int flag_raw, int flag_tc
++ 
++     f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp;
++     
++-    f = fopen("/proc/net/snmp", "r");
+++    f = proc_fopen("/proc/net/snmp");
++     if (!f) {
++ 	perror(_("cannot open /proc/net/snmp"));
++ 	return;
++     }
++-    process_fd(f);
+++
+++    if (process_fd(f, 1, NULL) < 0)
+++      fprintf(stderr, _("Problem while parsing /proc/net/snmp\n"));
++ 
++     if (ferror(f))
++ 	perror("/proc/net/snmp");
++ 
++     fclose(f);
++ 
++-    f = fopen("/proc/net/netstat", "r");
+++    f = proc_fopen("/proc/net/netstat");
++ 
++     if (f) {
++-    	process_fd(f);
+++    	if (process_fd(f, 1, NULL) <0)
+++          fprintf(stderr, _("Problem while parsing /proc/net/netstat\n"));
++ 
++         if (ferror(f))
++ 	    perror("/proc/net/netstat");
++@@ -369,6 +533,33 @@ void parsesnmp(int flag_raw, int flag_tc
++     return;
++ }
++     
+++void parsesnmp6(int flag_raw, int flag_tcp, int flag_udp)
+++{
+++    FILE *f;
+++
+++    f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp;
+++
+++    f = fopen("/proc/net/snmp6", "r");
+++    if (!f) {
+++        perror(_("cannot open /proc/net/snmp6"));
+++        return;
+++    }
+++    process6_fd(f);
+++    if (ferror(f))
+++        perror("/proc/net/snmp6");
+++
+++    fclose(f);
+++    f = fopen("/proc/net/snmp", "r");
+++    if (!f) {
+++        perror(_("cannot open /proc/net/snmp"));
+++        return;
+++    }
+++    process_fd(f, 0, "Tcp");
+++    if (ferror(f))
+++        perror("/proc/net/snmp");
+++
+++    fclose(f);
+++}
++ 
++ void inittab(void)
++ {
++@@ -379,3 +570,13 @@ void inittab(void)
++ 	qsort(t->tab, t->size / sizeof(struct entry),
++ 	      sizeof(struct entry), cmpentries);
++ }
+++
+++void inittab6(void)
+++{
+++    struct tabtab *t;
+++
+++    for (t = snmp6tabs; t->title; t++)
+++        qsort(t->tab, t->size / sizeof(struct entry),
+++              sizeof(struct entry), cmpentries);
+++}
+++
+--- net-tools-1.60.orig/debian/patches/CVS-20051204-arp.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20051204-arp.c_sync.patch
+@@ -0,0 +1,311 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.25 - Sun Dec 4 02:57:15 2005 UTC by ecki
++In order to fix alignment bugs with recent GCCs I have to use
++sockaddr_storage instead of sockaddr for allocation.
++http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340384
++Thanks to Blars Blarson, Jurij Smakov and Steve Langasek
++
++Revision 1.24 - Mon May 16 04:30:17 2005 UTC by ecki
++desupport dontpub in arp.8 and arp -? (Debian Bug #203396)
++
++Revision 1.23 - Sat Feb 8 19:56:25 2003 UTC by ecki
++fixed an logic error in the "not found" handling for deleting entries
++also added a documentation comment and newer errno values for 2.4
++Thanks to niteowl@intrinsity.com for pointing out.
++
++Revision 1.22 - Tue Dec 10 01:01:24 2002 UTC by ecki
++change confusing "*" into "<from_interface>"
++
++Revision 1.21 - Sun May 6 02:14:07 2001 UTC by ecki
++changed a type arp -a now prints PUB instead of PUP for proxy arp entries
++
++Index: net-tools/arp.c
++===================================================================
++--- net-tools.orig/arp.c
+++++ net-tools/arp.c
++@@ -8,7 +8,7 @@
++  *              NET-3 Networking Distribution for the LINUX operating
++  *              system.
++  *
++- * Version:     $Id: arp.c,v 1.20 2001/04/08 17:05:05 pb Exp $
+++ * Version:     $Id: arp.c,v 1.25 2005/12/04 02:57:15 ecki Exp $
++  *
++  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
++  *
++@@ -100,9 +100,10 @@ static int arp_del(char **args)
++ {
++     char host[128];
++     struct arpreq req;
++-    struct sockaddr sa;
+++    struct sockaddr_storage ss;
+++    struct sockaddr *sa;
++     int flags = 0;
++-    int err;
+++    int deleted = 0;
++ 
++     memset((char *) &req, 0, sizeof(req));
++ 
++@@ -112,12 +113,13 @@ static int arp_del(char **args)
++ 	return (-1);
++     }
++     safe_strncpy(host, *args, (sizeof host));
++-    if (ap->input(0, host, &sa) < 0) {
+++    sa = (struct sockaddr *)&ss;
+++    if (ap->input(0, host, sa) < 0) {
++ 	ap->herror(host);
++ 	return (-1);
++     }
++     /* If a host has more than one address, use the correct one! */
++-    memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr));
+++    memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr));
++ 
++     if (hw_set)
++ 	req.arp_ha.sa_family = hw->type;
++@@ -148,7 +150,7 @@ static int arp_del(char **args)
++ 	    continue;
++ 	}
++ 	if (!strcmp(*args, "dontpub")) {
++-#ifdef HAVE_ATF_DONTPUB
+++#ifdef ATF_DONTPUB
++ 	    req.arp_flags |= ATF_DONTPUB;
++ #else
++ 	    ENOSUPP("arp", "ATF_DONTPUB");
++@@ -157,7 +159,7 @@ static int arp_del(char **args)
++ 	    continue;
++ 	}
++ 	if (!strcmp(*args, "auto")) {
++-#ifdef HAVE_ATF_MAGIC
+++#ifdef ATF_MAGIC
++ 	    req.arp_flags |= ATF_MAGIC;
++ #else
++ 	    ENOSUPP("arp", "ATF_MAGIC");
++@@ -177,11 +179,11 @@ static int arp_del(char **args)
++ 		usage();
++ 	    if (strcmp(*args, "255.255.255.255") != 0) {
++ 		strcpy(host, *args);
++-		if (ap->input(0, host, &sa) < 0) {
+++		if (ap->input(0, host, sa) < 0) {
++ 		    ap->herror(host);
++ 		    return (-1);
++ 		}
++-		memcpy((char *) &req.arp_netmask, (char *) &sa,
+++		memcpy((char *) &req.arp_netmask, (char *) sa,
++ 		       sizeof(struct sockaddr));
++ 		req.arp_flags |= ATF_NETMASK;
++ 	    }
++@@ -190,35 +192,41 @@ static int arp_del(char **args)
++ 	}
++ 	usage();
++     }
+++
+++    // if neighter priv nor pub is given, work on both
++     if (flags == 0)
++ 	flags = 3;
++ 
++     strcpy(req.arp_dev, device);
++ 
++-    err = -1;
+++    /* unfortuatelly the kernel interface does not allow us to
+++       delete private entries anlone, so we need this hack
+++       to avoid "not found" errors if we try both. */
+++    deleted = 0;
++ 
++     /* Call the kernel. */
++     if (flags & 2) {
++ 	if (opt_v)
++-	    fprintf(stderr, "arp: SIOCDARP(nopub)\n");
++-	if ((err = ioctl(sockfd, SIOCDARP, &req) < 0)) {
++-	    if (errno == ENXIO) {
+++	    fprintf(stderr, "arp: SIOCDARP(dontpub)\n");
+++	if (ioctl(sockfd, SIOCDARP, &req) < 0) {
+++	    if ((errno == ENXIO) || (errno == ENOENT)) {
++ 		if (flags & 1)
++-		    goto nopub;
+++		    goto dontpub;
++ 		printf(_("No ARP entry for %s\n"), host);
++ 		return (-1);
++ 	    }
++-	    perror("SIOCDARP(priv)");
+++	    perror("SIOCDARP(dontpub)");
++ 	    return (-1);
++-	}
+++	} else
+++	  deleted = 1;
++     }
++-    if ((flags & 1) && (err)) {
++-      nopub:
+++    if (!deleted && (flags & 1)) {
+++      dontpub:
++ 	req.arp_flags |= ATF_PUBL;
++ 	if (opt_v)
++ 	    fprintf(stderr, "arp: SIOCDARP(pub)\n");
++ 	if (ioctl(sockfd, SIOCDARP, &req) < 0) {
++-	    if (errno == ENXIO) {
+++	    if ((errno == ENXIO) || (errno == ENOENT)) {
++ 		printf(_("No ARP entry for %s\n"), host);
++ 		return (-1);
++ 	    }
++@@ -260,7 +268,8 @@ static int arp_set(char **args)
++ {
++     char host[128];
++     struct arpreq req;
++-    struct sockaddr sa;
+++    struct sockaddr_storage ss;
+++    struct sockaddr *sa;
++     int flags;
++ 
++     memset((char *) &req, 0, sizeof(req));
++@@ -271,12 +280,13 @@ static int arp_set(char **args)
++ 	return (-1);
++     }
++     safe_strncpy(host, *args++, (sizeof host));
++-    if (ap->input(0, host, &sa) < 0) {
+++    sa = (struct sockaddr *)&ss;
+++    if (ap->input(0, host, sa) < 0) {
++ 	ap->herror(host);
++ 	return (-1);
++     }
++     /* If a host has more than one address, use the correct one! */
++-    memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr));
+++    memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr));
++ 
++     /* Fetch the hardware address. */
++     if (*args == NULL) {
++@@ -317,7 +327,7 @@ static int arp_set(char **args)
++ 	    continue;
++ 	}
++ 	if (!strcmp(*args, "dontpub")) {
++-#ifdef HAVE_ATF_DONTPUB
+++#ifdef ATF_DONTPUB
++ 	    flags |= ATF_DONTPUB;
++ #else
++ 	    ENOSUPP("arp", "ATF_DONTPUB");
++@@ -326,7 +336,7 @@ static int arp_set(char **args)
++ 	    continue;
++ 	}
++ 	if (!strcmp(*args, "auto")) {
++-#ifdef HAVE_ATF_MAGIC
+++#ifdef ATF_MAGIC
++ 	    flags |= ATF_MAGIC;
++ #else
++ 	    ENOSUPP("arp", "ATF_MAGIC");
++@@ -346,11 +356,11 @@ static int arp_set(char **args)
++ 		usage();
++ 	    if (strcmp(*args, "255.255.255.255") != 0) {
++ 		strcpy(host, *args);
++-		if (ap->input(0, host, &sa) < 0) {
+++		if (ap->input(0, host, sa) < 0) {
++ 		    ap->herror(host);
++ 		    return (-1);
++ 		}
++-		memcpy((char *) &req.arp_netmask, (char *) &sa,
+++		memcpy((char *) &req.arp_netmask, (char *) sa,
++ 		       sizeof(struct sockaddr));
++ 		flags |= ATF_NETMASK;
++ 	    }
++@@ -445,11 +455,11 @@ static void arp_disp_2(char *name, int t
++ 	strcat(flags, "M");
++     if (arp_flags & ATF_PUBL)
++ 	strcat(flags, "P");
++-#ifdef HAVE_ATF_MAGIC
+++#ifdef ATF_MAGIC
++     if (arp_flags & ATF_MAGIC)
++ 	strcat(flags, "A");
++ #endif
++-#ifdef HAVE_ATF_DONTPUB
+++#ifdef ATF_DONTPUB
++     if (arp_flags & ATF_DONTPUB)
++ 	strcat(flags, "!");
++ #endif
++@@ -463,7 +473,7 @@ static void arp_disp_2(char *name, int t
++ 
++     if (!(arp_flags & ATF_COM)) {
++ 	if (arp_flags & ATF_PUBL)
++-	    printf("%-8.8s%-20.20s", "*", "*");
+++	    printf("%-8.8s%-20.20s", "*", _("<from_interface>"));
++ 	else
++ 	    printf("%-8.8s%-20.20s", "", _("(incomplete)"));
++     } else {
++@@ -486,7 +496,7 @@ static void arp_disp(char *name, char *i
++ 
++     if (!(arp_flags & ATF_COM)) {
++ 	if (arp_flags & ATF_PUBL)
++-	    printf("* ");
+++	    printf("<from_interface> ");
++ 	else
++ 	    printf(_("<incomplete> "));
++     } else {
++@@ -499,12 +509,12 @@ static void arp_disp(char *name, char *i
++     if (arp_flags & ATF_PERM)
++ 	printf("PERM ");
++     if (arp_flags & ATF_PUBL)
++-	printf("PUP ");
++-#ifdef HAVE_ATF_MAGIC
+++	printf("PUB ");
+++#ifdef ATF_MAGIC
++     if (arp_flags & ATF_MAGIC)
++ 	printf("AUTO ");
++ #endif
++-#ifdef HAVE_ATF_DONTPUB
+++#ifdef ATF_DONTPUB
++     if (arp_flags & ATF_DONTPUB)
++ 	printf("DONTPUB ");
++ #endif
++@@ -519,7 +529,8 @@ static void arp_disp(char *name, char *i
++ static int arp_show(char *name)
++ {
++     char host[100];
++-    struct sockaddr sa;
+++    struct sockaddr_storage ss;
+++    struct sockaddr *sa;
++     char ip[100];
++     char hwa[100];
++     char mask[100];
++@@ -532,14 +543,15 @@ static int arp_show(char *name)
++ 
++     host[0] = '\0';
++ 
+++    sa = (struct sockaddr *)&ss;
++     if (name != NULL) {
++ 	/* Resolve the host name. */
++ 	safe_strncpy(host, name, (sizeof host));
++-	if (ap->input(0, host, &sa) < 0) {
+++	if (ap->input(0, host, sa) < 0) {
++ 	    ap->herror(host);
++ 	    return (-1);
++ 	}
++-	safe_strncpy(host, ap->sprint(&sa, 1), sizeof(host));
+++	safe_strncpy(host, ap->sprint(sa, 1), sizeof(host));
++     }
++     /* Open the PROCps kernel table. */
++     if ((fp = fopen(_PATH_PROCNET_ARP, "r")) == NULL) {
++@@ -575,10 +587,10 @@ static int arp_show(char *name)
++ 	    if (opt_n)
++ 		hostname = "?";
++ 	    else {
++-		if (ap->input(0, ip, &sa) < 0)
+++		if (ap->input(0, ip, sa) < 0)
++ 		    hostname = ip;
++ 		else
++-		    hostname = ap->sprint(&sa, opt_n | 0x8000);
+++		    hostname = ap->sprint(sa, opt_n | 0x8000);
++ 		if (strcmp(hostname, ip) == 0)
++ 		    hostname = "?";
++ 	    }
++@@ -612,11 +624,10 @@ static void version(void)
++ static void usage(void)
++ {
++     fprintf(stderr, _("Usage:\n  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP cache\n"));
++-    fprintf(stderr, _("  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP entry\n"));
++-    fprintf(stderr, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from file\n"));
++-    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add entry\n"));
++-    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  <-''-\n"));
++-    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      <-''-\n\n"));
+++    fprintf(stderr, _("  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP entry\n"));
+++    fprintf(stderr, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from file\n"));
+++    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add entry\n"));
+++    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          <-''-\n\n"));
++     
++     fprintf(stderr, _("        -a                       display (all) hosts in alternative (BSD) style\n"));
++     fprintf(stderr, _("        -s, --set                set a new ARP entry\n"));
+--- net-tools-1.60.orig/debian/patches/CVS-20081002-ifconfig.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20081002-ifconfig.c_sync.patch
+@@ -0,0 +1,379 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.58 - Thu Oct 2 23:31:04 2008 UTC by ecki
++Avoid segfault of ifconfig(8) on missing /proc/net/dev
++(Debian Bug #222209 Pierre Lombard, Tollef Fog Heen)
++
++Revision 1.57 - Tue Dec 10 00:56:41 2002 UTC by ecki
++- change columns of netstat -i/ifconfig -s to avoid run-into (Stefan Illner)
++- prevent segfault on protocol families without host error member
++- use /128 as default prefix if not specified instead of /0
++
++Revision 1.56 - Fri Jul 5 17:36:02 2002 UTC by ecki
++Jack Bloch noticed that the hw comamnd of ifconfig returns a
++confusing -EBUSY if interface is up (on lkml).
++
++Revision 1.55 - Wed Jul 3 23:40:47 2002 UTC by ecki
++there is no such thing as -i option for ifconfig
++removed variable, fixed usage, added options to english man page
++
++Revision 1.54 - Thu Nov 1 03:00:13 2001 UTC by ecki
++delay the setting of netmask derived from /mask after setting address
++(Debian Bug #116573 reported by Brian Warner)
++
++Revision 1.53 - Thu Nov 1 01:54:49 2001 UTC by ecki
++minor fix to return E_USAGE on -V instead of exit(0);
++
++Revision 1.52 - Thu Nov 1 01:48:31 2001 UTC by ecki
++failed to set error flag if netmask setting reported an error
++(Debian Bug #117837 reported by Sam Clegg)
++
++Revision 1.51 - Fri Jun 29 03:48:51 2001 UTC by ecki
++this will check after clearing a flag, that it is indeed cleared. it will
++also be a bit more verbose and precise on errors. See Debian Bug #102474
++
++Index: net-tools/ifconfig.c
++===================================================================
++--- net-tools.orig/ifconfig.c
+++++ net-tools/ifconfig.c
++@@ -3,7 +3,7 @@
++  *              that either displays or sets the characteristics of
++  *              one or more of the system's networking interfaces.
++  *
++- * Version:     $Id: ifconfig.c,v 1.50 2001/04/13 18:25:18 pb Exp $
+++ * Version:     $Id: ifconfig.c,v 1.58 2008/10/02 23:31:04 ecki Exp $
++  *
++  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++  *              and others.  Copyright 1993 MicroWalt Corporation
++@@ -88,7 +88,6 @@ struct in6_ifreq {
++ char *Release = RELEASE, *Version = "ifconfig 1.42 (2001-04-13)";
++ 
++ int opt_a = 0;			/* show all interfaces          */
++-int opt_i = 0;			/* show the statistics          */
++ int opt_v = 0;			/* debugging output flag        */
++ 
++ int addr_family = 0;		/* currently selected AF        */
++@@ -105,7 +104,7 @@ static int if_print(char *ifname)
++     int res;
++ 
++     if (ife_short)
++-	printf(_("Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
+++	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
++ 
++     if (!ifname) {
++ 	res = for_all_interfaces(do_if_print, &opt_a);
++@@ -113,6 +112,9 @@ static int if_print(char *ifname)
++ 	struct interface *ife;
++ 
++ 	ife = lookup_interface(ifname);
+++	if (!ife) {
+++		return -1;
+++	}
++ 	res = do_if_fetch(ife); 
++ 	if (res >= 0) 
++ 	    ife_print(ife);
++@@ -127,7 +129,7 @@ static int set_flag(char *ifname, short 
++ 
++     safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
++     if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) {
++-	fprintf(stderr, _("%s: unknown interface: %s\n"), 
+++	fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), 
++ 		ifname,	strerror(errno));
++ 	return (-1);
++     }
++@@ -159,7 +161,7 @@ static int clr_flag(char *ifname, short 
++ 
++     safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
++     if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
++-	fprintf(stderr, _("%s: unknown interface: %s\n"), 
+++	fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), 
++ 		ifname, strerror(errno));
++ 	return -1;
++     }
++@@ -172,9 +174,35 @@ static int clr_flag(char *ifname, short 
++     return (0);
++ }
++ 
+++/** test is a specified flag is set */
+++static int test_flag(char *ifname, short flags)
+++{
+++    struct ifreq ifr;
+++    int fd;
+++
+++    if (strchr(ifname, ':')) {
+++        /* This is a v4 alias interface.  Downing it via a socket for
+++	   another AF may have bad consequences. */
+++        fd = get_socket_for_af(AF_INET);
+++	if (fd < 0) {
+++	    fprintf(stderr, _("No support for INET on this system.\n"));
+++	    return -1;
+++	}
+++    } else
+++        fd = skfd;
+++
+++    safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+++    if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
+++	fprintf(stderr, _("%s: ERROR while testing interface flags: %s\n"), 
+++		ifname, strerror(errno));
+++	return -1;
+++    }
+++    return (ifr.ifr_flags & flags);
+++}
+++
++ static void usage(void)
++ {
++-    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"));
+++    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"));
++ #if HAVE_AFINET
++     fprintf(stderr, _("  [add <address>[/<prefixlen>]]\n"));
++     fprintf(stderr, _("  [del <address>[/<prefixlen>]]\n"));
++@@ -208,7 +236,7 @@ static void usage(void)
++ static void version(void)
++ {
++     fprintf(stderr, "%s\n%s\n", Release, Version);
++-    exit(0);
+++    exit(E_USAGE);
++ }
++ 
++ static int set_netmask(int skfd, struct ifreq *ifr, struct sockaddr *sa)
++@@ -222,18 +250,19 @@ static int set_netmask(int skfd, struct 
++ 		strerror(errno));
++ 	err = 1;
++     }
++-    return 0;
+++    return err;
++ }
++ 
++ int main(int argc, char **argv)
++ {
++     struct sockaddr sa;
+++    struct sockaddr samask;
++     struct sockaddr_in sin;
++     char host[128];
++     struct aftype *ap;
++     struct hwtype *hw;
++     struct ifreq ifr;
++-    int goterr = 0, didnetmask = 0;
+++    int goterr = 0, didnetmask = 0, neednetmask=0;
++     char **spp;
++     int fd;
++ #if HAVE_AFINET6
++@@ -388,6 +417,8 @@ int main(int argc, char **argv)
++ 	}
++ 	if (!strcmp(*spp, "-promisc")) {
++ 	    goterr |= clr_flag(ifr.ifr_name, IFF_PROMISC);
+++	    if (test_flag(ifr.ifr_name, IFF_PROMISC) > 0)
+++	    	fprintf(stderr, _("Warning: Interface %s still in promisc mode... maybe other application is running?\n"), ifr.ifr_name);
++ 	    spp++;
++ 	    continue;
++ 	}
++@@ -398,6 +429,8 @@ int main(int argc, char **argv)
++ 	}
++ 	if (!strcmp(*spp, "-multicast")) {
++ 	    goterr |= clr_flag(ifr.ifr_name, IFF_MULTICAST);
+++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
+++	    	fprintf(stderr, _("Warning: Interface %s still in MULTICAST mode.\n"), ifr.ifr_name);
++ 	    spp++;
++ 	    continue;
++ 	}
++@@ -408,6 +441,8 @@ int main(int argc, char **argv)
++ 	}
++ 	if (!strcmp(*spp, "-allmulti")) {
++ 	    goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI);
+++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
+++	    	fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name);
++ 	    spp++;
++ 	    continue;
++ 	}
++@@ -430,6 +465,8 @@ int main(int argc, char **argv)
++ 	if (!strcmp(*spp, "-dynamic")) {
++ 	    goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC);
++ 	    spp++;
+++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
+++	    	fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name);
++ 	    continue;
++ 	}
++ #endif
++@@ -486,6 +523,8 @@ int main(int argc, char **argv)
++ 
++ 	if (!strcmp(*spp, "-broadcast")) {
++ 	    goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST);
+++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
+++	    	fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name);
++ 	    spp++;
++ 	    continue;
++ 	}
++@@ -493,7 +532,10 @@ int main(int argc, char **argv)
++ 	    if (*++spp != NULL) {
++ 		safe_strncpy(host, *spp, (sizeof host));
++ 		if (ap->input(0, host, &sa) < 0) {
++-		    ap->herror(host);
+++		    if (ap->herror)
+++		    	ap->herror(host);
+++		    else
+++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for broadcast\n"), host);
++ 		    goterr = 1;
++ 		    spp++;
++ 		    continue;
++@@ -515,7 +557,10 @@ int main(int argc, char **argv)
++ 		usage();
++ 	    safe_strncpy(host, *spp, (sizeof host));
++ 	    if (ap->input(0, host, &sa) < 0) {
++-		ap->herror(host);
+++		    if (ap->herror)
+++		    	ap->herror(host);
+++		    else
+++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for dstaddr\n"), host);
++ 		goterr = 1;
++ 		spp++;
++ 		continue;
++@@ -535,13 +580,16 @@ int main(int argc, char **argv)
++ 		usage();
++ 	    safe_strncpy(host, *spp, (sizeof host));
++ 	    if (ap->input(0, host, &sa) < 0) {
++-		ap->herror(host);
+++		    if (ap->herror)
+++		    	ap->herror(host);
+++		    else
+++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for netmask\n"), host);
++ 		goterr = 1;
++ 		spp++;
++ 		continue;
++ 	    }
++ 	    didnetmask++;
++-	    goterr = set_netmask(ap->fd, &ifr, &sa);
+++	    goterr |= set_netmask(ap->fd, &ifr, &sa);
++ 	    spp++;
++ 	    continue;
++ 	}
++@@ -613,6 +661,8 @@ int main(int argc, char **argv)
++ 	if (!strcmp(*spp, "-pointopoint")) {
++ 	    goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT);
++ 	    spp++;
+++	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
+++	    	fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name);
++ 	    continue;
++ 	}
++ 	if (!strcmp(*spp, "pointopoint")) {
++@@ -620,7 +670,10 @@ int main(int argc, char **argv)
++ 		spp++;
++ 		safe_strncpy(host, *spp, (sizeof host));
++ 		if (ap->input(0, host, &sa)) {
++-		    ap->herror(host);
+++		    if (ap->herror)
+++		    	ap->herror(host);
+++		    else
+++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for pointopoint\n"), host);
++ 		    goterr = 1;
++ 		    spp++;
++ 		    continue;
++@@ -661,8 +714,12 @@ int main(int argc, char **argv)
++ 	    memcpy((char *) &ifr.ifr_hwaddr, (char *) &sa,
++ 		   sizeof(struct sockaddr));
++ 	    if (ioctl(skfd, SIOCSIFHWADDR, &ifr) < 0) {
++-		fprintf(stderr, "SIOCSIFHWADDR: %s\n",
++-			strerror(errno));
+++		if (errno == EBUSY)
+++			fprintf(stderr, "SIOCSIFHWADDR: %s - you may need to down the interface\n",
+++				strerror(errno));
+++		else
+++			fprintf(stderr, "SIOCSIFHWADDR: %s\n",
+++				strerror(errno));
++ 		goterr = 1;
++ 	    }
++ 	    spp++;
++@@ -681,12 +738,15 @@ int main(int argc, char **argv)
++ 			usage();
++ 		    *cp = 0;
++ 		} else {
++-		    prefix_len = 0;
+++		    prefix_len = 128;
++ 		}
++ 		safe_strncpy(host, *spp, (sizeof host));
++ 		if (inet6_aftype.input(1, host, 
++ 				       (struct sockaddr *) &sa6) < 0) {
++-		    inet6_aftype.herror(host);
+++		    if (inet6_aftype.herror)
+++		    	inet6_aftype.herror(host);
+++		    else
+++		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for add\n"), host);
++ 		    goterr = 1;
++ 		    spp++;
++ 		    continue;
++@@ -771,7 +831,7 @@ int main(int argc, char **argv)
++ 			usage();
++ 		    *cp = 0;
++ 		} else {
++-		    prefix_len = 0;
+++		    prefix_len = 128;
++ 		}
++ 		safe_strncpy(host, *spp, (sizeof host));
++ 		if (inet6_aftype.input(1, host, 
++@@ -800,6 +860,8 @@ int main(int argc, char **argv)
++ 		}
++ 		ifr6.ifr6_ifindex = ifr.ifr_ifindex;
++ 		ifr6.ifr6_prefixlen = prefix_len;
+++		if (opt_v)
+++			fprintf(stderr, "now deleting: ioctl(SIOCDIFADDR,{ifindex=%d,prefixlen=%ld})\n",ifr.ifr_ifindex,prefix_len);
++ 		if (ioctl(fd, SIOCDIFADDR, &ifr6) < 0) {
++ 		    fprintf(stderr, "SIOCDIFADDR: %s\n",
++ 			    strerror(errno));
++@@ -859,7 +921,7 @@ int main(int argc, char **argv)
++ 		    usage();
++ 		*cp = 0;
++ 	    } else {
++-		prefix_len = 0;
+++		prefix_len = 128;
++ 	    }
++ 	    safe_strncpy(host, *spp, (sizeof host));
++ 	    if (inet6_aftype.input(1, host, (struct sockaddr *) &sa6) < 0) {
++@@ -903,7 +965,7 @@ int main(int argc, char **argv)
++ 	/* FIXME: sa is too small for INET6 addresses, inet6 should use that too, 
++ 	   broadcast is unexpected */
++ 	if (ap->getmask) {
++-	    switch (ap->getmask(host, &sa, NULL)) {
+++	    switch (ap->getmask(host, &samask, NULL)) {
++ 	    case -1:
++ 		usage();
++ 		break;
++@@ -911,8 +973,8 @@ int main(int argc, char **argv)
++ 		if (didnetmask)
++ 		    usage();
++ 
++-		goterr = set_netmask(skfd, &ifr, &sa);
++-		didnetmask++;
+++		// remeber to set the netmask from samask later
+++		neednetmask = 1;
++ 		break;
++ 	    }
++ 	}
++@@ -921,9 +983,11 @@ int main(int argc, char **argv)
++ 	   exit(1);
++ 	}
++ 	if (ap->input(0, host, &sa) < 0) {
++-	    ap->herror(host);
++-	    fprintf(stderr, _("ifconfig: `--help' gives usage information.\n"));
++-	    exit(1);
+++	    if (ap->herror)
+++	    	ap->herror(host);
+++	    else
+++	    	fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name); fprintf(stderr,
+++	    _("ifconfig: `--help' gives usage information.\n")); exit(1);
++ 	}
++ 	memcpy((char *) &ifr.ifr_addr, (char *) &sa, sizeof(struct sockaddr));
++ 	{
++@@ -980,6 +1044,14 @@ int main(int argc, char **argv)
++ 	spp++;
++     }
++ 
+++    if (neednetmask) {
+++	goterr |= set_netmask(skfd, &ifr, &samask);
+++	didnetmask++;
+++    }
+++
+++    if (opt_v && goterr)
+++    	fprintf(stderr, _("WARNING: at least one error occured. (%d)\n"), goterr);
+++
++     return (goterr);
++ }
++ 
+--- net-tools-1.60.orig/debian/patches/CVS-20060927-mii-tool.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20060927-mii-tool.c_sync.patch
+@@ -0,0 +1,341 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.9 - Wed Sep 27 20:59:18 2006 UTC by ecki
++
++GigE Support by Stephen Hemminger from
++http://developer.osdl.org/shemminger/prototypes/mii-tool.tar.bz2
++with verbose register patch from Dean Gaudet
++
++Revision 1.8 - Thu Jun 3 22:18:26 2004 UTC by ecki
++
++added linebreak to  version signature
++
++Revision 1.7 - Mon Oct 20 22:22:22 2003 UTC by ecki
++make sure version string is helpful
++
++Revision 1.6 - Mon Oct 20 22:01:13 2003 UTC by ecki
++patch to recognize more hardware without MII support (from Redhat Bug#77882,
++notified by Tilmann Bubeck).
++
++Revision 1.5 - Sat Jun 28 03:19:04 2003 UTC by ecki
++Use new style MII ioctls only. This will give you a warning, if compiled
++with old kernel source tree. It will also not work if compiled with
++new source on old kernels. The new ioctls also require root for reading, the
++old didnt. This fixes Debian bug #133648. No fallback compatibility
++is included for reasons of cleaner source.
++
++Revision 1.4 - Wed May 28 19:41:16 2003 UTC by ecki
++make it compile on stricter gcc3.3
++
++Revision 1.3 - Sun Sep 15 00:25:14 2002 UTC by ecki
++Implemented the Sean Reifenschneider suggested fflush() to the --watch
++function of mii-tool.
++
++Revision 1.2 - Fri Jun 14 01:08:20 2002 UTC by ecki
++this fixes segfault on -A "" and -F "" in mii-tool reported in debian
++bug #139027
++
++Index: net-tools/mii-tool.c
++===================================================================
++--- net-tools.orig/mii-tool.c
+++++ net-tools/mii-tool.c
++@@ -29,8 +29,7 @@
++ 	http://www.national.com/pf/DP/DP83840.html
++ */
++ 
++-static char version[] =
++-"mii-tool.c 1.9 2000/04/28 00:56:08 (David Hinds)\n";
+++static char Version[] = "$Id: mii-tool.c,v 1.9 2006/09/27 20:59:18 ecki Exp $\n(Author: David Hinds based on Donald Becker's mii-diag)";
++ 
++ #include <unistd.h>
++ #include <stdlib.h>
++@@ -46,16 +45,19 @@ static char version[] =
++ #include <sys/socket.h>
++ #include <sys/ioctl.h>
++ #include <net/if.h>
+++#include <linux/sockios.h>
+++
++ #ifndef __GLIBC__
++ #include <linux/if_arp.h>
++ #include <linux/if_ether.h>
++ #endif
++ #include "mii.h"
+++#include "version.h"
++ 
++ #define MAX_ETH		8		/* Maximum # of interfaces */
++ 
++ /* Table of known MII's */
++-static struct {
+++static const struct {
++     u_short	id1, id2;
++     char	*name;
++ } mii_id[] = {
++@@ -74,6 +76,9 @@ static struct {
++     { 0x0181, 0x4410, "Quality QS6612" },
++     { 0x0282, 0x1c50, "SMSC 83C180" },
++     { 0x0300, 0xe540, "TDK 78Q2120" },
+++    { 0x0141, 0x0c20, "Yukon 88E1011" },
+++    { 0x0141, 0x0cc0, "Yukon-EC 88E1111" },
+++    { 0x0141, 0x0c90, "Yukon-2 88E1112" },
++ };
++ #define NMII (sizeof(mii_id)/sizeof(mii_id[0]))
++ 
++@@ -137,40 +142,48 @@ static void mdio_write(int skfd, int loc
++ 
++ const struct {
++     char	*name;
++-    u_short	value;
+++    u_short	value[2];
++ } media[] = {
++     /* The order through 100baseT4 matches bits in the BMSR */
++-    { "10baseT-HD",	MII_AN_10BASET_HD },
++-    { "10baseT-FD",	MII_AN_10BASET_FD },
++-    { "100baseTx-HD",	MII_AN_100BASETX_HD },
++-    { "100baseTx-FD",	MII_AN_100BASETX_FD },
++-    { "100baseT4",	MII_AN_100BASET4 },
++-    { "100baseTx",	MII_AN_100BASETX_FD | MII_AN_100BASETX_HD },
++-    { "10baseT",	MII_AN_10BASET_FD | MII_AN_10BASET_HD },
+++    { "10baseT-HD",	{MII_AN_10BASET_HD} },
+++    { "10baseT-FD",	{MII_AN_10BASET_FD} },
+++    { "100baseTx-HD",	{MII_AN_100BASETX_HD} },
+++    { "100baseTx-FD",	{MII_AN_100BASETX_FD} },
+++    { "100baseT4",	{MII_AN_100BASET4} },
+++    { "100baseTx",	{MII_AN_100BASETX_FD | MII_AN_100BASETX_HD} },
+++    { "10baseT",	{MII_AN_10BASET_FD | MII_AN_10BASET_HD} },
+++
+++    { "1000baseT-HD",	{0, MII_BMCR2_1000HALF} },
+++    { "1000baseT-FD",	{0, MII_BMCR2_1000FULL} },
+++    { "1000baseT",	{0, MII_BMCR2_1000HALF|MII_BMCR2_1000FULL} },
++ };
++ #define NMEDIA (sizeof(media)/sizeof(media[0]))
++ 	
++ /* Parse an argument list of media types */
++-static int parse_media(char *arg)
+++static int parse_media(char *arg, unsigned *bmcr2)
++ {
++     int mask, i;
++     char *s;
++     mask = strtoul(arg, &s, 16);
++     if ((*arg != '\0') && (*s == '\0')) {
++ 	if ((mask & MII_AN_ABILITY_MASK) &&
++-	    !(mask & ~MII_AN_ABILITY_MASK))
++-	    return mask;
+++	    !(mask & ~MII_AN_ABILITY_MASK)) {
+++		*bmcr2 = 0;
+++		return mask;
+++	}
++ 	goto failed;
++-    } else {
++-	mask = 0;
++-	s = strtok(arg, ", ");
++-	do {
+++    }
+++    mask = 0;
+++    *bmcr2 = 0;
+++    s = strtok(arg, ", ");
+++    do {
++ 	    for (i = 0; i < NMEDIA; i++)
++-		if (strcasecmp(media[i].name, s) == 0) break;
+++		if (s && strcasecmp(media[i].name, s) == 0) break;
++ 	    if (i == NMEDIA) goto failed;
++-	    mask |= media[i].value;
++-	} while ((s = strtok(NULL, ", ")) != NULL);
++-    }
+++	    mask |= media[i].value[0];
+++	    *bmcr2 |= media[i].value[1];
+++    } while ((s = strtok(NULL, ", ")) != NULL);
+++
++     return mask;
++ failed:
++     fprintf(stderr, "Invalid media specification '%s'.\n", arg);
++@@ -179,11 +192,24 @@ failed:
++ 
++ /*--------------------------------------------------------------------*/
++ 
++-static char *media_list(int mask, int best)
+++static const char *media_list(unsigned mask, unsigned mask2, int best)
++ {
++     static char buf[100];
++     int i;
++     *buf = '\0';
+++
+++    if (mask & MII_BMCR_SPEED1000) {
+++	if (mask2 & MII_BMCR2_1000HALF) {
+++	    strcat(buf, " ");
+++	    strcat(buf, "1000baseT-HD");
+++	    if (best) goto out;
+++	}
+++	if (mask2 & MII_BMCR2_1000FULL) {
+++	    strcat(buf, " ");
+++	    strcat(buf, "1000baseT-FD");
+++	    if (best) goto out;
+++	}
+++    }
++     mask >>= 5;
++     for (i = 4; i >= 0; i--) {
++ 	if (mask & (1<<i)) {
++@@ -192,6 +218,7 @@ static char *media_list(int mask, int be
++ 	    if (best) break;
++ 	}
++     }
+++ out:
++     if (mask & (1<<5))
++ 	strcat(buf, " flow-control");
++     return buf;
++@@ -201,15 +228,15 @@ int show_basic_mii(int sock, int phy_id)
++ {
++     char buf[100];
++     int i, mii_val[32];
++-    int bmcr, bmsr, advert, lkpar;
+++    unsigned bmcr, bmsr, advert, lkpar, bmcr2, lpa2;
++ 
++     /* Some bits in the BMSR are latched, but we can't rely on being
++        the only reader, so only the current values are meaningful */
++     mdio_read(sock, MII_BMSR);
++-    for (i = 0; i < ((verbose > 1) ? 32 : 8); i++)
+++    for (i = 0; i < ((verbose > 1) ? 32 : MII_BASIC_MAX); i++)
++ 	mii_val[i] = mdio_read(sock, i);
++ 
++-    if (mii_val[MII_BMCR] == 0xffff) {
+++    if (mii_val[MII_BMCR] == 0xffff  || mii_val[MII_BMSR] == 0x0000) {
++ 	fprintf(stderr, "  No MII transceiver present!.\n");
++ 	return -1;
++     }
++@@ -217,6 +244,7 @@ int show_basic_mii(int sock, int phy_id)
++     /* Descriptive rename. */
++     bmcr = mii_val[MII_BMCR]; bmsr = mii_val[MII_BMSR];
++     advert = mii_val[MII_ANAR]; lkpar = mii_val[MII_ANLPAR];
+++    bmcr2 = mii_val[MII_CTRL1000]; lpa2 = mii_val[MII_STAT1000];
++ 
++     sprintf(buf, "%s: ", ifr.ifr_name);
++     if (bmcr & MII_BMCR_AN_ENA) {
++@@ -224,7 +252,7 @@ int show_basic_mii(int sock, int phy_id)
++ 	    if (advert & lkpar) {
++ 		strcat(buf, (lkpar & MII_AN_ACK) ?
++ 		       "negotiated" : "no autonegotiation,");
++-		strcat(buf, media_list(advert & lkpar, 1));
+++		strcat(buf, media_list(advert & lkpar, bmcr2 & lpa2>>2, 1));
++ 		strcat(buf, ", ");
++ 	    } else {
++ 		strcat(buf, "autonegotiation failed, ");
++@@ -234,8 +262,10 @@ int show_basic_mii(int sock, int phy_id)
++ 	}
++     } else {
++ 	sprintf(buf+strlen(buf), "%s Mbit, %s duplex, ",
++-	       (bmcr & MII_BMCR_100MBIT) ? "100" : "10",
++-	       (bmcr & MII_BMCR_DUPLEX) ? "full" : "half");
+++		((bmcr2 & (MII_BMCR2_1000HALF | MII_BMCR2_1000FULL)) & lpa2 >> 2)
+++		? "1000"
+++		: (bmcr & MII_BMCR_100MBIT) ? "100" : "10",
+++		(bmcr & MII_BMCR_DUPLEX) ? "full" : "half");
++     }
++     strcat(buf, (bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link");
++ 
++@@ -296,12 +326,13 @@ int show_basic_mii(int sock, int phy_id)
++ 	if (bmsr & MII_BMSR_REMOTE_FAULT)
++ 	    printf("remote fault, ");
++ 	printf((bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link");
++-	printf("\n  capabilities:%s", media_list(bmsr >> 6, 0));
++-	printf("\n  advertising: %s", media_list(advert, 0));
+++	printf("\n  capabilities:%s", media_list(bmsr >> 6, bmcr2, 0));
+++	printf("\n  advertising: %s", media_list(advert, lpa2 >> 2, 0));
++ 	if (lkpar & MII_AN_ABILITY_MASK)
++-	    printf("\n  link partner:%s", media_list(lkpar, 0));
+++	    printf("\n  link partner:%s", media_list(lkpar, bmcr2, 0));
++ 	printf("\n");
++     }
+++    fflush(stdout);
++     return 0;
++ }
++ 
++@@ -329,7 +360,7 @@ static int do_one_xcvr(int skfd, char *i
++ 	printf("resetting the transceiver...\n");
++ 	mdio_write(skfd, MII_BMCR, MII_BMCR_RESET);
++     }
++-    if (nway_advertise) {
+++    if (nway_advertise > 0) {
++ 	mdio_write(skfd, MII_ANAR, nway_advertise | 1);
++ 	opt_restart = 1;
++     }
++@@ -379,27 +410,38 @@ static void watch_one_xcvr(int skfd, cha
++ /*--------------------------------------------------------------------*/
++ 
++ const char *usage =
++-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
++-       -V, --version               display version information
++-       -v, --verbose               more verbose output
++-       -R, --reset                 reset MII to poweron state
++-       -r, --restart               restart autonegotiation
++-       -w, --watch                 monitor for link status changes
++-       -l, --log                   with -w, write events to syslog
++-       -A, --advertise=media,...   advertise only specified media
++-       -F, --force=media           force specified media technology
++-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
++-       (to advertise both HD and FD) 100baseTx, 10baseT\n";
+++"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
+++"       -V, --version               display version information\n"
+++"       -v, --verbose               more verbose output\n"
+++"       -R, --reset                 reset MII to poweron state\n"
+++"       -r, --restart               restart autonegotiation\n"
+++"       -w, --watch                 monitor for link status changes\n"
+++"       -l, --log                   with -w, write events to syslog\n"
+++"       -A, --advertise=media,...   advertise only specified media\n"
+++"       -F, --force=media           force specified media technology\n"
+++"media: 1000baseTx-HD, 1000baseTx-FD,\n"
+++"       100baseT4, 100baseTx-FD, 100baseTx-HD,\n"
+++"       10baseT-FD, 10baseT-HD,\n"
+++"       (to advertise both HD and FD) 1000baseTx, 100baseTx, 10baseT\n";
+++
+++
+++static void version(void)
+++{
+++    fprintf(stderr, "%s\n%s\n", Version, RELEASE);
+++    exit(5); /* E_VERSION */
+++}
+++
++ 
++ int main(int argc, char **argv)
++ {
++     int i, c, ret, errflag = 0;
++     char s[6];
+++    unsigned ctrl1000 = 0;
++     
++     while ((c = getopt_long(argc, argv, "A:F:p:lrRvVw?", longopts, 0)) != EOF)
++ 	switch (c) {
++-	case 'A': nway_advertise = parse_media(optarg); break;
++-	case 'F': fixed_speed = parse_media(optarg); break;
+++	case 'A': nway_advertise = parse_media(optarg, &ctrl1000); break;
+++	case 'F': fixed_speed = parse_media(optarg, &ctrl1000); break;
++ 	case 'p': override_phy = atoi(optarg); break;
++ 	case 'r': opt_restart++;	break;
++ 	case 'R': opt_reset++;		break;
++@@ -411,6 +453,10 @@ int main(int argc, char **argv)
++ 	}
++     /* Check for a few inappropriate option combinations */
++     if (opt_watch) verbose = 0;
+++
+++    if ((nway_advertise < 0) || (fixed_speed < 0))
+++    	return 2;
+++
++     if (errflag || (fixed_speed & (fixed_speed-1)) ||
++ 	(fixed_speed && (opt_restart || nway_advertise))) {
++ 	fprintf(stderr, usage, argv[0]);
++@@ -418,7 +464,7 @@ int main(int argc, char **argv)
++     }
++ 
++     if (opt_version)
++-	printf(version);
+++	version();
++ 
++     /* Open a basic socket. */
++     if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) {
++@@ -426,6 +472,9 @@ int main(int argc, char **argv)
++ 	exit(-1);
++     }
++ 
+++    if (verbose > 1)
+++    	printf("Using SIOCGMIIPHY=0x%x\n", SIOCGMIIPHY);	
+++
++     /* No remaining args means show all interfaces. */
++     if (optind == argc) {
++ 	ret = 1;
+--- net-tools-1.60.orig/debian/patches/CVS-20070316-netstat.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20070316-netstat.c_sync.patch
+@@ -0,0 +1,484 @@
++Sync with upstream's CVS until rev 1.53
++
++Revision 1.53 - Thu Mar 16 08:59:42 2006 UTC by ecki
++
++Debian Bug #260587 fixed, make sure the Columns state and user in netstat -t -e
++are separated by blanks. This may cause scripts to fail parsing by column width.
++Better wait for the script compatible output. Problems exists for ESTABLIHED
++state only.
++
++Revision 1.52 - Tue Aug 2 22:28:10 2005 UTC by ecki
++make ipx in 2.6 work (perhaps).
++Fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=318503
++
++Revision 1.51 - Thu Jun 3 22:27:37 2004 UTC by ecki
++avoid namespace conflicts
++
++Revision 1.50 - Tue Dec 10 00:56:41 2002 UTC by ecki
++ - change columns of netstat -i/ifconfig -s to avoid run-into (Stefan Illner)
++ - prevent segfault on protocol families without host error member
++ - use /128 as default prefix if not specified instead of /0
++
++Revision 1.49 - Tue Jul 23 21:08:16 2002 UTC by ecki
++allow support for -6 and -4 options to netstat, also allow both, and
++print out tcp6, udp6 or raw6 if it is a v6 socket
++
++Revision 1.48 - Thu Jun 27 18:04:02 2002 UTC by ecki
++fixing debian bug #151130 reported by Dan Jacobson where netstat
++was printing 81 chars in a line for tcp, udp and raw.
++
++Revision 1.47 - Tue Feb 19 01:12:49 2002 UTC by ecki
++inodes in unix domain sockets are now padded to 8chars (netstat -x)
++
++Revision 1.46 - Tue Feb 19 00:55:35 2002 UTC by ecki
++fixes debian bug#134600 (sigsegv in netstat on negative inoded in
++/proc/net/udp) on "netstat -lpu". Thanks to Arnaud Giersch for the report.
++
++Revision 1.45 - Sun Nov 25 06:48:50 2001 UTC by ecki
++this fixes Debian Bug #109164 (netstat -ci does only print stats once). It
++also renames add_interface and free_interface list to if_cache_add/free.
++I am not sure if removing the "proc_read" flag will harm performance, looks
++likt this check is never triggereed. Anyway, we need more efficient b-search
++sooner or later.
++
++Revision 1.44 - Sun Aug 26 05:25:21 2001 UTC by ak
++Fix netstat -- don't print all v4 addresses as v4-mapped-in-v6.
++
++Index: net-tools/netstat.c
++===================================================================
++--- net-tools.orig/netstat.c
+++++ net-tools/netstat.c
++@@ -6,7 +6,7 @@
++  *              NET-3 Networking Distribution for the LINUX operating
++  *              system.
++  *
++- * Version:     $Id: netstat.c,v 1.43 2001/04/15 14:41:17 pb Exp $
+++ * Version:     $Id: netstat.c,v 1.54 2007/12/01 18:12:34 ecki Exp $
++  *
++  * Authors:     Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de>
++  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++@@ -216,7 +216,7 @@ FILE *procinfo;
++ 
++ static struct prg_node {
++     struct prg_node *next;
++-    int inode;
+++    unsigned long inode;
++     char name[PROGNAME_WIDTH];
++ } *prg_hash[PRG_HASH_SIZE];
++ 
++@@ -249,7 +249,7 @@ static char prg_cache_loaded = 0;
++ /* NOT working as of glibc-2.0.7: */
++ #undef  DIRENT_HAVE_D_TYPE_WORKS
++ 
++-static void prg_cache_add(int inode, char *name)
+++static void prg_cache_add(unsigned long inode, char *name)
++ {
++     unsigned hi = PRG_HASHIT(inode);
++     struct prg_node **pnp,*pn;
++@@ -272,7 +272,7 @@ static void prg_cache_add(int inode, cha
++     strcpy(pn->name,name);
++ }
++ 
++-static const char *prg_cache_get(int inode)
+++static const char *prg_cache_get(unsigned long inode)
++ {
++     unsigned hi=PRG_HASHIT(inode);
++     struct prg_node *pn;
++@@ -295,16 +295,18 @@ static void prg_cache_clear(void)
++     prg_cache_loaded=0;
++ }
++ 
++-static void extract_type_1_socket_inode(const char lname[], long * inode_p) {
+++static int extract_type_1_socket_inode(const char lname[], unsigned long * inode_p) {
++ 
++     /* If lname is of the form "socket:[12345]", extract the "12345"
++        as *inode_p.  Otherwise, return -1 as *inode_p.
++        */
++ 
++-    if (strlen(lname) < PRG_SOCKET_PFXl+3) *inode_p = -1;
++-    else if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) *inode_p = -1;
++-    else if (lname[strlen(lname)-1] != ']') *inode_p = -1;
++-    else {
+++    if (strlen(lname) < PRG_SOCKET_PFXl+3) return(-1);
+++    
+++    if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) return(-1);
+++    if (lname[strlen(lname)-1] != ']') return(-1);
+++
+++    {
++         char inode_str[strlen(lname + 1)];  /* e.g. "12345" */
++         const int inode_str_len = strlen(lname) - PRG_SOCKET_PFXl - 1;
++         char *serr;
++@@ -313,37 +315,41 @@ static void extract_type_1_socket_inode(
++         inode_str[inode_str_len] = '\0';
++         *inode_p = strtol(inode_str,&serr,0);
++         if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
++-            *inode_p = -1;
+++            return(-1);
++     }
+++    return(0);
++ }
++ 
++ 
++ 
++-static void extract_type_2_socket_inode(const char lname[], long * inode_p) {
+++static int extract_type_2_socket_inode(const char lname[], unsigned long * inode_p) {
++ 
++     /* If lname is of the form "[0000]:12345", extract the "12345"
++        as *inode_p.  Otherwise, return -1 as *inode_p.
++        */
++ 
++-    if (strlen(lname) < PRG_SOCKET_PFX2l+1) *inode_p = -1;
++-    else if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) *inode_p = -1;
++-    else {
+++    if (strlen(lname) < PRG_SOCKET_PFX2l+1) return(-1);
+++    if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) return(-1);
+++
+++    {
++         char *serr;
++ 
++         *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0);
++         if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
++-            *inode_p = -1;
+++            return(-1);
++     }
+++    return(0);
++ }
++ 
++ 
++ 
+++
++ static void prg_cache_load(void)
++ {
++     char line[LINE_MAX],eacces=0;
++     int procfdlen,fd,cmdllen,lnamelen;
++     char lname[30],cmdlbuf[512],finbuf[PROGNAME_WIDTH];
++-    long inode;
+++    unsigned long inode;
++     const char *cs,*cmdlp;
++     DIR *dirproc=NULL,*dirfd=NULL;
++     struct dirent *direproc,*direfd;
++@@ -386,11 +392,9 @@ static void prg_cache_load(void)
++ 	    lnamelen=readlink(line,lname,sizeof(lname)-1);
++             lname[lnamelen] = '\0';  /*make it a null-terminated string*/
++ 
++-            extract_type_1_socket_inode(lname, &inode);
++-
++-            if (inode < 0) extract_type_2_socket_inode(lname, &inode);
++-
++-            if (inode < 0) continue;
+++            if (extract_type_1_socket_inode(lname, &inode) < 0)
+++              if (extract_type_2_socket_inode(lname, &inode) < 0)
+++                continue;
++ 
++ 	    if (!cmdlp) {
++ 		if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >= 
++@@ -527,10 +531,10 @@ static void finish_this_one(int uid, uns
++ 
++     if (flag_exp > 1) {
++ 	if (!(flag_not & FLAG_NUM_USER) && ((pw = getpwuid(uid)) != NULL))
++-	    printf("%-10s ", pw->pw_name);
+++	    printf(" %-10s ", pw->pw_name);
++ 	else
++-	    printf("%-10d ", uid);
++-	printf("%-10ld ",inode);
+++	    printf(" %-10d ", uid);
+++	printf("%-10lu ",inode);
++     }
++     if (flag_prg)
++ 	printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode));
++@@ -705,6 +709,7 @@ static void tcp_do_one(int lnr, const ch
++     unsigned long rxq, txq, time_len, retr, inode;
++     int num, local_port, rem_port, d, state, uid, timer_run, timeout;
++     char rem_addr[128], local_addr[128], timers[64], buffer[1024], more[512];
+++    char *protname;
++     struct aftype *ap;
++ #if HAVE_AFINET6
++     struct sockaddr_in6 localaddr, remaddr;
++@@ -719,12 +724,13 @@ static void tcp_do_one(int lnr, const ch
++ 	return;
++ 
++     num = sscanf(line,
++-    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
+++    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
++ 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
++ 		 &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
++ 
++     if (strlen(local_addr) > 8) {
++ #if HAVE_AFINET6
+++	protname = "tcp6";
++ 	/* Demangle what the kernel gives us */
++ 	sscanf(local_addr, "%08X%08X%08X%08X",
++ 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
++@@ -740,6 +746,7 @@ static void tcp_do_one(int lnr, const ch
++ 	remaddr.sin6_family = AF_INET6;
++ #endif
++     } else {
+++	protname = "tcp";
++ 	sscanf(local_addr, "%X",
++ 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
++ 	sscanf(rem_addr, "%X",
++@@ -813,8 +820,8 @@ static void tcp_do_one(int lnr, const ch
++ 			 timer_run, (double) time_len / HZ, retr, timeout);
++ 		break;
++ 	    }
++-	printf("tcp   %6ld %6ld %-23s %-23s %-12s",
++-	       rxq, txq, local_addr, rem_addr, _(tcp_state[state]));
+++	printf("%-4s  %6ld %6ld %-*s %-*s %-11s",
+++	       protname, rxq, txq, netmax(23,strlen(local_addr)), local_addr, netmax(23,strlen(rem_addr)), rem_addr, _(tcp_state[state]));
++ 
++ 	finish_this_one(uid,inode,timers);
++     }
++@@ -831,6 +838,7 @@ static void udp_do_one(int lnr, const ch
++     char buffer[8192], local_addr[64], rem_addr[64];
++     char *udp_state, timers[64], more[512];
++     int num, local_port, rem_port, d, state, timer_run, uid, timeout;
+++    char *protname;
++ #if HAVE_AFINET6
++     struct sockaddr_in6 localaddr, remaddr;
++     char addr6[INET6_ADDRSTRLEN];
++@@ -847,13 +855,14 @@ static void udp_do_one(int lnr, const ch
++ 
++     more[0] = '\0';
++     num = sscanf(line,
++-		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
+++		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
++ 		 &d, local_addr, &local_port,
++ 		 rem_addr, &rem_port, &state,
++ 	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
++ 
++     if (strlen(local_addr) > 8) {
++ #if HAVE_AFINET6
+++	protname="udp6";
++ 	sscanf(local_addr, "%08X%08X%08X%08X",
++ 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
++ 	       &in6.s6_addr32[2], &in6.s6_addr32[3]);
++@@ -868,6 +877,7 @@ static void udp_do_one(int lnr, const ch
++ 	remaddr.sin6_family = AF_INET6;
++ #endif
++     } else {
+++        protname="udp";
++ 	sscanf(local_addr, "%X",
++ 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
++ 	sscanf(rem_addr, "%X",
++@@ -953,8 +963,8 @@ static void udp_do_one(int lnr, const ch
++ 			 retr, timeout);
++ 		break;
++ 	    }
++-	printf("udp   %6ld %6ld %-23s %-23s %-12s",
++-	       rxq, txq, local_addr, rem_addr, udp_state);
+++	printf("%-4s  %6ld %6ld %-23s %-23s %-11s",
+++	       protname, rxq, txq, local_addr, rem_addr, udp_state);
++ 
++ 	finish_this_one(uid,inode,timers);
++     }
++@@ -971,6 +981,7 @@ static void raw_do_one(int lnr, const ch
++     char buffer[8192], local_addr[64], rem_addr[64];
++     char timers[64], more[512];
++     int num, local_port, rem_port, d, state, timer_run, uid, timeout;
+++    char *protname;
++ #if HAVE_AFINET6
++     struct sockaddr_in6 localaddr, remaddr;
++     char addr6[INET6_ADDRSTRLEN];
++@@ -987,12 +998,13 @@ static void raw_do_one(int lnr, const ch
++ 
++     more[0] = '\0';
++     num = sscanf(line,
++-		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
+++		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
++ 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
++ 	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
++ 
++     if (strlen(local_addr) > 8) {
++ #if HAVE_AFINET6
+++	protname = "raw6";
++ 	sscanf(local_addr, "%08X%08X%08X%08X",
++ 	       &in6.s6_addr32[0], &in6.s6_addr32[1],
++            &in6.s6_addr32[2], &in6.s6_addr32[3]);
++@@ -1007,6 +1019,7 @@ static void raw_do_one(int lnr, const ch
++ 	remaddr.sin6_family = AF_INET6;
++ #endif
++     } else {
+++        protname = "raw";
++ 	sscanf(local_addr, "%X",
++ 	       &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
++ 	sscanf(rem_addr, "%X",
++@@ -1074,8 +1087,8 @@ static void raw_do_one(int lnr, const ch
++ 			 retr, timeout);
++ 		break;
++ 	    }
++-	printf("raw   %6ld %6ld %-23s %-23s %-12d",
++-	       rxq, txq, local_addr, rem_addr, state);
+++	printf("%-4s  %6ld %6ld %-23s %-23s %-11d",
+++	       protname, rxq, txq, local_addr, rem_addr, state);
++ 
++ 	finish_this_one(uid,inode,timers);
++     }
++@@ -1099,9 +1112,9 @@ static void unix_do_one(int nr, const ch
++     static int has = 0;
++     char path[MAXPATHLEN], ss_flags[32];
++     char *ss_proto, *ss_state, *ss_type;
++-    int num, state, type, inode;
+++    int num, state, type;
++     void *d;
++-    unsigned long refcnt, proto, flags;
+++    unsigned long refcnt, proto, flags, inode;
++ 
++     if (nr == 0) {
++ 	if (strstr(line, "Inode"))
++@@ -1109,14 +1122,14 @@ static void unix_do_one(int nr, const ch
++ 	return;
++     }
++     path[0] = '\0';
++-    num = sscanf(line, "%p: %lX %lX %lX %X %X %d %s",
+++    num = sscanf(line, "%p: %lX %lX %lX %X %X %lu %s",
++ 		 &d, &refcnt, &proto, &flags, &type, &state, &inode, path);
++     if (num < 6) {
++ 	fprintf(stderr, _("warning, got bogus unix line.\n"));
++ 	return;
++     }
++     if (!(has & HAS_INODE))
++-	snprintf(path,sizeof(path),"%d",inode);
+++	snprintf(path,sizeof(path),"%lu",inode);
++ 
++     if (!flag_all) {
++     	if ((state == SS_UNCONNECTED) && (flags & SO_ACCEPTCON)) {
++@@ -1208,9 +1221,9 @@ static void unix_do_one(int nr, const ch
++     printf("%-5s %-6ld %-11s %-10s %-13s ",
++ 	   ss_proto, refcnt, ss_flags, ss_type, ss_state);
++     if (has & HAS_INODE)
++-	printf("%-6d ",inode);
+++	printf("%-8lu ",inode);
++     else
++-	printf("-      ");
+++	printf("-        ");
++     if (flag_prg)
++ 	printf("%-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-"));
++     puts(path);
++@@ -1350,18 +1363,37 @@ static int ipx_info(void)
++     char sad[50], dad[50];
++     struct sockaddr sa;
++     unsigned sport = 0, dport = 0;
++-
++-    if (!(f = fopen(_PATH_PROCNET_IPX, "r"))) {
++-	if (errno != ENOENT) {
++-	    perror(_PATH_PROCNET_IPX);
++-	    return (-1);
++-	}
++-	if (flag_arg || flag_ver)
++-	    ESYSNOT("netstat", "AF IPX");
++-	if (flag_arg)
++-	    return (1);
++-	else
++-	    return (0);
+++    struct stat s;
+++    
+++    f = fopen(_PATH_PROCNET_IPX_SOCKET1, "r");
+++    if (!f) {
+++        if (errno != ENOENT) {
+++            perror(_PATH_PROCNET_IPX_SOCKET1);
+++            return (-1);
+++        }
+++        f = fopen(_PATH_PROCNET_IPX_SOCKET2, "r");
+++
+++        /* We need to check for directory */
+++        if (f) {
+++            fstat(fileno(f), &s);
+++            if (!S_ISREG(s.st_mode)) {
+++                fclose(f);
+++                f=NULL;
+++            }
+++        }
+++
+++        if (!f) {
+++            if (errno != ENOENT) {
+++	        perror(_PATH_PROCNET_IPX_SOCKET2);
+++	        return (-1);
+++	    }
+++	    if (flag_arg || flag_ver)
+++	        ESYSNOT("netstat", "AF IPX");
+++	    if (flag_arg)
+++	        return (1);
+++ 	    else
+++	        return (0);
+++        }
++     }
++     printf(_("Active IPX sockets\nProto Recv-Q Send-Q Local Address              Foreign Address            State"));	/* xxx */
++     if (flag_exp > 1)
++@@ -1381,7 +1413,7 @@ static int ipx_info(void)
++ 	    sscanf(st, "%X", &sport);	/* net byt order */
++ 	    sport = ntohs(sport);
++ 	} else {
++-	    EINTERN("netstat.c", _PATH_PROCNET_IPX " sport format error");
+++	    EINTERN("netstat.c", "ipx socket format error in source port");
++ 	    return (-1);
++ 	}
++ 	nc = 0;
++@@ -1391,7 +1423,7 @@ static int ipx_info(void)
++ 		sscanf(st, "%X", &dport);	/* net byt order */
++ 		dport = ntohs(dport);
++ 	    } else {
++-		EINTERN("netstat.c", _PATH_PROCNET_IPX " dport format error");
+++		EINTERN("netstat.c", "ipx soket format error in destination port");
++ 		return (-1);
++ 	    }
++ 	} else
++@@ -1449,7 +1481,7 @@ static int iface_info(void)
++     }
++     if (flag_exp < 2) {
++ 	ife_short = 1;
++-	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
+++	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
++     }
++ 
++     if (for_all_interfaces(do_if_print, &flag_all) < 0) {
++@@ -1457,7 +1489,7 @@ static int iface_info(void)
++ 	exit(1);
++     }
++     if (flag_cnt)
++-	free_interface_list();
+++	if_cache_free();
++     else {
++ 	close(skfd);
++ 	skfd = -1;
++@@ -1503,7 +1535,7 @@ static void usage(void)
++     fprintf(stderr, _("        -C, --cache              display routing cache instead of FIB\n\n"));
++ 
++     fprintf(stderr, _("  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n"));
++-    fprintf(stderr, _("  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
+++    fprintf(stderr, _("  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
++     fprintf(stderr, _("  List of possible address families (which support routing):\n"));
++     print_aflist(1); /* 1 = routeable */
++     exit(E_USAGE);
++@@ -1514,7 +1546,7 @@ int main
++  (int argc, char *argv[]) {
++     int i;
++     int lop;
++-    struct option longopts[] =
+++    static struct option longopts[] =
++     {
++ 	AFTRANS_OPTS,
++ 	{"version", 0, 0, 'V'},
++@@ -1556,7 +1588,7 @@ int main
++     getroute_init();		/* Set up AF routing support */
++ 
++     afname[0] = '\0';
++-    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl", longopts, &lop)) != EOF)
+++    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF)
++ 	switch (i) {
++ 	case -1:
++ 	    break;
++@@ -1624,6 +1656,14 @@ int main
++ 	case 'o':
++ 	    flag_opt++;
++ 	    break;
+++	case '6':
+++	    if (aftrans_opt("inet6"))
+++		exit(1);
+++	    break;
+++	case '4':
+++	    if (aftrans_opt("inet"))
+++		exit(1);
+++	    break;
++ 	case 'V':
++ 	    version();
++ 	    /*NOTREACHED */
+--- net-tools-1.60.orig/debian/patches/netstat.c-local_changes.patch
++++ net-tools-1.60/debian/patches/netstat.c-local_changes.patch
+@@ -0,0 +1,61 @@
++Undocumented patches found in diff.gz.
++
++Index: net-tools/netstat.c
++===================================================================
++--- net-tools.orig/netstat.c
+++++ net-tools/netstat.c
++@@ -387,6 +387,10 @@ static void prg_cache_load(void)
++ #ifdef DIRENT_HAVE_D_TYPE_WORKS
++ 	    if (direfd->d_type!=DT_LNK) 
++ 		continue;
+++#else
+++	    /* Skip . and .. */
+++	    if (!isdigit(direfd->d_name[0]))
+++		continue;
++ #endif
++ 	    if (procfdlen+1+strlen(direfd->d_name)+1>sizeof(line)) 
++ 		continue;
++@@ -541,9 +545,9 @@ static void finish_this_one(int uid, uns
++ 	printf("%-10lu ",inode);
++     }
++     if (flag_prg)
++-	printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode));
+++	printf(" %-16s",prg_cache_get(inode));
++     if (flag_opt)
++-	printf("%s", timers);
+++	printf(" %s", timers);
++     putchar('\n');
++ }
++ 
++@@ -1250,7 +1254,7 @@ static int unix_info(void)
++ 	printf(_("(w/o servers)"));
++     }
++ 
++-    printf(_("\nProto RefCnt Flags       Type       State         I-Node"));
+++    printf(_("\nProto RefCnt Flags       Type       State         I-Node  "));
++     print_progname_banner();
++     printf(_(" Path\n"));	/* xxx */
++ 
++@@ -1813,10 +1817,11 @@ int main
++ 	    }
++ 	    printf(_("\nProto Recv-Q Send-Q Local Address           Foreign Address         State      "));	/* xxx */
++ 	    if (flag_exp > 1)
++-		printf(_(" User       Inode     "));
++-	    print_progname_banner();
+++		printf(_(" User       Inode      "));
+++            if (flag_prg)
+++                printf(_(" PID/Program name"));
++ 	    if (flag_opt)
++-		printf(_(" Timer"));	/* xxx */
+++		printf(_(" Timer"));
++ 	    printf("\n");
++ #else
++ 	    if (flag_arg) {
++@@ -1917,6 +1922,7 @@ int main
++ 	    }
++ #endif
++ 	}
+++	            
++ 	if (!flag_cnt || i)
++ 	    break;
++ 	sleep(1);
+--- net-tools-1.60.orig/debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch
++++ net-tools-1.60/debian/patches/CVS-20061011-ipmaddr.c_buffer_overflow.patch
+@@ -0,0 +1,36 @@
++Patch by Jochen Voss, already applied in upstream CVS. (Bug #392263)
++Index: net-tools/ipmaddr.c
++===================================================================
++--- net-tools.orig/ipmaddr.c
+++++ net-tools/ipmaddr.c
++@@ -291,13 +291,15 @@ static void print_mlist(FILE *fp, struct
++ static int multiaddr_list(int argc, char **argv)
++ {
++ 	struct ma_info *list = NULL;
+++	size_t l;
++ 
++ 	while (argc > 0) {
++ 		if (strcmp(*argv, "dev") == 0) {
++ 			NEXT_ARG();
++-			if (filter_dev[0])
+++			l = strlen(*argv);
+++			if (l <= 0 || l >= sizeof(filter_dev))
++ 				usage();
++-			strcpy(filter_dev, *argv);
+++			strncpy(filter_dev, *argv, sizeof (filter_dev));
++ 		} else if (strcmp(*argv, "all") == 0) {
++ 			filter_family = AF_UNSPEC;
++ 		} else if (strcmp(*argv, "ipv4") == 0) {
++@@ -307,9 +309,10 @@ static int multiaddr_list(int argc, char
++ 		} else if (strcmp(*argv, "link") == 0) {
++ 			filter_family = AF_PACKET;
++ 		} else {
++-			if (filter_dev[0])
+++			l = strlen(*argv);
+++			if (l <= 0 || l >= sizeof(filter_dev))
++ 				usage();
++-			strcpy(filter_dev, *argv);
+++			strncpy(filter_dev, *argv, sizeof (filter_dev));
++ 		}
++ 		argv++; argc--;
++ 	}
+--- net-tools-1.60.orig/debian/patches/series
++++ net-tools-1.60/debian/patches/series
+@@ -0,0 +1,22 @@
++CVS-20020730-route.c_opts_64.patch
++CVS-20030911-nameif.c_sync.patch
++CVS-20031011-hostname.c_sync.patch
++CVS-20051204-arp.c_sync.patch
++CVS-20051204-slttach.c_sync.patch
++CVS-20060927-mii-tool.c_sync.patch
++CVS-20061011-includes_sync.patch
++CVS-20061011-ipmaddr.c_buffer_overflow.patch
++CVS-20070316-netstat.c_sync.patch
++CVS-20071202-rarp.c_sync.patch
++CVS-20081002-ifconfig.c_sync.patch
++CVS-20081003-statistics.c_sync.patch
++CVS-lib_sync.patch
++CVS-20081003-config.in_sync.patch
++CVS-20081002-manpages_sync.patch
++netstat.c-assorted_changes.patch
++Bug#254243-netstat.c-wide-opt.patch
++netstat.c-local_changes.patch
++translations.patch
++lib_local_changes.patch
++local-manpages.patch
++Bug#345331-socket_overflow.patch
+--- net-tools-1.60.orig/debian/patches/Bug#345331-socket_overflow.patch
++++ net-tools-1.60/debian/patches/Bug#345331-socket_overflow.patch
+@@ -0,0 +1,28 @@
++Patch by Antonio Galea <ant9000@netwise.it> to solve the socket number overflow
++from #345331
++
++diff -urNad net-tools-1.60/netstat.c /tmp/dpep.15Gej9/net-tools-1.60/netstat.c
++--- net-tools-1.60/netstat.c	2005-12-30 16:52:15.000000000 +0100
+++++ /tmp/dpep.15Gej9/net-tools-1.60/netstat.c	2005-12-30 16:56:00.000000000 +0100
++@@ -313,8 +313,8 @@
++ 
++         strncpy(inode_str, lname+PRG_SOCKET_PFXl, inode_str_len);
++         inode_str[inode_str_len] = '\0';
++-        *inode_p = strtol(inode_str,&serr,0);
++-        if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
+++        *inode_p = strtoul(inode_str,&serr,0);
+++        if (!serr || *serr)
++             return(-1);
++     }
++     return(0);
++@@ -334,8 +334,8 @@
++     {
++         char *serr;
++ 
++-        *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0);
++-        if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
+++        *inode_p=strtoul(lname + PRG_SOCKET_PFX2l,&serr,0);
+++        if (!serr || *serr)
++             return(-1);
++     }
++     return(0);
+--- net-tools-1.60.orig/debian/patches/lib_local_changes.patch
++++ net-tools-1.60/debian/patches/lib_local_changes.patch
+@@ -0,0 +1,410 @@
++Changes extracted from diff.gz, not present in upstream's CVS.
++
++Index: net-tools/lib/ec_hw.c
++===================================================================
++--- net-tools.orig/lib/ec_hw.c
+++++ net-tools/lib/ec_hw.c
++@@ -16,6 +16,8 @@
++ 
++ #if HAVE_HWEC
++ 
+++#include <stddef.h>
+++
++ #include <net/if_arp.h>
++ #include "net-support.h"
++ 
++Index: net-tools/lib/fddi.c
++===================================================================
++--- net-tools.orig/lib/fddi.c
+++++ net-tools/lib/fddi.c
++@@ -26,6 +26,7 @@
++ #error "No FDDI Support in your current Kernelsource Tree."
++ #error "Disable HW Type FDDI"
++ #endif
+++#include <linux/types.h>
++ #if __GLIBC__ >= 2
++ #include <netinet/if_fddi.h>
++ #else
++Index: net-tools/lib/interface.c
++===================================================================
++--- net-tools.orig/lib/interface.c
+++++ net-tools/lib/interface.c
++@@ -594,7 +594,7 @@ int do_if_print(struct interface *ife, v
++ 
++ void ife_print_short(struct interface *ptr)
++ {
++-    printf("%-5.5s ", ptr->name);
+++    printf("%-9s ", ptr->name);
++     printf("%5d %-2d ", ptr->mtu, ptr->metric);
++     /* If needed, display the interface statistics. */
++     if (ptr->statistics_valid) {
++@@ -653,8 +653,7 @@ void ife_print_long(struct interface *pt
++     unsigned long long rx, tx, short_rx, short_tx;
++     const char *Rext = "B";
++     const char *Text = "B";
++-    static char flags[200];
++-    
+++
++ #if HAVE_AFIPX
++     static struct aftype *ipxtype = NULL;
++ #endif
++@@ -686,70 +685,32 @@ void ife_print_long(struct interface *pt
++     if (hw == NULL)
++ 	hw = get_hwntype(-1);
++ 
++-    sprintf(flags, "flags=%d<", ptr->flags);
++-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
++-    if (ptr->flags == 0)
++-	strcat(flags,">");
++-    if (ptr->flags & IFF_UP)
++-	strcat(flags,_("UP,"));
++-    if (ptr->flags & IFF_BROADCAST)
++-	strcat(flags,_("BROADCAST,"));
++-    if (ptr->flags & IFF_DEBUG)
++-	strcat(flags,_("DEBUG,"));
++-    if (ptr->flags & IFF_LOOPBACK)
++-	strcat(flags,_("LOOPBACK,"));
++-    if (ptr->flags & IFF_POINTOPOINT)
++-	strcat(flags,_("POINTOPOINT,"));
++-    if (ptr->flags & IFF_NOTRAILERS)
++-	strcat(flags,_("NOTRAILERS,"));
++-    if (ptr->flags & IFF_RUNNING)
++-	strcat(flags,_("RUNNING,"));
++-    if (ptr->flags & IFF_NOARP)
++-	strcat(flags,_("NOARP,"));
++-    if (ptr->flags & IFF_PROMISC)
++-	strcat(flags,_("PROMISC,"));
++-    if (ptr->flags & IFF_ALLMULTI)
++-	strcat(flags,_("ALLMULTI,"));
++-    if (ptr->flags & IFF_SLAVE)
++-	strcat(flags,_("SLAVE,"));
++-    if (ptr->flags & IFF_MASTER)
++-	strcat(flags,_("MASTER,"));
++-    if (ptr->flags & IFF_MULTICAST)
++-	strcat(flags,_("MULTICAST,"));
++-#ifdef HAVE_DYNAMIC
++-    if (ptr->flags & IFF_DYNAMIC)
++-	strcat(flags,_("DYNAMIC,"));
++-#endif
++-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
++-    if (flags[strlen(flags)-1] == ',')
++-      flags[strlen(flags)-1] = '>';
++-    else
++-      flags[strlen(flags)-1] = 0;
++-      
++-
++-    printf(_("%s: %s  mtu %d  metric %d"),
++-	   ptr->name, flags, ptr->mtu, ptr->metric ? ptr->metric : 1);
++-#ifdef SIOCSKEEPALIVE
++-    if (ptr->outfill || ptr->keepalive)
++-	printf(_("  outfill %d  keepalive %d"),
++-	       ptr->outfill, ptr->keepalive);
+++    printf(_("%-9s Link encap:%s  "), ptr->name, hw->title);
+++    /* For some hardware types (eg Ash, ATM) we don't print the 
+++       hardware address if it's null.  */
+++    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
+++				  hw->suppress_null_addr)))
+++	printf(_("HWaddr %s  "), hw->print(ptr->hwaddr));
+++#ifdef IFF_PORTSEL
+++    if (ptr->flags & IFF_PORTSEL) {
+++	printf(_("Media:%s"), if_port_text[ptr->map.port][0]);
+++	if (ptr->flags & IFF_AUTOMEDIA)
+++	    printf(_("(auto)"));
+++    }
++ #endif
++     printf("\n");
++ 
++-
++-
++ #if HAVE_AFINET
++     if (ptr->has_ip) {
++-	printf(_("        %s %s"), ap->name,
+++	printf(_("          %s addr:%s "), ap->name,
++ 	       ap->sprint(&ptr->addr, 1));
++-	printf(_("  netmask %s"), ap->sprint(&ptr->netmask, 1));
++-	if (ptr->flags & IFF_BROADCAST) {
++-	    printf(_("  broadcast %s"), ap->sprint(&ptr->broadaddr, 1));
++-	}
++ 	if (ptr->flags & IFF_POINTOPOINT) {
++-	    printf(_("  destination %s"), ap->sprint(&ptr->dstaddr, 1));
+++	    printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1));
++ 	}
++-	printf("\n");
+++	if (ptr->flags & IFF_BROADCAST) {
+++	    printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1));
+++	}
+++	printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1));
++     }
++ #endif
++ 
++@@ -757,7 +718,7 @@ void ife_print_long(struct interface *pt
++     /* FIXME: should be integrated into interface.c.   */
++ 
++     if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) {
++-	while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n",
+++	while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %08x %02x %02x %02x %20s\n",
++ 		      addr6p[0], addr6p[1], addr6p[2], addr6p[3],
++ 		      addr6p[4], addr6p[5], addr6p[6], addr6p[7],
++ 		  &if_idx, &plen, &scope, &dad_status, devname) != EOF) {
++@@ -766,30 +727,29 @@ void ife_print_long(struct interface *pt
++ 			addr6p[0], addr6p[1], addr6p[2], addr6p[3],
++ 			addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
++ 		inet6_aftype.input(1, addr6, (struct sockaddr *) &sap);
++-		printf(_("        %s %s  prefixlen %d"),
++-			inet6_aftype.name, 
++-			inet6_aftype.sprint((struct sockaddr *) &sap, 1), 
++-			plen);
++-		printf(_("  scopeid 0x%x"), scope);
++-
++-		flags[0] = '<'; flags[1] = 0;
++-		if (scope & IPV6_ADDR_COMPATv4) {
++-		    	strcat(flags, _("compat,"));
++-		    	scope -= IPV6_ADDR_COMPATv4;
+++		printf(_("          inet6 addr: %s/%d"),
+++		 inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen);
+++		printf(_(" Scope:"));
+++		switch (scope) {
+++		case 0:
+++		    printf(_("Global"));
+++		    break;
+++		case IPV6_ADDR_LINKLOCAL:
+++		    printf(_("Link"));
+++		    break;
+++		case IPV6_ADDR_SITELOCAL:
+++		    printf(_("Site"));
+++		    break;
+++		case IPV6_ADDR_COMPATv4:
+++		    printf(_("Compat"));
+++		    break;
+++		case IPV6_ADDR_LOOPBACK:
+++		    printf(_("Host"));
+++		    break;
+++		default:
+++		    printf(_("Unknown"));
++ 		}
++-		if (scope == 0)
++-			strcat(flags, _("global,"));
++-		if (scope & IPV6_ADDR_LINKLOCAL)
++-			strcat(flags, _("link,"));
++-		if (scope & IPV6_ADDR_SITELOCAL)
++-			strcat(flags, _("site,"));
++-		if (scope & IPV6_ADDR_LOOPBACK)
++-			strcat(flags, _("host,"));
++-		if (flags[strlen(flags)-1] == ',')
++-			flags[strlen(flags)-1] = '>';
++-		else
++-			flags[strlen(flags)-1] = 0;
++-		printf("%s\n", flags);
+++		printf("\n");
++ 	    }
++ 	}
++ 	fclose(f);
++@@ -802,17 +762,17 @@ void ife_print_long(struct interface *pt
++ 
++     if (ipxtype != NULL) {
++ 	if (ptr->has_ipx_bb)
++-	    printf(_("        %s Ethernet-II   %s\n"),
++-		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1));
+++	    printf(_("          IPX/Ethernet II addr:%s\n"),
+++		   ipxtype->sprint(&ptr->ipxaddr_bb, 1));
++ 	if (ptr->has_ipx_sn)
++-	    printf(_("        %s Ethernet-SNAP %s\n"),
++-		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1));
+++	    printf(_("          IPX/Ethernet SNAP addr:%s\n"),
+++		   ipxtype->sprint(&ptr->ipxaddr_sn, 1));
++ 	if (ptr->has_ipx_e2)
++-	    printf(_("        %s Ethernet802.2 %s\n"),
++-		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1));
+++	    printf(_("          IPX/Ethernet 802.2 addr:%s\n"),
+++		   ipxtype->sprint(&ptr->ipxaddr_e2, 1));
++ 	if (ptr->has_ipx_e3)
++-	    printf(_("        %s Ethernet802.3 %s\n"),
++-		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1));
+++	    printf(_("          IPX/Ethernet 802.3 addr:%s\n"),
+++		   ipxtype->sprint(&ptr->ipxaddr_e3, 1));
++     }
++ #endif
++ 
++@@ -821,7 +781,7 @@ void ife_print_long(struct interface *pt
++ 	ddptype = get_afntype(AF_APPLETALK);
++     if (ddptype != NULL) {
++ 	if (ptr->has_ddp)
++-	    printf(_("        %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1));
+++	    printf(_("          EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1));
++     }
++ #endif
++ 
++@@ -830,30 +790,53 @@ void ife_print_long(struct interface *pt
++ 	ectype = get_afntype(AF_ECONET);
++     if (ectype != NULL) {
++ 	if (ptr->has_econet)
++-	    printf(_("        %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1));
+++	    printf(_("          econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1));
++     }
++ #endif
++ 
++-    /* For some hardware types (eg Ash, ATM) we don't print the 
++-       hardware address if it's null.  */
++-    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
++-				  hw->suppress_null_addr)))
++-	printf(_("        %s %s"), hw->name, hw->print(ptr->hwaddr));
++-    else
++-	printf(_("        %s"), hw->name);
++-    if (ptr->tx_queue_len != -1)
++-    	printf(_("  txqueuelen %d"), ptr->tx_queue_len);
++-    printf("  (%s)\n", hw->title);
++-
++-#ifdef IFF_PORTSEL
++-    if (ptr->flags & IFF_PORTSEL) {
++-	printf(_("        media %s"), if_port_text[ptr->map.port][0]);
++-	if (ptr->flags & IFF_AUTOMEDIA)
++-	    printf(_("autoselect"));
++-    	printf("\n");
++-    }
+++    printf("          ");
+++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
+++    if (ptr->flags == 0)
+++	printf(_("[NO FLAGS] "));
+++    if (ptr->flags & IFF_UP)
+++	printf(_("UP "));
+++    if (ptr->flags & IFF_BROADCAST)
+++	printf(_("BROADCAST "));
+++    if (ptr->flags & IFF_DEBUG)
+++	printf(_("DEBUG "));
+++    if (ptr->flags & IFF_LOOPBACK)
+++	printf(_("LOOPBACK "));
+++    if (ptr->flags & IFF_POINTOPOINT)
+++	printf(_("POINTOPOINT "));
+++    if (ptr->flags & IFF_NOTRAILERS)
+++	printf(_("NOTRAILERS "));
+++    if (ptr->flags & IFF_RUNNING)
+++	printf(_("RUNNING "));
+++    if (ptr->flags & IFF_NOARP)
+++	printf(_("NOARP "));
+++    if (ptr->flags & IFF_PROMISC)
+++	printf(_("PROMISC "));
+++    if (ptr->flags & IFF_ALLMULTI)
+++	printf(_("ALLMULTI "));
+++    if (ptr->flags & IFF_SLAVE)
+++	printf(_("SLAVE "));
+++    if (ptr->flags & IFF_MASTER)
+++	printf(_("MASTER "));
+++    if (ptr->flags & IFF_MULTICAST)
+++	printf(_("MULTICAST "));
+++#ifdef HAVE_DYNAMIC
+++    if (ptr->flags & IFF_DYNAMIC)
+++	printf(_("DYNAMIC "));
++ #endif
++-
+++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
+++    printf(_(" MTU:%d  Metric:%d"),
+++	   ptr->mtu, ptr->metric ? ptr->metric : 1);
+++#ifdef SIOCSKEEPALIVE
+++    if (ptr->outfill || ptr->keepalive)
+++	printf(_("  Outfill:%d  Keepalive:%d"),
+++	       ptr->outfill, ptr->keepalive);
+++#endif
+++    printf("\n");
++ 
++     /* If needed, display the interface statistics. */
++ 
++@@ -862,8 +845,19 @@ void ife_print_long(struct interface *pt
++ 	 *      not for the aliases, although strictly speaking they're shared
++ 	 *      by all addresses.
++ 	 */
+++	printf("          ");
+++
+++	printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"),
+++	       ptr->stats.rx_packets, ptr->stats.rx_errors,
+++	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
+++	       ptr->stats.rx_frame_errors);
+++	if (can_compress)
+++	    printf(_("             compressed:%lu\n"), ptr->stats.rx_compressed);
+++
++ 	rx = ptr->stats.rx_bytes;  
+++	tx = ptr->stats.tx_bytes;
++ 	short_rx = rx * 10;  
+++	short_tx = tx * 10;
++ 	if (rx > 1125899906842624ull) {
++ 	    short_rx /= 1125899906842624ull;
++ 	    Rext = "PiB";
++@@ -880,8 +874,6 @@ void ife_print_long(struct interface *pt
++ 	    short_rx /= 1024;
++ 	    Rext = "KiB";
++ 	}
++-	tx = ptr->stats.tx_bytes;
++-	short_tx = tx * 10;
++ 	if (tx > 1125899906842624ull) {
++ 	    short_tx /= 1125899906842624ull;
++ 	    Text = "PiB";
++@@ -899,50 +891,37 @@ void ife_print_long(struct interface *pt
++ 	    Text = "KiB";
++ 	}
++ 
++-	printf("        ");
++-	printf(_("RX packets %llu  bytes %llu (%lu.%lu %s)\n"), 
++-		ptr->stats.rx_packets, 
++-	       rx, (unsigned long)(short_rx / 10), 
++-	       (unsigned long)(short_rx % 10), Rext);
++-	if (can_compress) {
++-  	    printf("        ");
++-	    printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed);
++-	}
++-	printf("        ");
++-	printf(_("RX errors %lu  dropped %lu  overruns %lu  frame %lu\n"),
++-	       ptr->stats.rx_errors, ptr->stats.rx_dropped, 
++-	       ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors);
++-
++-
++-	printf("        ");
++-	printf(_("TX packets %llu  bytes %llu (%lu.%lu %s)\n"),
++-		ptr->stats.tx_packets, 
++-	        tx, (unsigned long)(short_tx / 10), 
++-	        (unsigned long)(short_tx % 10), Text);
++-	if (can_compress) {
++-  	    printf("        ");
++-	    printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed);
++-	}
++-	printf("        ");
++-	printf(_("TX errors %lu  dropped %lu overruns %lu  carrier %lu  collisions %lu\n"),
++-	       ptr->stats.tx_errors,
+++	printf("          ");
+++	printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),
+++	       ptr->stats.tx_packets, ptr->stats.tx_errors,
++ 	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
++-	       ptr->stats.tx_carrier_errors, ptr->stats.collisions);
+++	       ptr->stats.tx_carrier_errors);
+++	printf(_("          collisions:%lu "), ptr->stats.collisions);
+++	if (can_compress)
+++	    printf(_("compressed:%lu "), ptr->stats.tx_compressed);
+++	if (ptr->tx_queue_len != -1)
+++	    printf(_("txqueuelen:%d "), ptr->tx_queue_len);
+++	printf("\n          ");
+++	printf(_("RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"),
+++	       rx, (unsigned long)(short_rx / 10), 
+++	       (unsigned long)(short_rx % 10), Rext, 
+++	       tx, (unsigned long)(short_tx / 10), 
+++	       (unsigned long)(short_tx % 10), Text);
++     }
++ 
++     if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma ||
++ 	 ptr->map.base_addr >= 0x100)) {
++-	printf("        device ");
+++	printf("          ");
++ 	if (ptr->map.irq)
++-	    printf(_("interrupt %d  "), ptr->map.irq);
+++	    printf(_("Interrupt:%d "), ptr->map.irq);
++ 	if (ptr->map.base_addr >= 0x100)	/* Only print devices using it for 
++ 						   I/O maps */
++-	    printf(_("base 0x%x  "), ptr->map.base_addr);
+++	    printf(_("Base address:0x%x "), ptr->map.base_addr);
++ 	if (ptr->map.mem_start) {
++-	    printf(_("memory 0x%lx-%lx  "), ptr->map.mem_start, ptr->map.mem_end);
+++	    printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end);
++ 	}
++ 	if (ptr->map.dma)
++-	    printf(_("  dma 0x%x"), ptr->map.dma);
+++	    printf(_("DMA chan:%x "), ptr->map.dma);
++ 	printf("\n");
++     }
++     printf("\n");
+--- net-tools-1.60.orig/debian/patches/CVS-20061011-includes_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20061011-includes_sync.patch
+@@ -0,0 +1,113 @@
++Sync with upstream CVS, complete log:
++
++2006-10-10 22:14  ecki
++
++	* util-ank.h: fixed signedness compiler warning
++
++2006-09-27 17:59  ecki
++
++	* mii.h: GigE Support by Stephen Hemminger from
++	  http://developer.osdl.org/shemminger/prototypes/mii-tool.tar.bz2
++	  with verbose register patch from Dean Gaudet
++
++2003-06-28 00:19  ecki
++
++	* mii.h: Use new style MII ioctls only. This will give you a
++	  warning, if compiled with old kernel source tree. It will also
++	  not work if compiled with new source on old kernels. The new
++	  ioctls also require root for reading, the old didnt. This fixes
++	  Debian bug #133648. No fallback compatibility is included for
++	  reasons of cleaner source.
++
++2002-03-04 21:47  ecki
++
++	* interface.h: export procnetdev_version, get_dev_fields, get_name
++	  from lib/interface.c for general usage (e.g. in my next patch to
++	  iptunnel)
++
++2001-11-25 03:48  ecki
++
++	* interface.h: this fixes Debian Bug #109164 (netstat -ci does only
++	  print stats once). It also renames add_interface and
++	  free_interface list to if_cache_add/free.  I am not sure if
++	  removing the "proc_read" flag will harm performance, looks likt
++	  this check is never triggereed. Anyway, we need more efficient
++	  b-search sooner or later.
++
++--- net-tools-1.60.orig/include/util-ank.h
+++++ net-tools-1.60/include/util-ank.h
++@@ -75,6 +75,6 @@
++ extern int do_class(int argc, char **argv);
++ extern int do_filter(int argc, char **argv);
++ 
++-extern const char *format_host(int af, void *addr, __u8 *abuf, int alen);
+++extern const char *format_host(int af, void *addr, char *abuf, int alen);
++ 
++ #endif /* __UTILS_H__ */
++--- net-tools-1.60.orig/include/mii.h
+++++ net-tools-1.60/include/mii.h
++@@ -6,11 +6,14 @@
++  * Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
++  */
++ 
++-#ifndef _LINUX_MII_H
++-#define _LINUX_MII_H
+++#ifndef _NETTOOL_MII_H
+++#define _NETTOOLS_MII_H
+++
+++#include <linux/sockios.h>
++ 
++ /* network interface ioctl's for MII commands */
++ #ifndef SIOCGMIIPHY
+++#warning "SIOCGMIIPHY is not defined by your kernel source"
++ #define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */
++ #define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */
++ #define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */
++@@ -38,6 +41,7 @@
++ #define  MII_BMCR_RESTART	0x0200
++ #define  MII_BMCR_DUPLEX	0x0100
++ #define  MII_BMCR_COLTEST	0x0080
+++#define  MII_BMCR_SPEED1000	0x0040
++ 
++ /* Basic Mode Status Register */
++ #define MII_BMSR		0x01
++@@ -83,4 +87,17 @@
++ #define  MII_ANER_PAGE_RX	0x0002
++ #define  MII_ANER_LP_AN_ABLE	0x0001
++ 
++-#endif /* _LINUX_MII_H */
+++#define MII_CTRL1000		0x09
+++#define   MII_BMCR2_1000FULL	0x0200
+++#define   MII_BMCR2_1000HALF	0x0100
+++
+++#define MII_STAT1000		0x0a
+++#define   MII_LPA2_1000LOCALOK  0x2000
+++#define   MII_LPA2_1000REMRXOK	0x1000
+++#define   MII_LPA2_1000FULL	0x0800
+++#define   MII_LPA2_1000HALF	0x0400
+++
+++/* Last register we need for show_basic_mii() */
+++#define MII_BASIC_MAX          (MII_STAT1000+1)
+++
+++#endif /* _NETTOOLS_MII_H */
++--- net-tools-1.60.orig/include/interface.h
+++++ net-tools-1.60/include/interface.h
++@@ -64,13 +64,17 @@
++ extern int if_fetch(struct interface *ife);
++ 
++ extern int for_all_interfaces(int (*)(struct interface *, void *), void *);
++-extern int free_interface_list(void);
+++extern int if_cache_free(void);
++ extern struct interface *lookup_interface(char *name);
++ extern int if_readlist(void);
++ 
++ extern int do_if_fetch(struct interface *ife);
++ extern int do_if_print(struct interface *ife, void *cookie);
++ 
+++extern int    procnetdev_version(char *buf);
+++extern int    get_dev_fields(char *bp, struct interface *ife);
+++extern char * get_name(char *name, char *p);
+++
++ extern void ife_print(struct interface *ptr);
++ 
++ extern int ife_short;
+--- net-tools-1.60.orig/debian/patches/CVS-20031011-hostname.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20031011-hostname.c_sync.patch
+@@ -0,0 +1,97 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.12 - Sat Oct 11 21:08:10 2003 UTC by ecki
++Maik Broemme contributed gcc warning fixes (break after default: label)
++
++Revision 1.11 - Thu Jun 12 03:22:30 2003 UTC by ecki
++make hostname compile warnign free with gcc 3.3 (Ec)
++
++Index: net-tools/hostname.c
++===================================================================
++--- net-tools.orig/hostname.c
+++++ net-tools/hostname.c
++@@ -9,20 +9,19 @@
++  *              dnsdmoainname   
++  *              nisdomainname {name|-F file}
++  *
++- * Version:     hostname 1.96 (1996-02-18)
+++ * Version:     hostname 1.101 (2003-10-11)
++  *
++  * Author:      Peter Tobias <tobias@et-inf.fho-emden.de>
++  *
++  * Changes:
++- *      {1.90}  Peter Tobias :          Added -a and -i options.
++- *      {1.91}  Bernd Eckenfels :       -v,-V rewritten, long_opts 
++- *                                      (major rewrite), usage.
++- *960120 {1.95} Bernd Eckenfels :       -y/nisdomainname - support for get/
++- *                                      setdomainname added 
++- *960218 {1.96} Bernd Eckenfels :       netinet/in.h added
++- *980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
++- *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings
+++ *         {1.90}  Peter Tobias : Added -a and -i options.
+++ *         {1.91}  Bernd Eckenfels : -v,-V rewritten, long_opts (major rewrite), usage.
+++ *19960120 {1.95}  Bernd Eckenfels : -y/nisdomainname - support for get/setdomainname added 
+++ *19960218 {1.96}  Bernd Eckenfels : netinet/in.h added
+++ *19980629 {1.97}  Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
+++ *20000213 {1.99}  Arnaldo Carvalho de Melo : fixed some i18n strings
++  *20010404 {1.100} Arnaldo Carvalho de Melo: use setlocale
+++ *20031011 {1.101} Maik Broemme: gcc 3.x fixes (default: break)
++  *
++  *              This program is free software; you can redistribute it
++  *              and/or  modify it under  the terms of  the GNU General
++@@ -31,7 +30,9 @@
++  *              your option) any later version.
++  */
++ #include <stdio.h>
+++#include <stdlib.h>
++ #include <unistd.h>
+++#include <stdlib.h>
++ #include <getopt.h>
++ #include <string.h>
++ #include <netdb.h>
++@@ -78,6 +79,7 @@ static void setnname(char *nname)
++             fprintf(stderr, _("%s: name too long\n"), program_name);
++             break;
++         default:
+++	    break;
++         }
++ 	exit(1);
++     }
++@@ -97,7 +99,6 @@ static void sethname(char *hname)
++ 	case EINVAL:
++ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
++ 	    break;
++-	default:
++ 	}
++ 	exit(1);
++     };
++@@ -116,7 +117,6 @@ static void setdname(char *dname)
++ 	case EINVAL:
++ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
++ 	    break;
++-	default:
++ 	}
++ 	exit(1);
++     };
++@@ -173,7 +173,6 @@ static void showhname(char *hname, int c
++ 	    *p = '\0';
++ 	printf("%s\n", hp->h_name);
++ 	break;
++-    default:
++     }
++ }
++ 
++@@ -326,11 +325,12 @@ int main(int argc, char **argv)
++ 	    break;
++ 	case 'V':
++ 	    version();
+++	    break; // not reached
++ 	case '?':
++ 	case 'h':
++ 	default:
++ 	    usage();
++-
+++	    break; // not reached
++ 	};
++ 
++ 
+--- net-tools-1.60.orig/debian/patches/Bug#254243-netstat.c-wide-opt.patch
++++ net-tools-1.60/debian/patches/Bug#254243-netstat.c-wide-opt.patch
+@@ -0,0 +1,113 @@
++This patch adds the --wide option to netstat, to avoid truncation of ipv6
++addresses, by Luar Roji. (Bug #254243)
++
++Already in upstream's CVS (rev 1.60)
++
++Index: net-tools/man/en_US/netstat.8
++===================================================================
++--- net-tools.orig/man/en_US/netstat.8
+++++ net-tools/man/en_US/netstat.8
++@@ -8,7 +8,7 @@
++ .\" Modified: Tuan Hoang tqhoang@bigfoot.com 
++ .\"
++ .\"
++-.TH NETSTAT 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+++.TH NETSTAT 8 "2008-11-16" "net\-tools" "Linux Programmer's Manual"
++ 
++ .SH NAME
++ netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships
++@@ -118,6 +118,9 @@ Display summary statistics for each prot
++ .SS "\-\-verbose , \-v"
++ Tell the user what is going on by being verbose. Especially print some
++ useful information about unconfigured address families.
+++.SS "\-\-wide , \-W"
+++Do not truncate IP addresses by using output as wide as needed. This is
+++optional for now to not break existing scripts.
++ .SS "\-\-numeric , \-n"
++ Show numerical addresses instead of trying to determine symbolic host, port
++ or user names.
++Index: net-tools/netstat.c
++===================================================================
++--- net-tools.orig/netstat.c
+++++ net-tools/netstat.c
++@@ -149,6 +149,7 @@ int flag_udp = 0;
++ int flag_igmp= 0;
++ int flag_rom = 0;
++ int flag_exp = 1;
+++int flag_wide= 0;
++ int flag_prg = 0;
++ int flag_arg = 0;
++ int flag_ver = 0;
++@@ -782,16 +783,20 @@ static void tcp_do_one(int lnr, const ch
++ 		 get_sname(htons(local_port), "tcp",
++ 			   flag_not & FLAG_NUM_PORT));
++ 
++-	if ((strlen(local_addr) + strlen(buffer)) > 22)
++-	    local_addr[22 - strlen(buffer)] = '\0';
+++	if (!flag_wide) {
+++	    if ((strlen(local_addr) + strlen(buffer)) > 22)
+++		local_addr[22 - strlen(buffer)] = '\0';
+++	}
++ 
++ 	strcat(local_addr, ":");
++ 	strcat(local_addr, buffer);
++ 	snprintf(buffer, sizeof(buffer), "%s",
++ 		 get_sname(htons(rem_port), "tcp", flag_not & FLAG_NUM_PORT));
++ 
++-	if ((strlen(rem_addr) + strlen(buffer)) > 22)
++-	    rem_addr[22 - strlen(buffer)] = '\0';
+++	if (!flag_wide) {
+++	    if ((strlen(rem_addr) + strlen(buffer)) > 22)
+++		rem_addr[22 - strlen(buffer)] = '\0';
+++	}
++ 
++ 	strcat(rem_addr, ":");
++ 	strcat(rem_addr, buffer);
++@@ -1511,9 +1516,9 @@ static void version(void)
++ 
++ static void usage(void)
++ {
++-    fprintf(stderr, _("usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"));
++-    fprintf(stderr, _("       netstat [-vnNcaeol] [<Socket> ...]\n"));
++-    fprintf(stderr, _("       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n"));
+++    fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"));
+++    fprintf(stderr, _("       netstat [-vWnNcaeol] [<Socket> ...]\n"));
+++    fprintf(stderr, _("       netstat { [-vWeenNac] -i | [-cWnNe] -M | -s }\n\n"));
++ 
++     fprintf(stderr, _("        -r, --route              display routing table\n"));
++     fprintf(stderr, _("        -i, --interfaces         display interface table\n"));
++@@ -1523,6 +1528,7 @@ static void usage(void)
++     fprintf(stderr, _("        -M, --masquerade         display masqueraded connections\n\n"));
++ #endif
++     fprintf(stderr, _("        -v, --verbose            be verbose\n"));
+++    fprintf(stderr, _("        -W, --wide               don't truncate IP addresses\n"));
++     fprintf(stderr, _("        -n, --numeric            don't resolve names\n"));
++     fprintf(stderr, _("        --numeric-hosts          don't resolve host names\n"));
++     fprintf(stderr, _("        --numeric-ports          don't resolve port names\n"));
++@@ -1572,6 +1578,7 @@ int main
++ 	{"programs", 0, 0, 'p'},
++ 	{"verbose", 0, 0, 'v'},
++ 	{"statistics", 0, 0, 's'},
+++	{"wide", 0, 0, 'W'},
++ 	{"numeric", 0, 0, 'n'},
++ 	{"numeric-hosts", 0, 0, '!'},
++ 	{"numeric-ports", 0, 0, '@'},
++@@ -1591,7 +1598,7 @@ int main
++     getroute_init();		/* Set up AF routing support */
++ 
++     afname[0] = '\0';
++-    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF)
+++    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuWVv?wxl64", longopts, &lop)) != EOF)
++ 	switch (i) {
++ 	case -1:
++ 	    break;
++@@ -1635,6 +1642,9 @@ int main
++ 	case 'i':
++ 	    flag_int++;
++ 	    break;
+++	case 'W':
+++	    flag_wide++;
+++	    break;
++ 	case 'n':
++ 	    flag_not |= FLAG_NUM;
++ 	    break;
+--- net-tools-1.60.orig/debian/patches/CVS-20081002-manpages_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20081002-manpages_sync.patch
+@@ -0,0 +1,1398 @@
++Sync from upstream's CVS for all manpages. Full log:
++
++2008-10-02 20:16  ecki
++
++	* en_US/: arp.8, ethers.5, hostname.1, ifconfig.8, mii-tool.8,
++	  nameif.8, netstat.8, plipconfig.8, rarp.8, route.8, slattach.8:
++	  Fix hypen in man pages (Debian Bug#288343 from Andrew Moise) Move
++	  man pages to sysadmin books update samples for route(8) (Debian
++	  Bug#400844, #368697 Danny Rathjens) update see also for
++	  ifconfig(8) (Debian Bug#365916 Dan Jacobs)
++
++2008-10-02 19:42  ecki
++
++	* en_US/arp.8: fix some more hypens, changed book name and updated
++	  date to 2008-10-03
++
++2008-10-02 19:30  ecki
++
++	* en_US/netstat.8: document the additional info in Send-Q/Recv-Q
++	  with recent kernels for listening sockets.
++
++2008-06-16 21:18  ecki
++
++	* en_US/arp.8: Spelling error (Debian Bug #486448 reported by
++	  Volker Stolz)
++
++2007-12-02 01:42  ecki
++
++	* de_DE/netstat.8, en_US/netstat.8, fr_FR/netstat.8,
++	  pt_BR/netstat.8: fixed interfaceS spelling (Debian Bug #435690).
++	  Thanks Alan and Liu Xing.
++
++2007-12-01 15:19  ecki
++
++	* en_US/arp.8: cleanup man page (arp.8 2007-12-01)
++
++2007-11-07 20:01  ecki
++
++	* en_US/ifconfig.8: Fix Formatting Bug for ifconfig.8 (Debian
++	  Bug#450432 reported by Ivan Shmakov)
++
++2006-10-10 02:58  ecki
++
++	* en_US/slattach.8: formatting fixes from Justin Pryzby in Debian
++	  Bug #391495
++
++2005-09-04 00:51  ecki
++
++	* en_US/slattach.8 (tags: net-tools-1_65): Spelling fix for Debian
++	  Bug#326124 reported by A. Costa.
++
++2005-06-30 16:26  ecki
++
++	* en_US/ifconfig.8: minor formatting
++
++2005-06-30 15:42  ecki
++
++	* en_US/ifconfig.8: added pointer to iptables(8) not only
++	  ipchains(8) (Toralf Förster)
++
++2005-05-16 01:30  ecki
++
++	* en_US/arp.8: desupport dontpub in arp.8 and arp -? (Debian Bug
++	  #203396)
++
++2005-05-13 19:34  ecki
++
++	* en_US/ethers.5: line break fix debian bug #305637
++
++2005-05-13 19:31  ecki
++
++	* en_US/mii-tool.8: spellig fix debian bug #305638
++
++2005-05-13 19:28  ecki
++
++	* en_US/route.8: spelling fix debian bug #305640
++
++2004-06-29 17:28  ecki
++
++	* en_US/netstat.8 (tags: net-tools-1_65): little formatting fix
++
++2004-03-28 18:35  ecki
++
++	* en_US/mii-tool.8 (tags: net-tools-1_65): added diagnostics
++	  (closes debian bug #239229: EINVAL for downed interface)
++
++2003-10-02 17:06  ecki
++
++	* en_US/: netstat.8, route.8 (tags: net-tools-1_65): fixes for man
++	  page bugs reported by Hugh Redelmeier.
++
++2003-05-28 17:59  ecki
++
++	* en_US/: ifconfig.8 (tags: net-tools-1_65), netstat.8: fixed
++	  wording of binary units counters and interpunctuation in
++	  netstat(8)
++
++2003-02-25 18:03  ecki
++
++	* en_US/ifconfig.8: Marc Lehmann pointed out that binary prefixes
++	  are made up by the IEEE and are not official SI yet. (Debian Bug
++	  #182478)
++
++2003-02-08 19:49  ecki
++
++	* en_US/ifconfig.8: add a comment about alias interfaces and
++	  primary interface of scopes (intended to fix Debian wishlist bug
++	  #179780 and normal bug #64458)
++
++2002-07-03 20:40  ecki
++
++	* en_US/ifconfig.8: there is no such thing as -i option for
++	  ifconfig removed variable, fixed usage, added options to english
++	  man page
++
++2002-02-20 11:31  ecki
++
++	* de_DE/netstat.8 (tags: net-tools-1_65): fixed typo in german man
++	  page and added a comment that man page is currently not
++	  completely up-to-date.
++
++2001-11-24 02:56  ecki
++
++	* de_DE/netstat.8, en_US/netstat.8: fixed minor errors in netstat.8
++	  man page (--numeric-users was missing, some font problems and
++	  --interfaces has no <interface> argument (Debian Bug #120475)
++	  thanks for the report to Uwe Hermann.
++
++2001-11-11 22:46  ecki
++
++	* en_US/ifconfig.8: added documentation about SI prefixes for
++	  decimal numbers
++
++2001-11-05 10:12  ecki
++
++	* en_US/rarp.8, fr_FR/arp.8, fr_FR/hostname.1, fr_FR/ifconfig.8,
++	  fr_FR/netstat.8, fr_FR/rarp.8, pt_BR/rarp.8 (utags:
++	  net-tools-1_65): changed troff syntax according to ESR's report
++
++2001-11-05 10:07  ecki
++
++	* en_US/arp.8 (tags: net-tools-1_65): fixed troff syntax, as
++	  reported by ESR. Did not changed the date of the man page.
++
++2001-06-29 04:47  ecki
++
++	* en_US/ifconfig.8: made man page more useful and added right link
++	  for irq conflicts in ifconfig.8
++
++2001-06-29 00:50  ecki
++
++	* fr_FR/netstat.8: man page fix CLOSED -> CLOSE
++
++2001-06-29 00:15  ecki
++
++	* en_US/netstat.8: fixed CLOSED -> CLOSE in french and english
++	  manpage as of bug report from Matthew Tippett
++
++Index: net-tools/man/de_DE/netstat.8
++===================================================================
++--- net-tools.orig/man/de_DE/netstat.8
+++++ net-tools/man/de_DE/netstat.8
++@@ -9,7 +9,7 @@
++ .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
++ .\"
++ .\"
++-.TH NETSTAT 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
+++.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
++ 
++ .SH NAME
++ netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen
++@@ -44,7 +44,6 @@ netstat \- Anzeige von Netzwerksverbindu
++ .B netstat
++ .RB [ \-veenpac ]
++ .RB { \-\-interfaces | \-i }
++-.RI [ Schnittstelle ]
++ 
++ .PP
++ 
++@@ -68,6 +67,8 @@ netstat \- Anzeige von Netzwerksverbindu
++ .SH BESCHREIBUNG
++ .B Netstat
++ zeigt Informationen des Linux Netzwerkssystems an.
+++.PP
+++.B Bitte beachten Sie, dass der Inhalt der deutschen man-page nicht vollst\(:andig ist, im Moment.
++ 
++ .SS "(no option)"
++ Ohne Optionen zeigt
++@@ -103,18 +104,17 @@ benutzt das Ausgabeformat von
++ Wegen Details siehe
++ .BR route (8).
++ 
++-.SS "\-i, \-\-interface \fISchnittstelle\fI"
+++.SS "\-i, \-\-interfaces"
++ Wird die
++ .BR -i ", " --interfaces
++-Option verwendet,  so wird eine Tabelle aller (oder der angegebenen
++-.IR Schnittstellen ) 
+++Option verwendet,  so wird eine Tabelle aller Schnittstellen
++ ausgedruckt.  Die Ausgabe ist im Format von
++ .B "ifconfig -e"
++ und wird in
++ .BR ifconfig (8)
++ beschrieben.
++ .B "netstat -ei" 
++-druckt eine Tabelle oder einen Eintrag f\(:ur einen einzelnes Interface wie
+++druckt eine Tabelle f\(:ur Interfaces wie
++ .BR ifconfig .
++ Die
++ .B -a
++@@ -182,7 +182,7 @@ Dies hat den gleichen Effekt wie die Lan
++ und
++ .BR \-\-ddp.
++ 
++-.SS "\-c, \-\-continous"
+++.SS "\-c, \-\-continuous"
++ Mit dieser Option wiederholt
++ .B netstat
++ im Sekundenabstand die Ausgabe, bis es abgebrochen wird.
++Index: net-tools/man/en_US/arp.8
++===================================================================
++--- net-tools.orig/man/en_US/arp.8
+++++ net-tools/man/en_US/arp.8
++@@ -1,56 +1,111 @@
++-.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual"
+++.TH ARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ arp \- manipulate the system ARP cache
++ .SH SYNOPSIS
++ .B arp 
++ .RB [ \-vn ] 
++-.RB [ "\-H type" ] 
++-.RB [ "-i if" ] 
++-.B -a 
++-.RB [ hostname ]
+++.RB [ \-H 
+++.IR type ] 
+++.RB [ \-i
+++.IR if ] 
+++.RB [ \-a ] 
+++.RI [ hostname ]
++ .PP
++ .B arp 
++ .RB [ \-v ]
++-.RB [ "\-i if" ] 
++-.B "\-d hostname"
+++.RB [ \-i
+++.IR if ] 
+++.B \-d 
+++.I hostname
++ .RB [ pub ]
++ .PP
++ .B arp 
++ .RB [ \-v ] 
++-.RB [ "\-H type" ] 
++-.RB [ "\-i if" ] 
++-.B -s hostname hw_addr
+++.RB [ \-H
+++.IR type ] 
+++.RB [ \-i
+++.IR if ] 
+++.B \-s
+++.I hostname hw_addr
++ .RB [ temp ] 
++ .PP
++ .B arp 
++ .RB [ \-v ] 
++-.RB [ "\-H type" ] 
++-.RB [ "\-i if" ] 
++-.B -s hostname hw_addr
++-.RB [ "netmask nm" ] 
+++.RB [ \-H
+++.IR type ] 
+++.RB [ \-i
+++.IR if ] 
+++.B \-s
+++.I hostname hw_addr
+++.RB [ netmask
+++.IR nm ] 
++ .B pub
++ .PP
++ .B arp 
++ .RB [ \-v ] 
++-.RB [ "\-H type" ] 
++-.RB [ "\-i if" ] 
++-.B -Ds hostname ifa
++-.RB [ "netmask nm" ] 
+++.RB [ \-H
+++.IR type ] 
+++.RB [ \-i
+++.IR if ] 
+++.B \-Ds 
+++.I hostname
+++.I ifname
+++.RB [ netmask
+++.IR nm ] 
++ .B pub
++ .PP
++ .B arp 
++ .RB [ \-vnD ]
++-.RB [ "\-H type" ] 
++-.RB [ "-i if" ]
++-.B -f [filename]
+++.RB [ \-H 
+++.IR type ] 
+++.RB [ \-i
+++.IR if ]
+++.B \-f 
+++.RI [ filename ]
++ 
++ .SH DESCRIPTION
++ .B Arp
++-manipulates the kernel's ARP cache in various ways.  The primary options
++-are clearing an address mapping entry and manually setting up one.  For
++-debugging purposes, the
+++manipulates or displays the kernel's IPv4 network neighbour cache. It can add
+++entries to the table, delete one or display the current content.
+++
+++.B ARP
+++stands for Address Resolution Protocol, which is used to find the media
+++access control address of a network neighbour for a given IPv4 Address.
+++.SH MODES
++ .B arp
++-program also allows a complete dump of the ARP cache.
+++with no mode specifier will print the current content of the table. It is
+++possible to limit the number of entries printed, by specifying an hardware
+++address type, interface name or host address.
+++
+++.B arp -d
+++.I address
+++will delete a ARP table entry. Root or netadmin priveledge is required to do
+++this. The entry is found by IP address. If a hostname is given, it will be
+++resolved before looking up the entry in the ARP table.
+++
+++.B arp -s
+++.I address hw_addr
+++is used to set up a new table entry. The format of the 
+++.I hw_addr
+++parameter is dependent on the hardware class, but for most classes one can
+++assume that the usual presentation can be used.  For the Ethernet class,
+++this is 6 bytes in hexadecimal, separated by colons. When adding proxy arp
+++entries (that is those with the
+++.BR pub lish 
+++flag set a 
+++.B netmask 
+++may be specified to proxy arp for entire subnets. This is not good
+++practice, but is supported by older kernels because it can be
+++useful. If the
+++.B temp
+++flag is not supplied entries will be permanent stored into the ARP
+++cache. To simplyfy setting up entries for one of your own network interfaces, you can use the
+++.B "arp \-Ds"
+++.I address ifname
+++form. In that case the hardware address is taken from the interface with the
+++specified name.
+++
+++.br
++ .SH OPTIONS
++ .TP
++ .B "\-v, \-\-verbose"
++@@ -60,7 +115,7 @@ Tell the user what is going on by being 
++ shows numerical addresses instead of trying to determine symbolic host, port
++ or user names.
++ .TP
++-.B "\-H type, \-\-hw-type type"
+++.B "\-H type, \-\-hw\-type type"
++ When setting or reading the ARP cache, this optional parameter tells
++ .B arp
++ which class of entries it should check for.  The default value of
++@@ -76,21 +131,13 @@ Other values might include network techn
++ and
++ .RB "NET/ROM (" netrom ")."
++ .TP
++-.B "\-a [hostname], \-\-display [hostname]"
++-Shows the entries of the specified hosts.  If the
++-.B hostname
++-parameter is not used,
++-.B all
++-entries will be displayed.
++-.TP
++-.B "\-d hostname, \-\-delete hostname"
++-Remove any entry for the specified host.  This can be used if the
++-indicated host is brought down, for example.
+++.B \-a
+++Use alternate BSD style output format (with no fixed columns).
++ .TP
++ .B "\-D, \-\-use-device"
++-Use the interface
++-.BR ifa "'s"
++-hardware address.
+++Instead of a hw_addr, the given argument is the name of an interface. 
+++.B arp
+++will use the MAC address of that interface for the table entry. This is usually the best option to set up a proxy ARP entry to yourself.
++ .TP
++ .B "\-i If, \-\-device If"
++ Select an interface. When dumping the ARP cache only entries matching
++@@ -106,33 +153,15 @@ be answered. 
++ .B NOTE:
++ This has to be different from the interface to which the IP
++ datagrams will be routed.
++-.TP
++-.B "\-s hostname hw_addr, \-\-set hostname"
++-Manually create an ARP address mapping entry for host
++-.B hostname
++-with hardware address set to
++-.B hw_addr
++-.  The format of the hardware address is dependent on the hardware
++-class, but for most classes one can assume that the usual presentation
++-can be used.  For the Ethernet class, this is 6 bytes in hexadecimal,
++-separated by colons. When adding proxy arp entries (that is those with
++-the 
++-.BR pub lish 
++-flag set a 
++-.B netmask 
++-may be specified to proxy arp for entire subnets. This is not good
++-practice, but is supported by older kernels because it can be
++-useful. If the
++-.B temp
++-flag is not supplied entries will be permanent stored into the ARP
++-cache.
++-.br
++ .B NOTE:
++ As of kernel 2.2.0 it is no longer possible to set an ARP entry for an 
++ entire subnet. Linux instead does automagic proxy arp when a route
++ exists and it is forwarding. See 
++ .BR arp (7)
++-for details.
+++for details. Also the
+++.B dontpub
+++option which is available for delete and set operations cannot be 
+++used with 2.4 and newer kernels.
++ .TP
++ .B "\-f filename, \-\-file filename"
++ Similar to the
++@@ -167,8 +196,18 @@ flag. Permanent entries are marked with
++ and published entries have the
++ .B P
++ flag.
+++.SH EXAMPLES
+++.B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub
+++
+++This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for
+++eth1.
+++
+++.B /usr/sbin/arp -i eth1 -d 10.0.0.1
+++
+++Delete the ARP table entry for 10.0.0.1 on interface eth1. This will match
+++published proxy ARP entries and permanent entries.
++ .SH FILES
++-.I /proc/net/arp,
+++.I /proc/net/arp
++ .br
++ .I /etc/networks
++ .br
++@@ -178,5 +217,4 @@ flag.
++ .SH SEE ALSO
++ rarp(8), route(8), ifconfig(8), netstat(8)
++ .SH AUTHORS
++-Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> with a lot of improvements
++-from net-tools Maintainer Bernd Eckenfels <net-tools@lina.inka.de>.
+++Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net\-tools@lina.inka.de>.
++Index: net-tools/man/en_US/ethers.5
++===================================================================
++--- net-tools.orig/man/en_US/ethers.5
+++++ net-tools/man/en_US/ethers.5
++@@ -1,4 +1,4 @@
++-.TH ETHERS 5 "April 26th, 1996" "" "File formats"
+++.TH ETHERS 5 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME \"{{{roff}}}\"{{{
++ ethers \- Ethernet address to IP number database
++ .\"}}}
++@@ -7,17 +7,17 @@ ethers \- Ethernet address to IP number 
++ IP numbers, one line for each IP number:
++ .sp
++ .RS
++-\fIEthernet-address\fP  \fIIP-number\fP
+++\fIEthernet\-address\fP  \fIIP\-number\fP
++ .RE
++ .sp
++-The two items are separated by any number of SPACE and/or TAB char
++-acters.   A \fB#\fP at the beginning of a line starts a comment
++-which extends to the end of the line.  The \fIEthernet-address\fP is
+++The two items are separated by any number of SPACE and/or TAB characters.
+++A \fB#\fP at the beginning of a line starts a comment
+++which extends to the end of the line.  The \fIEthernet\-address\fP is
++ written as
++ .IR x : x : x : x : x : x ,
++ where \fIx\fP is a hexadecimal number between \fB0\fP and \fBff\fP
++ which represents one byte of the address, which is in network byte
++-order (big-endian).  The \fIIP-number\fP may be a hostname which
+++order (big-endian).  The \fIIP\-number\fP may be a hostname which
++ can be resolved by DNS or a dot separated number.
++ .\"}}}
++ .SH EXAMPLES \"{{{
++Index: net-tools/man/en_US/hostname.1
++===================================================================
++--- net-tools.orig/man/en_US/hostname.1
+++++ net-tools/man/en_US/hostname.1
++@@ -1,4 +1,4 @@
++-.TH HOSTNAME 1 "28 Jan 1996" "net-tools" "Linux Programmer's Manual"
+++.TH HOSTNAME 1 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ 
++ .SH NAME
++ hostname \- show or set the system's host name
++@@ -23,7 +23,7 @@ nodename \- show or set the system's DEC
++ .RB [ \-f ]
++ .RB [ \-\-fqdn ]
++ .RB [ \-i ]
++-.RB [ \-\-ip-address ]
+++.RB [ \-\-ip\-address ]
++ .RB [ \-\-long ]
++ .RB [ \-s ]
++ .RB [ \-\-short ]
++@@ -181,7 +181,7 @@ part of the FQDN) in the \fI/etc/hosts\f
++ .I "\-h, \-\-help"
++ Print a usage message and exit.
++ .TP
++-.I "\-i, \-\-ip-address"
+++.I "\-i, \-\-ip\-address"
++ Display the IP address(es) of the host.
++ .TP
++ .I "\-n, \-\-node"
++@@ -205,9 +205,9 @@ Display the NIS domain name. If a parame
++ .SH FILES
++ .B /etc/hosts
++ .SH AUTHOR
++-Peter Tobias, <tobias@et-inf.fho-emden.de>
+++Peter Tobias, <tobias@et\-inf.fho\-emden.de>
++ .br
++-Bernd Eckenfels, <net-tools@lina.inka.de> (NIS and manpage).
+++Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS and manpage).
++ .br
++ Steve Whitehouse, <SteveW@ACM.org> (DECnet support and manpage).
++ 
++Index: net-tools/man/en_US/ifconfig.8
++===================================================================
++--- net-tools.orig/man/en_US/ifconfig.8
+++++ net-tools/man/en_US/ifconfig.8
++@@ -1,10 +1,10 @@
++-.TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual"
+++.TH IFCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ ifconfig \- configure a network interface
++ .SH SYNOPSIS
++-.B "ifconfig [interface]"
+++.B "ifconfig [-v] [-a] [-s] [interface]"
++ .br
++-.B "ifconfig interface [aftype] options | address ..."
+++.B "ifconfig [-v] interface [aftype] options | address ..."
++ .SH DESCRIPTION
++ .B Ifconfig
++ is used to configure the kernel-resident network interfaces.  It is
++@@ -18,7 +18,7 @@ a single
++ .B interface
++ argument is given, it displays the status of the given interface
++ only; if a single
++-.B -a
+++.B \-a
++ argument is given, it displays the status of all interfaces, even
++ those that are down.  Otherwise, it configures an interface.
++ 
++@@ -41,11 +41,27 @@ supported address families include
++ (AMPR Packet radio).
++ .SH OPTIONS
++ .TP
+++.B -a
+++display all interfaces which are currently available, even if down
+++.TP
+++.B -s
+++display a short list (like netstat -i)
+++.TP
+++.B -v
+++be more verbose for some error conditions
+++.TP
++ .B interface
++ The name of the interface.  This is usually a driver name followed by
++ a unit number, for example
++ .B eth0
++-for the first Ethernet interface.
+++for the first Ethernet interface. If your kernel supports alias interfaces,
+++you can specify them with 
+++.B eth0:0
+++for the first alias of eth0. You can use them to assign a second address. To
+++delete an alias interface use
+++.BR "ifconfig eth0:0 down" .
+++Note: for every scope (i.e. same net with address/netmask combination) all
+++aliases are deleted, if you delete the first (primary).
++ .TP
++ .B up
++ This flag causes the interface to be activated.  It is implicitly
++@@ -122,13 +138,13 @@ are 
++ can be used to tell the driver to auto-sense the media.  Again, not
++ all drivers can do this.
++ .TP
++-.B "[-]broadcast [addr]"
+++.B "[\-]broadcast [addr]"
++ If the address argument is given, set the protocol broadcast
++ address for this interface.  Otherwise, set (or clear) the
++ .B IFF_BROADCAST
++ flag for the interface.
++ .TP
++-.B "[-]pointopoint [addr]"
+++.B "[\-]pointopoint [addr]"
++ This keyword enables the
++ .B point-to-point
++ mode of an interface, meaning that it is a direct link between two
++@@ -173,11 +189,20 @@ alias interfaces anymore. The statistics
++ are shared with all alias addresses on the same device. If you want per-address
++ statistics you should add explicit accounting
++ rules for the address using the 
++-.BR ipchains(8)
+++.BR ipchains (8)
+++or
+++.BR iptables (8)
++ command.
++ .LP
++-Interrupt problems with Ethernet device drivers fail with EAGAIN. See
++-.I http://cesdis.gsfc.nasa.gov/linux/misc/irq-conflict.html
+++Since net\-tools 1.60\-4 ifconfig is printing byte counters and human readable
+++counters with IEC 60027-2 units. So 1 KiB are 2^10 byte. Note, the numbers 
+++are truncated to one decimal (which can by quite a large error if you 
+++consider 0.1 PiB is 112.589.990.684.262 bytes :)
+++.LP
+++Interrupt problems with Ethernet device drivers fail with EAGAIN
+++.I (SIOCSIIFLAGS: Resource temporarily unavailable)
+++it is most likely a interrupt conflict. See
+++.I http://www.scyld.com/expert/irq\-conflict.html
++ for more information.
++ .SH FILES
++ .I /proc/net/socket 
++@@ -189,7 +214,9 @@ for more information.
++ While appletalk DDP and IPX addresses will be displayed they cannot be
++ altered by this command.
++ .SH SEE ALSO
++-route(8), netstat(8), arp(8), rarp(8), ipchains(8)
+++route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5).
+++.br
+++http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples
++ .SH AUTHORS
++ Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++ .br
++@@ -198,3 +225,5 @@ Alan Cox, <Alan.Cox@linux.org>
++ Phil Blundell, <Philip.Blundell@pobox.com>
++ .br
++ Andi Kleen
+++.br
+++Bernd Eckenfels, <net\-tools@lina.inka.de>
++Index: net-tools/man/en_US/mii-tool.8
++===================================================================
++--- net-tools.orig/man/en_US/mii-tool.8
+++++ net-tools/man/en_US/mii-tool.8
++@@ -1,13 +1,13 @@
++ .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
++ .\" mii-tool.8 1.5 2000/04/25 22:58:19
++ .\"
++-.TH MII-TOOL 8 "2000/04/25 22:58:19" "net-tools"
+++.TH MII\-TOOL 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ 
++ .SH NAME
++-mii-tool \- view, manipulate media-independent interface status
+++mii\-tool \- view, manipulate media-independent interface status
++ 
++ .SH SYNOPSIS
++-.B mii-tool
+++.B mii\-tool
++ [\fB\-v\fR, \fB\-\-verbose\fR]
++ [\fB\-V\fR, \fB\-\-version\fR]
++ [\fB\-R\fR, \fB\-\-reset\fR]
++@@ -32,12 +32,12 @@ single-speed hubs, are unable to autoneg
++ devices, the MII protocol also allows for establishing a link by
++ simply detecting either a 10baseT or 100baseT link beat.  The \fB\-F\fR
++ or \fB\-\-force\fR options can be used to force the MII to operate in
++-one mode, instead of autonegotiating.  The \fB\-A\fR and \fB-F\fR
+++one mode, instead of autonegotiating.  The \fB\-A\fR and \fB\-F\fR
++ options are mutually exclusive.
++ .PP
++ The default short output reports the negotiated link speed and link
++ status for each interface.  If an interface or interfaces are not
++-specified on the command line, then \fBmii-tool\fR will check any
+++specified on the command line, then \fBmii\-tool\fR will check any
++ available interfaces from \fBeth0\fR through \fBeth7\fR.
++ .SH OPTIONS
++ .TP
++@@ -59,7 +59,7 @@ Watch interface(s) and report changes in
++ interfaces are polled at one second intervals.
++ .TP
++ \fB\-l\fR, \fB\-\-log\fR
++-Used with \fB-w\fR, records link status changes in the system log
+++Used with \fB\-w\fR, records link status changes in the system log
++ instead of printing on standard output.
++ .TP
++ \fB\-F\fI media\fR, \fB\-\-force=\fImedia\fR
++@@ -72,7 +72,24 @@ media technologies.  Multiple technologi
++ commas.  Valid media are \fB100baseT4\fR, \fB100baseTx-FD\fR,
++ \fB100baseTx-HD\fR, \fB10baseT-FD\fR, and \fB10baseT-HD\fR.
++ 
+++.SH DIAGNOSTICS
+++.TP
+++SIOCGMIIPHY on 'eth?' failed: Invalid argument
+++If the interface is not running (up), kernel will refuse to report its link state.
+++.TP
+++SIOCGMIIPHY on 'eth?' failed: Operation not permitted
+++Most kernels restrict access to root.
+++.TP
+++SIOCGMIIPHY on 'eth?' failed: No such device
+++This error is shown, if the kernel does not know about the named device.
+++.TP
+++SIOCGMIIPHY on 'eth?' failed: Operation not supported 
+++The interface in question does not support MII queries. Most likely, it does not have 
+++MII transceivers, at all.
+++
++ .SH AUTHORS
++ David Hinds \- dhinds@pcmcia.sourceforge.org
++ .br
++ Donald Becker \- becker@scyld.com
+++.br
+++Bernd Eckenfels \- ecki@debian.org
++Index: net-tools/man/en_US/nameif.8
++===================================================================
++--- net-tools.orig/man/en_US/nameif.8
+++++ net-tools/man/en_US/nameif.8
++@@ -1,10 +1,10 @@
++-.TH NAMEIF 8 "18 Oct 2000" "net-tools" "Linux's Administrator's Manual"
+++.TH NAMEIF 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ nameif \- name network interfaces based on MAC addresses
++ .SH SYNOPSIS
++-.B "nameif [-c configfile] [-s]"
+++.B "nameif [\-c configfile] [\-s]"
++ .br
++-.B "nameif [-c configfile] [-s] {interface macaddress}"
+++.B "nameif [\-c configfile] [\-s] {interface macaddress}"
++ .SH DESCRIPTION
++ .B nameif 
++ renames network interfaces based on mac addresses. When no arguments are
++@@ -18,11 +18,11 @@ looks for the interface with the given M
++ name given.
++ 
++ When the 
++-.I -s
+++.I \-s
++ argument is given all error messages go to the syslog.
++ 
++ When the 
++-.I -c 
+++.I \-c 
++ argument is given with a file name that file is read instead of /etc/mactab.
++ 
++ .SH NOTES
++Index: net-tools/man/en_US/netstat.8
++===================================================================
++--- net-tools.orig/man/en_US/netstat.8
+++++ net-tools/man/en_US/netstat.8
++@@ -8,7 +8,7 @@
++ .\" Modified: Tuan Hoang tqhoang@bigfoot.com 
++ .\"
++ .\"
++-.TH NETSTAT 8 "19 December 2000" "net-tools" "Linux Programmer's Manual"
+++.TH NETSTAT 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ 
++ .SH NAME
++ netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships
++@@ -23,7 +23,7 @@ netstat \- Print network connections, ro
++ .RB [ \-\-listening | \-l ]
++ .RB [ \-\-all | \-a ]
++ .RB [ \-\-numeric | \-n ]
++-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
+++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
++ .RB [ \-\-symbolic | \-N ]
++ .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
++ .RB [ \-\-timers | \-o ]
++@@ -37,31 +37,30 @@ netstat \- Print network connections, ro
++ .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
++ .RB [ \-\-verbose | \-v ]
++ .RB [ \-\-numeric | \-n ]
++-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
+++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
++ .RB [ \-\-continuous | \-c]
++ .P
++ .B netstat
++ .RB { \-\-interfaces | \-i }
++-.RI [ iface ]
++ .RB [ \-\-all | \-a ]
++ .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
++ .RB [ \-\-verbose | \-v ]
++ .RB [ \-\-program | \-p ]
++ .RB [ \-\-numeric | \-n ]
++-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
+++.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
++ .RB [ \-\-continuous | \-c]
++ .P
++ .B netstat
++ .RB { \-\-groups | \-g }
++ .RB [ \-\-numeric | \-n ]
++-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
+++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
++ .RB [ \-\-continuous | \-c]
++ .P
++ .B netstat
++ .RB { \-\-masquerade | \-M }
++ .RB [ \-\-extend | \-e ]
++ .RB [ \-\-numeric | \-n ]
++-.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
+++.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
++ .RB [ \-\-continuous | \-c]
++ .P
++ .B netstat
++@@ -78,6 +77,8 @@ netstat \- Print network connections, ro
++ .P
++ .IR address_family_options :
++ .PP
+++.RB [ -4 ]
+++.RB [ -6 ]
++ .RB [ \-\-protocol= { inet , unix , ipx , ax25 , netrom , ddp }[, ...] ]
++ .RB [ \-\-unix | \-x ] 
++ .RB [ \-\-inet | \-\-ip ]
++@@ -98,12 +99,17 @@ displays a list of open sockets.  If you
++ address families, then the active sockets of all configured address
++ families will be printed.
++ .SS "\-\-route , \-r"
++-Display the kernel routing tables.
+++Display the kernel routing tables. See the description in 
+++.BR route (8) 
+++for details. 
+++.B netstat -r 
+++and 
+++.B route -e 
+++produce the same output.
++ .SS "\-\-groups , \-g"
++ Display multicast group membership information for IPv4 and IPv6.
++-.SS "\-\-interface=\fIiface \fR, \fB\-i"
++-Display a table of all network interfaces, or the specified
++-.IR iface ) .
+++.SS "\-\-interfaces, \-i"
+++Display a table of all network interfaces.
++ .SS "\-\-masquerade , \-M"
++ Display a list of masqueraded connections.
++ .SS "\-\-statistics , \-s"
++@@ -115,13 +121,13 @@ useful information about unconfigured ad
++ .SS "\-\-numeric , \-n"
++ Show numerical addresses instead of trying to determine symbolic host, port
++ or user names.
++-.SS "\-\-numeric-hosts"
+++.SS "\-\-numeric\-hosts"
++ shows numerical host addresses but does not affect the resolution of
++ port or user names.
++-.SS "\-\-numeric-ports"
+++.SS "\-\-numeric\-ports"
++ shows numerical port numbers but does not affect the resolution of
++ host or user names.
++-.SS "\-\-numeric-users"
+++.SS "\-\-numeric\-users"
++ shows numerical user IDs but does not affect the resolution of host or
++ port names.
++ 
++@@ -164,23 +170,24 @@ Show the PID and name of the program to 
++ Show only listening sockets.  (These are omitted by default.)
++ .SS "\-a, \-\-all"
++ Show both listening and non-listening sockets.  With the
++-.B --interfaces
++-option, show interfaces that are not marked 
+++.B \-\-interfaces
+++option, show interfaces that are not up
++ .SS "\-F"
++ Print routing information from the FIB.  (This is the default.)
++ .SS "\-C"
++ Print routing information from the route cache.
++-.IR UP .
++ .P
++ .SH OUTPUT
++ .P
++ .SS Active Internet connections \fR(TCP, UDP, raw)\fR
++ .SS "Proto" 
++ The protocol (tcp, udp, raw) used by the socket. 
++-.SS "Recv-Q"
++-The count of bytes not copied by the user program connected to this socket.
++-.SS "Send-Q"
++-The count of bytes not acknowledged by the remote host.
+++.SS "Recv\-Q"
+++Established: The count of bytes not copied by the user program connected to this socket.
+++Listening: Since Kernel 2.6.18 this column contains the current syn backlog.
+++.SS "Send\-Q"
+++Established: The count of bytes not acknowledged by the remote host.
+++Listening: Since Kernel 2.6.18 this column contains the maximum size of the syn backlog.
++ .SS "Local Address" 
++ Address and port number of the local end of the socket.  Unless the
++ .BR \-\-numeric " (" \-n )
++@@ -221,7 +228,7 @@ TIME_WAIT
++ The socket is waiting after close to handle packets still in the network.
++ .TP
++ .I
++-CLOSED
+++CLOSE
++ The socket is not being used.
++ .TP
++ .I
++@@ -255,7 +262,7 @@ The username or the user id (UID) of the
++ .SS "PID/Program name"
++ Slash-separated pair of the process id (PID) and process name of the 
++ process that owns the socket.
++-.B --program
+++.B \-\-program
++ causes this column to be included.  You will also need
++ .I superuser
++ privileges to see this information on sockets you don't own.  This
++@@ -358,7 +365,7 @@ to the socket.
++ .PP
++ .SH NOTES
++ Starting with Linux release 2.2 
++-.B netstat -i 
+++.B netstat \-i 
++ does not show interface statistics for alias interfaces. To get per
++ alias interface counters you need to setup explicit rules using the
++ .BR ipchains(8) 
++@@ -438,12 +445,12 @@ as it is viewed. This is unlikely to occ
++ .P
++ .SH AUTHORS
++ The netstat user interface was written by Fred Baumgarten
++-<dc6iq@insu1.etec.uni-karlsruhe.de> the man page basically
+++<dc6iq@insu1.etec.uni\-karlsruhe.de>, the man page basically
++ by Matt Welsh <mdw@tc.cornell.edu>. It was updated by
++ Alan Cox <Alan.Cox@linux.org> but could do with a bit more
++ work.  It was updated again by Tuan Hoang
++ <tqhoang@bigfoot.com>.
++ .br
++-The man page and the command included in the net-tools
+++The man page and the command included in the net\-tools
++ package is totally rewritten by Bernd Eckenfels 
++ <ecki@linux.de>.
++Index: net-tools/man/en_US/plipconfig.8
++===================================================================
++--- net-tools.orig/man/en_US/plipconfig.8
+++++ net-tools/man/en_US/plipconfig.8
++@@ -1,4 +1,4 @@
++-.TH PLIPCONFIG 8 "17 February 1995" "" ""
+++.TH PLIPCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ plipconfig \- fine tune PLIP device parameters 
++ .SH SYNOPSIS
++Index: net-tools/man/en_US/rarp.8
++===================================================================
++--- net-tools.orig/man/en_US/rarp.8
+++++ net-tools/man/en_US/rarp.8
++@@ -1,20 +1,20 @@
++-.TH RARP 8 "4 August 1997" "net-tools" "Linux Programmer's Manual"
+++.TH RARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ rarp \- manipulate the system RARP table
++ .SH SYNOPSIS
++-.B "rarp [-V] [--version] [-h] [--help]"
+++.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]"
++ .br
++-.B "rarp -a"
+++.B "rarp \-a"
++ .br
++-.B "rarp [-v] -d hostname ..."
+++.B "rarp [\-v] \-d hostname ..."
++ .br
++-.B "rarp [-v] [-t type] -s hostname hw_addr"
+++.B "rarp [\-v] [\-t type] \-s hostname hw_addr"
++ .SH NOTE
++ .P
++ This program is obsolete.  From version 2.3, the Linux kernel 
++ no longer contains RARP support.  For a replacement RARP daemon, see
++ .I
++-ftp://ftp.dementia.org/pub/net-tools
+++ftp://ftp.dementia.org/pub/net\-tools
++ .SH DESCRIPTION
++ .B Rarp
++ manipulates the kernel's RARP table in various ways.  The primary options
++@@ -61,8 +61,8 @@ Remove all RARP entries for the specifie
++ Create a RARP address mapping entry for host
++ .B hostname
++ with hardware address set to
++-.B hw_addr
++-.  The format of the hardware address is dependent on the hardware
+++.BR hw_addr .
+++The format of the hardware address is dependent on the hardware
++ class, but for most classes one can assume that the usual presentation
++ can be used.  For the Ethernet class, this is 6 bytes in hexadecimal,
++ separated by colons.
++Index: net-tools/man/en_US/route.8
++===================================================================
++--- net-tools.orig/man/en_US/route.8
+++++ net-tools/man/en_US/route.8
++@@ -1,4 +1,4 @@
++-.TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer's Manual"
+++.TH ROUTE 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ route \- show / manipulate the IP routing table
++ .SH SYNOPSIS
++@@ -51,7 +51,7 @@ If]
++ .RB [ \-V ] 
++ .RB [ \-\-version ]
++ .RB [ \-h ]
++-.RB [ \--help ]
+++.RB [ \-\-help ]
++ .SH DESCRIPTION
++ .B Route
++ manipulates the kernel's IP routing tables.  Its primary use is to set
++@@ -73,16 +73,16 @@ displays the current contents of the rou
++ .SH OPTIONS
++ .TP
++ .B \-A family
++-use the specified address family (eg `inet'; use `route --help' for a full 
+++use the specified address family (eg `inet'; use `route \-\-help' for a full 
++ list).
++ 
++ .TP 
++-.B -F
+++.B \-F
++ operate on the kernel's FIB (Forwarding Information Base) routing
++ table. 
++ This is the default.
++ .TP 
++-.B -C
+++.B \-C
++ operate on the kernel's routing cache.
++ 
++ .TP
++@@ -96,7 +96,7 @@ nameserver has vanished.
++ .TP
++ .B \-e
++ use
++-.BR netstat (8)-format
+++.BR netstat (8)\-format
++ for displaying the routing table.
++ .B \-ee 
++ will generate a very long line with all parameters from the routing table.
++@@ -117,7 +117,7 @@ the
++ .B target
++ is a network.
++ .TP
++-.B -host
+++.B \-host
++ the
++ .B target 
++ is a host.
++@@ -141,7 +141,7 @@ set the metric field in the routing tabl
++ set the TCP Maximum Segment Size (MSS) for connections over this route
++ to M bytes. 
++ The default is the device MTU minus headers, or a lower MTU when path mtu 
++-discovery occured. This setting can be used to force smaller TCP packets on the
+++discovery occurred. This setting can be used to force smaller TCP packets on the
++ other end when path mtu discovery does not work (usually because of
++ misconfigured firewalls that block ICMP Fragmentation Needed)
++ .TP 
++@@ -179,24 +179,27 @@ modifiers (metric - netmask - gw - dev) 
++ 
++ .SH EXAMPLES
++ .TP
++-.B route add -net 127.0.0.0
++-adds the normal loopback entry, using netmask 255.0.0.0 (class A net,
++-determined from the destination address) and associated with the 
++-"lo" device (assuming this device was prviously set up correctly with
+++.B route add \-net 127.0.0.0 netmask 255.0.0.0 dev lo
+++adds the normal loopback entry, using netmask 255.0.0.0 and associated with the 
+++"lo" device (assuming this device was previously set up correctly with
++ .BR ifconfig (8)). 
++ 
++ .TP 
++-.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
++-adds a route to the network 192.56.76.x via 
++-"eth0". The Class C netmask modifier is not really necessary here because
++-192.* is a Class C IP address. The word "dev" can be omitted here. 
+++.B route add \-net 192.56.76.0 netmask 255.255.255.0 dev eth0
+++adds a route to the local network 192.56.76.x via 
+++"eth0".  The word "dev" can be omitted here. 
++ 
++ .TP
++-.B route add default gw mango-gw
+++.B route del default
+++deletes the current default route, which is labeled "default" or 0.0.0.0
+++in the destination field of the current routing table.
+++
+++.TP
+++.B route add default gw mango\-gw
++ adds a default route (which will be used if no other route matches).
++-All packets using this route will be gatewayed through "mango-gw". The
+++All packets using this route will be gatewayed through "mango\-gw". The
++ device which will actually be used for that route depends on how we
++-can reach "mango-gw" - the static route to "mango-gw" will have to be
+++can reach "mango\-gw" - the static route to "mango\-gw" will have to be
++ set up before. 
++ 
++ .TP
++@@ -205,18 +208,18 @@ Adds the route to the "ipx4" host via th
++ "ipx4" is the SLIP host).
++ 
++ .TP
++-.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
+++.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw ipx4
++ This command adds the net "192.57.66.x" to be gatewayed through the former
++ route to the SLIP interface.
++ 
++ .TP
++-.B route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0
+++.B route add \-net 224.0.0.0 netmask 240.0.0.0 dev eth0
++ This is an obscure one documented so people know how to do it. This sets
++ all of the class D (multicast) IP routes to go via "eth0". This is the
++ correct normal configuration line with a multicasting kernel. 
++ 
++ .TP
++-.B route add -net 10.0.0.0 netmask 255.0.0.0 reject
+++.B route add \-net 10.0.0.0 netmask 255.0.0.0 reject
++ This installs a rejecting route for the private network "10.x.x.x."
++ 
++ .LP
++@@ -282,14 +285,14 @@ recent kernels, but may be needed by rou
++ Number of references to this route. (Not used in the Linux kernel.)
++ .TP
++ .B Use
++-Count of lookups for the route.  Depending on the use of -F and -C this will
++-be either route cache misses (-F) or hits (-C).
+++Count of lookups for the route.  Depending on the use of \-F and \-C this will
+++be either route cache misses (\-F) or hits (\-C).
++ .TP
++ .B Iface
++ Interface to which packets for this route will be sent.
++ .TP
++ .B MSS 
++-Default maximum segement size for TCP connections over this route.
+++Default maximum segment size for TCP connections over this route.
++ .TP
++ .B Window  
++ Default window size for TCP connections over this route.
++@@ -323,4 +326,4 @@ for Linux was originally written by Fred
++ Linus Torvalds for pl15. Alan Cox added the mss and window options for
++ Linux 1.1.22. irtt support and merged with netstat from Bernd Eckenfels.
++ .SH AUTHOR
++-Currently maintained by Phil Blundell <Philip.Blundell@pobox.com>.
+++Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>.
++Index: net-tools/man/en_US/slattach.8
++===================================================================
++--- net-tools.orig/man/en_US/slattach.8
+++++ net-tools/man/en_US/slattach.8
++@@ -1,8 +1,8 @@
++-.TH SLATTACH 8 "12 Feb 1994" "" ""
+++.TH SLATTACH 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
++ .SH NAME
++ slattach \- attach a network interface to a serial line
++ .SH SYNOPSIS
++-.B "slattach [-dehlLmnqv] [-c command] [-p proto] [-s speed] [tty]"
+++.B "slattach [\-dehlLmnqv] [\-c command] [\-p proto] [\-s speed] [tty]"
++ .br
++ .SH DESCRIPTION
++ .B Slattach
++@@ -11,47 +11,48 @@ is a tiny little program that can be use
++ you to use it for point-to-point links to other computers.
++ .SH OPTIONS
++ .TP
++-.B "[-c command]"
+++.B "[\-c command]"
++ Execute
++ .B command
++ when the line is hung up. This can be used to run scripts or re-establish
++ connections when a link goes down.
++ .TP
++-.B "[-d]"
+++.B "[\-d]"
++ Enable debugging output.  Useful when determining why a given
++ setup doesn't work.
++ .TP
++-.B "[-h]"
+++.B "[\-h]"
++ Exit when the carrier is lost. This works on both /dev/tty and /dev/cua
++ devices by directly monitoring the carrier status every 15 seconds.
++-.B "[-v]"
+++.TP
+++.B "[\-v]"
++ Enable verbose output.  Useful in shell scripts.
++ .TP
++-.B "[-q]"
+++.B "[\-q]"
++ Operate in quiet mode - no messages at all.
++ .TP
++-.B "[-l]"
+++.B "[\-l]"
++ Create an UUCP-style lockfile for the device in /var/lock.
++ .TP
++-.B "[-n]"
+++.B "[\-n]"
++ Equivalent to the "mesg n" command.
++ .TP
++-.B "[-m]"
+++.B "[\-m]"
++ Do \fBnot\fP initialize the line into 8 bits raw mode.
++ .TP
++-.B "[-e]"
+++.B "[\-e]"
++ Exit right after initializing device, instead of waiting for the
++-line to hangup.
+++line to hang up.
++ .TP
++-.B "[-L]"
+++.B "[\-L]"
++ Enable 3 wire operation. The terminal is moved into CLOCAL mode, 
++ carrier watching is disabled.
++ .TP
++-.B "[-p proto]"
+++.B "[\-p proto]"
++ Set a specific kind of protocol to use on the line.  The default
++ is set to
++-.B "cslip"
++-, i.e. compressed SLIP.  Other possible values are
+++.BR "cslip" ,
+++i.e. compressed SLIP.  Other possible values are
++ .B "slip"
++ (normal SLIP), 
++ .B "adaptive"
++@@ -70,7 +71,7 @@ to be active on the line. For kiss conne
++ .B axattach
++ program should be used.
++ .TP
++-.B "[-s speed]"
+++.B "[\-s speed]"
++ Set a specific line speed, other than the default.
++ .PP
++ If no arguments are given, the current terminal line (usually: the
++Index: net-tools/man/fr_FR/arp.8
++===================================================================
++--- net-tools.orig/man/fr_FR/arp.8
+++++ net-tools/man/fr_FR/arp.8
++@@ -140,8 +140,8 @@ pour un sous réseau entier.
++ Similaire à l'option 
++ .B \-s
++ , mais cette fois les informations d'adresses sont prises dans le fichier
++-.B nom_de_fichier
++-. Ceci peut être utilisé si les entrées ARP à configurer sont
+++.BR nom_de_fichier .
+++Ceci peut être utilisé si les entrées ARP à configurer sont
++ nombreuses.  Le nom du fichier de données est très souvent nommé
++ .B /etc/ethers
++ , mais ce n'est pas officiel.
++@@ -160,8 +160,8 @@ en notation décimale pointée.
++ .LP
++ Chaque entrée complète se trouvant dans le cache ARP est marquée de
++ l'indicateur
++-.B C
++-. Les entrées permanentes sont marquées de l'indicateur
+++.BR C .
+++Les entrées permanentes sont marquées de l'indicateur
++ .B M
++ et les entrées 'pub' ont l'indicateur
++ .B P
++Index: net-tools/man/fr_FR/hostname.1
++===================================================================
++--- net-tools.orig/man/fr_FR/hostname.1
+++++ net-tools/man/fr_FR/hostname.1
++@@ -84,8 +84,8 @@ Appelé sans argument, le programme affic
++ .LP
++ .B hostname
++ fournit le nom du système tel qu'il est retourné par la fonction
++-.BR getdomainname (2)
++-. Ceci est connu comme nom de domaine YP/NIS du système.
+++.BR getdomainname (2).
+++Ceci est connu comme nom de domaine YP/NIS du système.
++ 
++ 
++ .LP
++@@ -145,8 +145,8 @@ Le nom de domaine DNS est la partie suiv
++ .LP
++ La façon dont vous pouvez le changer dépend de la configuration
++ (habituellement dans 
++-.IR /etc/host.conf )
++-. Si le fichier 'hosts' est analysé avant d'interroger le DNS ou 
+++.IR /etc/host.conf ).
+++Si le fichier 'hosts' est analysé avant d'interroger le DNS ou 
++ NIS) vous pouvez le changer dans le fichier 
++ .IR /etc/hosts .
++ 
++Index: net-tools/man/fr_FR/ifconfig.8
++===================================================================
++--- net-tools.orig/man/fr_FR/ifconfig.8
+++++ net-tools/man/fr_FR/ifconfig.8
++@@ -60,14 +60,14 @@ le signe moins (\-) est présent, l'optio
++ .TP
++ .B "[\-]promisc"
++ Valide ou invalide le mode
++-.B promiscuous
++-.  S'il est validé, tous les paquets circulant sur le réseau
+++.BR promiscuous .
+++S'il est validé, tous les paquets circulant sur le réseau
++ seront reçus sur cette interface.
++ .TP
++ .B "[\-]allmulti"
++ Valide ou invalide le fonctionnement de l'interface en mode
++-.B all-multicast
++-.  S'il est validé, tous les paquets multicast circulant sur le réseau
+++.BR all-multicast .
+++S'il est validé, tous les paquets multicast circulant sur le réseau
++ seront reçus sur cette interface.
++ .TP
++ .B "metric N"
++Index: net-tools/man/fr_FR/netstat.8
++===================================================================
++--- net-tools.orig/man/fr_FR/netstat.8
+++++ net-tools/man/fr_FR/netstat.8
++@@ -8,7 +8,7 @@
++ .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
++ .\"
++ .\"
++-.TH NETSTAT 8 "25 Fév 1999" "net-tools" "Linux Programmer's Manual"
+++.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual"
++ 
++ .SH NAME
++ netstat \- Affiche les connexions réseau, les tables de routage, les
++@@ -106,7 +106,7 @@ Veuillez consulter
++ .BR route (8)
++ pour plus de détails.
++ 
++-.SS "\-i, \-\-interface \fIiface\fI"
+++.SS "\-i, \-\-interfaces \fIiface\fI"
++ Si vous utilisez l'option
++ .BR -i ", " --interfaces
++ , une table de toutes (ou de l'interface
++@@ -118,8 +118,8 @@ même que celui de la commande
++ .BR ifconfig (8).
++ .B "netstat -ei"
++ affiche une table ou une seule entrée d'interface comme la commande 
++-.B ifconfig
++-. Avec le paramètre
+++.BR ifconfig .
+++Avec le paramètre
++ .B -a
++ , vous pouvez inclure les interfaces qui ne sont pas configurées (c.a.d qui
++ n'ont pas l'indicateur
++@@ -249,7 +249,7 @@ La socket attend le traitement de tous l
++ avant d'entreprendre la fermeture.
++ .TP
++ .I
++-CLOSED
+++CLOSE
++ La socket n'est pas utilisée.
++ .TP
++ .I
++@@ -409,8 +409,7 @@ Affiche le chemin correspondant à l'atta
++ Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques
++ des interfaces alias. Pour obtenir les compteurs par interface alias, vous
++ devez définir des règles spécifiques à l'aide de la commande
++-.BR ipchains(8) 
++-.  
+++.BR ipchains (8).
++ 
++ .SH FICHIERS
++ .ta
++Index: net-tools/man/fr_FR/rarp.8
++===================================================================
++--- net-tools.orig/man/fr_FR/rarp.8
+++++ net-tools/man/fr_FR/rarp.8
++@@ -55,8 +55,8 @@ Supprime toutes les entrées RARP relativ
++ Crée manuellement une correspondance d'adresses RARP pour l'hôte
++ .B nom_d_hôte
++ avec l'adresse matérielle
++-.B adr_materielle
++-. Le format de l'adresse matérielle est dépendant du matériel,
+++.BR adr_materielle .
+++Le format de l'adresse matérielle est dépendant du matériel,
++ mais pour la plupart on peut considérer que la présentation classique
++ peut être utilisée.  Pour la classe Ethernet, c'est 6 octets en hexadécimal,
++ séparés par des double-points.
++Index: net-tools/man/pt_BR/netstat.8
++===================================================================
++--- net-tools.orig/man/pt_BR/netstat.8
+++++ net-tools/man/pt_BR/netstat.8
++@@ -8,7 +8,7 @@
++ .\" Traduzido para português por Arnaldo Carvalho de Melo <acme@conectiva.com.br>
++ .\" Revisado por Jorge Luiz Godoy Filho <jorge@bestway.com.br>
++ .\"
++-.TH NETSTAT 8 "19 de maio de 1997" "net-tools" "Manual do Programador Linux"
+++.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
++ 
++ .SH NOME
++ netstat \- Mostra conexões de rede, tabelas de roteamento, estatísticas de interface e conexões
++@@ -97,7 +97,7 @@ Por favor veja
++ .BR route (8)
++ para maiores detalhes.
++ 
++-.SS "\-i, \-\-interface \fIiface\fI"
+++.SS "\-i, \-\-interfaces \fIiface\fI"
++ Se você usar a opção
++ .BR -i ", " --interfaces
++ , uma tabela de todas (ou da
++Index: net-tools/man/pt_BR/rarp.8
++===================================================================
++--- net-tools.orig/man/pt_BR/rarp.8
+++++ net-tools/man/pt_BR/rarp.8
++@@ -50,8 +50,8 @@ máquina indicada for desligada, por exem
++ Cria um mapeamento de endereços RARP para a máquina
++ .B máquina
++ com endereço de hardware configurado para
++-.B endereço_hardware
++-.  O formato do endereço de hardware depende da classe do hardware, mas
+++.B endereço_hardware.
+++O formato do endereço de hardware depende da classe do hardware, mas
++ para a maioria das classes você pode assumir que a apresentação usual pode
++ ser usada.  Para a classe Ethernet, são 6 bytes em hexadecimal, separados
++ por dois pontos (:).
+--- net-tools-1.60.orig/debian/patches/translations.patch
++++ net-tools-1.60/debian/patches/translations.patch
+@@ -0,0 +1,24458 @@
++Probably unsyncable changes, extracted from diff.gz
++
++Index: net-tools/po/pt_BR.po
++===================================================================
++--- net-tools.orig/po/pt_BR.po
+++++ net-tools/po/pt_BR.po
++@@ -10,275 +10,287 @@
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: net-tools 1.54\n"
++-"POT-Creation-Date: 2000-02-14 02:31+0100\n"
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
++ "PO-Revision-Date: 1999-03-01 02:38+0100\n"
++ "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
++ "MIME-Version: 1.0\n"
++-"Content-Type: text/plain; charset=ISO8859-9\n"
+++"Content-Type: text/plain; charset=ISO-8859-9\n"
++ "Content-Transfer-Encoding: 8bit\n"
++ 
++-#: ../arp.c:110 ../arp.c:269
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
++ msgid "arp: need host name\n"
++ msgstr "arp: preciso do nome da máquina\n"
++ 
++-#: ../arp.c:207 ../arp.c:221
+++#: ../arp.c:215 ../arp.c:230
++ #, c-format
++ msgid "No ARP entry for %s\n"
++ msgstr "Nenhuma entrada ARP para %s\n"
++ 
++-#: ../arp.c:239
+++#: ../arp.c:248
++ #, c-format
++ msgid "arp: cant get HW-Address for `%s': %s.\n"
++ msgstr "arp: não foi possível obter o endereço de hardware para `%s': %s.\n"
++ 
++-#: ../arp.c:243
+++#: ../arp.c:252
+++#, c-format
++ msgid "arp: protocol type mismatch.\n"
++ msgstr "arp: erro no tipo do protocolo.\n"
++ 
++-#: ../arp.c:252
+++#: ../arp.c:261
++ #, c-format
++ msgid "arp: device `%s' has HW address %s `%s'.\n"
++ msgstr "arp: o dispositivo `%s' tem endereço de hardware %s `%s'.\n"
++ 
++-#: ../arp.c:282
+++#: ../arp.c:293
+++#, c-format
++ msgid "arp: need hardware address\n"
++ msgstr "arp: preciso do endereço de hardware\n"
++ 
++-#: ../arp.c:290
+++#: ../arp.c:301
+++#, c-format
++ msgid "arp: invalid hardware address\n"
++ msgstr "arp: endereço inválido de hardware\n"
++ 
++-#: ../arp.c:387
+++#: ../arp.c:398
++ #, c-format
++ msgid "arp: cannot open etherfile %s !\n"
++ msgstr "arp: não foi possível abrir o arquivo etherfile %s!\n"
++ 
++-#: ../arp.c:403
+++#: ../arp.c:414
++ #, c-format
++ msgid "arp: format error on line %u of etherfile %s !\n"
++ msgstr "arp: erro de formato na linha %u do arquivo etherfile %s!\n"
++ 
++-#: ../arp.c:416
+++#: ../arp.c:427
++ #, c-format
++ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
++ msgstr "arp: não foi possível configurar a linha %u do arquivo etherfile %s!\n"
++ 
++-#: ../arp.c:437
++-msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
+++#: ../arp.c:448
+++#, fuzzy, c-format
+++msgid ""
+++"Address                  HWtype  HWaddress           Flags Mask            "
+++"Iface\n"
++ msgstr "Endereço\t\tTipoHW\tEndereçoHW\t Flags Mascara\t\t Iface\n"
++ 
++-#: ../arp.c:467
+++#: ../arp.c:476
+++#, fuzzy
+++msgid "<from_interface>"
+++msgstr "%s: interface desconhecida.\n"
+++
+++#: ../arp.c:478
++ msgid "(incomplete)"
++ msgstr "(incompleto)"
++ 
++-#: ../arp.c:484
+++#: ../arp.c:495
++ #, c-format
++ msgid "%s (%s) at "
++ msgstr "%s (%s) em "
++ 
++-#: ../arp.c:490
+++#: ../arp.c:501
+++#, c-format
++ msgid "<incomplete> "
++ msgstr "<incompleto> "
++ 
++-#: ../arp.c:496
+++#: ../arp.c:507
++ #, c-format
++ msgid "netmask %s "
++ msgstr "mascara %s "
++ 
++-#: ../arp.c:513
+++#: ../arp.c:524
++ #, c-format
++ msgid "on %s\n"
++ msgstr "em %s\n"
++ 
++-#: ../arp.c:592
+++#: ../arp.c:605
++ #, c-format
++ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
++ msgstr "Entradas: %d\tIgnorada: %d\tEncontrada: %d\n"
++ 
++-#: ../arp.c:596
+++#: ../arp.c:609
++ #, c-format
++ msgid "%s (%s) -- no entry\n"
++ msgstr "%s (%s) -- nenhuma entrada\n"
++ 
++-#: ../arp.c:598
+++#: ../arp.c:611
++ #, c-format
++ msgid "arp: in %d entries no match found.\n"
++ msgstr "arp: em %d entradas não foi encontrado.\n"
++ 
++-#: ../arp.c:613
+++#: ../arp.c:626
+++#, c-format
++ msgid ""
++ "Usage:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
++ "cache\n"
++ msgstr ""
++ "Uso:\n"
++-"  arp [-vn]  [<HW>] [-i <if>] [-a] [<máquina>]             <-Mostra cache "
++-"ARP\n"
+++"  arp [-vn]  [<HW>] [-i <if>] [-a] [<máquina>]             <-Mostra cache ARP\n"
++ 
++-#: ../arp.c:614
+++#: ../arp.c:627
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
++ "entry\n"
++-msgstr ""
++-"  arp [-v]          [-i <if>] -d  <máquina>  [pub][nopub]  <-Remove entrada "
++-"ARP\n"
+++msgstr "  arp [-v]          [-i <if>] -d  <máquina>  [pub][nopub]  <-Remove entrada ARP\n"
++ 
++-#: ../arp.c:615
+++#: ../arp.c:628
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
++ "file\n"
++ msgstr ""
++ "  arp [-vnD] [<HW>] [-i <if>] -f  [<arquivo>]         <-Inclui entrada de "
++ "arquivo\n"
++ 
++-#: ../arp.c:616
+++#: ../arp.c:629
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
++ "entry\n"
++-msgstr ""
++-"  arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [temp][nopub] <-Inc. "
++-"Entrada\n"
++-
++-#: ../arp.c:617
++-msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
++-"<-''-\n"
++-msgstr ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <máquina> <end_hw>  [netmask <nm>] pub  "
++-"<-''-\n"
+++msgstr "  arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [temp][nopub] <-Inc. Entrada\n"
++ 
++-#: ../arp.c:618
+++#: ../arp.c:630
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
++ "<-''-\n"
++ "\n"
++-msgstr ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <máquina>  <if> [netmask <nm>] pub      "
++-"<-''-\n"
+++msgstr "  arp [-v]   [<HW>] [-i <if>] -Ds <máquina>  <if> [netmask <nm>] pub      <-''-\n"
++ 
++-#: ../arp.c:620
+++#: ../arp.c:632
+++#, c-format
++ msgid ""
++ "        -a                       display (all) hosts in alternative (BSD) "
++ "style\n"
++-msgstr ""
++-"        -a               mostra (todas as) máquinas no estilo alternativo "
++-"(BSD)\n"
+++msgstr "        -a               mostra (todas as) máquinas no estilo alternativo (BSD)\n"
++ 
++-#: ../arp.c:621
+++#: ../arp.c:633
+++#, c-format
++ msgid "        -s, --set                set a new ARP entry\n"
++ msgstr "        -s, --set                define uma nova entrada ARP\n"
++ 
++-#: ../arp.c:622
+++#: ../arp.c:634
+++#, c-format
++ msgid "        -d, --delete             delete a specified entry\n"
++ msgstr "        -d, --delete             remove a entrada especificada\n"
++ 
++-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
++ msgid "        -v, --verbose            be verbose\n"
++ msgstr "        -v, --verbose           listagem detalhada\n"
++ 
++-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
++-msgid "        -n, --numeric            dont resolve names\n"
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, fuzzy, c-format
+++msgid "        -n, --numeric            don't resolve names\n"
++ msgstr "        -n, --numeric           não resolve nomes\n"
++ 
++-#: ../arp.c:625
+++#: ../arp.c:637
+++#, c-format
++ msgid ""
++ "        -i, --device             specify network interface (e.g. eth0)\n"
++ msgstr ""
++ "        -i, --device             especifica a interface de rede (ex: eth0)\n"
++ 
++-#: ../arp.c:626
+++#: ../arp.c:638
+++#, c-format
++ msgid "        -D, --use-device         read <hwaddr> from given device\n"
++ msgstr "        -D, --use-device         leia <hwaddr> de um dispositivo\n"
++ 
++-#: ../arp.c:627
+++#: ../arp.c:639
+++#, c-format
++ msgid "        -A, -p, --protocol       specify protocol family\n"
++ msgstr "        -A, -p, --protocol       especifica a família de protocolos\n"
++ 
++-#: ../arp.c:628
+++#: ../arp.c:640
+++#, c-format
++ msgid ""
++-"        -f, --file               read new entries from file or from "
++-"/etc/ethers\n"
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
++ "\n"
++ msgstr ""
++-"        -f, --file             leia novas entradas de arquivo ou de "
++-"/etc/ethers\n"
+++"        -f, --file             leia novas entradas de arquivo ou de /etc/"
+++"ethers\n"
++ "\n"
++ 
++-#: ../arp.c:630 ../rarp.c:181
+++#: ../arp.c:642 ../rarp.c:182
++ #, c-format
++ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
++-msgstr ""
++-" <HW>=Use '-H <hw>' para especificar o tipo de endereço de hw. Default: %s\n"
+++msgstr " <HW>=Use '-H <hw>' para especificar o tipo de endereço de hw. Default: %s\n"
++ 
++-#: ../arp.c:631 ../rarp.c:182
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
++ msgid "  List of possible hardware types (which support ARP):\n"
++ msgstr "  Lista dos tipos de hardware possíveis (que suportam ARP):\n"
++ 
++-#: ../arp.c:664
+++#: ../arp.c:677 ../arp.c:762
++ #, c-format
++ msgid "%s: hardware type not supported!\n"
++ msgstr "%s: tipo de hardware não suportado!\n"
++ 
++-#: ../arp.c:668
+++#: ../arp.c:681
++ #, c-format
++ msgid "%s: address family not supported!\n"
++ msgstr "%s: família de endereços não suportada!\n"
++ 
++-#: ../arp.c:703
+++#: ../arp.c:716
+++#, c-format
++ msgid "arp: -N not yet supported.\n"
++ msgstr "arp: -N ainda não suportada.\n"
++ 
++-#: ../arp.c:713
+++#: ../arp.c:726
++ #, c-format
++ msgid "arp: %s: unknown address family.\n"
++ msgstr "arp: %s: família de endereços desconhecida.\n"
++ 
++-#: ../arp.c:722
+++#: ../arp.c:735
++ #, c-format
++ msgid "arp: %s: unknown hardware type.\n"
++ msgstr "arp: %s: tipo de hardware desconhecido.\n"
++ 
++-#: ../arp.c:741
+++#: ../arp.c:754
++ #, c-format
++ msgid "arp: %s: kernel only supports 'inet'.\n"
++ msgstr "arp: %s: kernel somente suporta ínet'.\n"
++ 
++-#: ../arp.c:746
+++#: ../arp.c:767
++ #, c-format
++ msgid "arp: %s: hardware type without ARP support.\n"
++ msgstr "arp: %s: tipo de hardware sem suporte a ARP.\n"
++ 
++-#: ../hostname.c:69
+++#: ../hostname.c:71
++ #, c-format
++ msgid "Setting nodename to `%s'\n"
++ msgstr "Configurando nome do nó como `%s'\n"
++ 
++-#: ../hostname.c:74
+++#: ../hostname.c:76
++ #, c-format
++ msgid "%s: you must be root to change the node name\n"
++ msgstr "%s: você deve ser root para mudar o nome do nó\n"
++ 
++-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
++ #, c-format
++ msgid "%s: name too long\n"
++ msgstr "%s: nome muito longo\n"
++ 
++-#: ../hostname.c:89
+++#: ../hostname.c:91
++ #, c-format
++ msgid "Setting hostname to `%s'\n"
++ msgstr "Configurando nome da máquina para `%s'\n"
++ 
++-#: ../hostname.c:94
+++#: ../hostname.c:96
++ #, c-format
++ msgid "%s: you must be root to change the host name\n"
++ msgstr "%s: você deve ser root para mudar o nome da máquina\n"
++ 
++-#: ../hostname.c:108
+++#: ../hostname.c:109
++ #, c-format
++ msgid "Setting domainname to `%s'\n"
++ msgstr "Configurando nome do domínio para `%s'\n"
++ 
++-#: ../hostname.c:113
+++#: ../hostname.c:114
++ #, c-format
++ msgid "%s: you must be root to change the domain name\n"
++ msgstr "%s: você deve ser root para mudar o nome do domínio\n"
++@@ -303,37 +315,38 @@ msgstr "Resultado: h_aliases=`%s'\n"
++ msgid "Result: h_addr_list=`%s'\n"
++ msgstr "Resultado: h_addr_list=`%s'\n"
++ 
++-#: ../hostname.c:209
+++#: ../hostname.c:208
++ #, c-format
++ msgid "%s: can't open `%s'\n"
++ msgstr "%s: não foi possível abrir `%s'\n"
++ 
++-#: ../hostname.c:223
+++#: ../hostname.c:222
+++#, c-format
++ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
++-msgstr ""
++-"Uso: hostname [-v] {máquina|-F arquivo}       configura nome da máquina (de "
++-"arquivo)\n"
+++msgstr "Uso: hostname [-v] {máquina|-F arquivo}       configura nome da máquina (de arquivo)\n"
++ 
++-#: ../hostname.c:224
+++#: ../hostname.c:223
+++#, c-format
++ msgid ""
++ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
++ msgstr ""
++ "       domainname [-v] {domínio_nis|-F file} configura nome do domínio NIS\n"
++ "                                             (a partir de arquivo)\n"
++ 
++-#: ../hostname.c:226
+++#: ../hostname.c:225
+++#, c-format
++ msgid ""
++ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
++ "file)\n"
++-msgstr ""
++-"Uso: hostname [-v] {máquina|-F arquivo}   configura o nome do nó DECnet (de "
++-"arquivo)\n"
+++msgstr "Uso: hostname [-v] {máquina|-F arquivo}   configura o nome do nó DECnet (de arquivo)\n"
++ 
++-#: ../hostname.c:228
+++#: ../hostname.c:227
+++#, c-format
++ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
++ msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  mostra nome formatado\n"
++ 
++-#: ../hostname.c:229
+++#: ../hostname.c:228
+++#, c-format
++ msgid ""
++ "       hostname [-v]                         display hostname\n"
++ "\n"
++@@ -341,7 +354,8 @@ msgstr ""
++ "     hostname [-v]                            mostra nome da máquina\n"
++ "\n"
++ 
++-#: ../hostname.c:230
+++#: ../hostname.c:229
+++#, c-format
++ msgid ""
++ "       hostname -V|--version|-h|--help       print info and exit\n"
++ "\n"
++@@ -349,7 +363,8 @@ msgstr ""
++ "     hostname -V|--version|-h|--help          mostra informações e termina\n"
++ "\n"
++ 
++-#: ../hostname.c:231
+++#: ../hostname.c:230
+++#, c-format
++ msgid ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++@@ -357,35 +372,43 @@ msgstr ""
++ "    dnsdomainname=máquina -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++ 
++-#: ../hostname.c:232
+++#: ../hostname.c:231
+++#, c-format
++ msgid "    -s, --short           short host name\n"
++ msgstr "    -s, --short           nome curto da máquina\n"
++ 
++-#: ../hostname.c:233
+++#: ../hostname.c:232
+++#, c-format
++ msgid "    -a, --alias           alias names\n"
++ msgstr "    -a, --alias           aliases para a máquina\n"
++ 
++-#: ../hostname.c:234
+++#: ../hostname.c:233
+++#, c-format
++ msgid "    -i, --ip-address      addresses for the hostname\n"
++ msgstr "    -i, --ip-address      endereços da máquina\n"
++ 
++-#: ../hostname.c:235
+++#: ../hostname.c:234
+++#, c-format
++ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
++ msgstr "    -f, --fqdn, --long    nome longo da máquina (FQDN)\n"
++ 
++-#: ../hostname.c:236
+++#: ../hostname.c:235
+++#, c-format
++ msgid "    -d, --domain          DNS domain name\n"
++ msgstr "    -d, --domain          nome do domínio DNS\n"
++ 
++-#: ../hostname.c:237
+++#: ../hostname.c:236
+++#, c-format
++ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
++ msgstr "    -y, --yp, --nis       nome do domínio NIS/YP\n"
++ 
++-#: ../hostname.c:239
+++#: ../hostname.c:238
+++#, c-format
++ msgid "    -n, --node            DECnet node name\n"
++ msgstr "    -n, --node            nome do nó DECnet\n"
++ 
++-#: ../hostname.c:241
+++#: ../hostname.c:240
+++#, c-format
++ msgid ""
++ "    -F, --file            read hostname or NIS domainname from given file\n"
++ "\n"
++@@ -393,7 +416,8 @@ msgstr ""
++ "    -F, --file            leia o nome da máquina ou domínio NIS do arquivo\n"
++ "\n"
++ 
++-#: ../hostname.c:243
+++#: ../hostname.c:242
+++#, c-format
++ msgid ""
++ "   This command can read or set the hostname or the NIS domainname. You can\n"
++ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
++@@ -413,15 +437,16 @@ msgid "%s: You can't change the DNS doma
++ msgstr "%s: Você não pode mudar o nome do domínio DNS com este comando\n"
++ 
++ #: ../hostname.c:339
+++#, c-format
++ msgid ""
++ "\n"
++ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
++ msgstr ""
++ "\n"
++-"A menos que esteja usando bind ou NIS para resolução de nomes você pode "
++-"mudar\n"
+++"A menos que esteja usando bind ou NIS para resolução de nomes você pode mudar\n"
++ 
++ #: ../hostname.c:340
+++#, c-format
++ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
++ msgstr "o nome do domínio DNS (que é parte do FQDN) no arquivo /etc/hosts.\n"
++ 
++@@ -440,552 +465,453 @@ msgstr "getdomainname()=`%s'\n"
++ msgid "getnodename()=`%s'\n"
++ msgstr "getnodename()=`%s'\n"
++ 
++-#: ../ifconfig.c:159
++-#, c-format
++-msgid "%-9.9s Link encap:%s  "
++-msgstr "%-9.9s  Encapsulamento do Link: %s  "
+++#: ../ifconfig.c:107
+++#, fuzzy, c-format
+++msgid ""
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Flg\n"
+++msgstr "Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV Opções\n"
++ 
++-#: ../ifconfig.c:164
++-#, c-format
++-msgid "HWaddr %s  "
++-msgstr "Endereço de HW %s  "
+++#: ../ifconfig.c:129 ../ifconfig.c:161
+++#, fuzzy, c-format
+++msgid "%s: ERROR while getting interface flags: %s\n"
+++msgstr ""
+++"%s: erro obtendo informações da interface: %s\n"
+++"\n"
++ 
++-#: ../ifconfig.c:167
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
++ #, c-format
++-msgid "Media:%s"
++-msgstr "Mídia:%s"
+++msgid "No support for INET on this system.\n"
+++msgstr "Este sistema não tem suporte a INET.\n"
++ 
++-#: ../ifconfig.c:169
++-msgid "(auto)"
++-msgstr "(auto)"
+++#: ../ifconfig.c:193
+++#, fuzzy, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr ""
+++"%s: erro obtendo informações da interface: %s\n"
+++"\n"
++ 
++-#: ../ifconfig.c:176
++-#, c-format
++-msgid "          %s addr:%s "
++-msgstr "          %s end.: %s "
+++#: ../ifconfig.c:202
+++#, fuzzy, c-format
+++msgid ""
+++"Usage:\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++msgstr ""
+++"Uso:\n"
+++"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endereço>]\n"
++ 
++-#: ../ifconfig.c:179
+++#: ../ifconfig.c:204
++ #, c-format
++-msgid " P-t-P:%s "
++-msgstr " P-a-P:%s "
+++msgid "  [add <address>[/<prefixlen>]]\n"
+++msgstr "  [add <endereço>[/<tam_prefixo>]]\n"
++ 
++-#: ../ifconfig.c:182
+++#: ../ifconfig.c:205
++ #, c-format
++-msgid " Bcast:%s "
++-msgstr " Bcast:%s "
+++msgid "  [del <address>[/<prefixlen>]]\n"
+++msgstr "  [del <endereço>[/<tam_prefixo>]]\n"
++ 
++-#: ../ifconfig.c:184
+++#: ../ifconfig.c:206
++ #, c-format
++-msgid " Mask:%s\n"
++-msgstr " Masc:%s\n"
+++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
+++msgstr "  [[-]broadcast [<endereço>]]  [[-]pointopoint [<endereço>]]\n"
++ 
++-#: ../ifconfig.c:201
+++#: ../ifconfig.c:207
++ #, c-format
++-msgid "          inet6 addr: %s/%d"
++-msgstr "          endereço inet6: %s/%d"
++-
++-#: ../ifconfig.c:203
++-msgid " Scope:"
++-msgstr " Escopo:"
++-
++-#: ../ifconfig.c:206
++-msgid "Global"
++-msgstr "Global"
+++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
+++msgstr "  [netmask <endereço>]  [dstaddr <endereço>]  [tunnel <endereço>]\n"
++ 
++-#: ../ifconfig.c:209
++-msgid "Link"
++-msgstr "Link"
+++#: ../ifconfig.c:210
+++#, c-format
+++msgid "  [outfill <NN>] [keepalive <NN>]\n"
+++msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++ 
++ #: ../ifconfig.c:212
++-msgid "Site"
++-msgstr "Site"
++-
++-#: ../ifconfig.c:215
++-msgid "Compat"
++-msgstr "Compat"
++-
++-#: ../ifconfig.c:218
++-msgid "Host"
++-msgstr "Máquina"
++-
++-#: ../ifconfig.c:221
++-msgid "Unknown"
++-msgstr "Desconhecido"
++-
++-#: ../ifconfig.c:236
++ #, c-format
++-msgid "          IPX/Ethernet II addr:%s\n"
++-msgstr "      Endereço IPX/Ethernet II:%s\n"
+++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
+++msgstr "  [hw <HW> <endereço>]  [metric <NN>]  [mtu <NN>]\n"
++ 
++-#: ../ifconfig.c:239
+++#: ../ifconfig.c:213
++ #, c-format
++-msgid "          IPX/Ethernet SNAP addr:%s\n"
++-msgstr "      Endereço IPX/Ethernet SNAP:%s\n"
+++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ 
++-#: ../ifconfig.c:242
+++#: ../ifconfig.c:214
++ #, c-format
++-msgid "          IPX/Ethernet 802.2 addr:%s\n"
++-msgstr "      Endereço IPX/Ethernet 802.2:%s\n"
+++msgid "  [multicast]  [[-]promisc]\n"
+++msgstr "  [multicast]  [[-]promisc]\n"
++ 
++-#: ../ifconfig.c:245
+++#: ../ifconfig.c:215
++ #, c-format
++-msgid "          IPX/Ethernet 802.3 addr:%s\n"
++-msgstr "      Endereço IPX/Ethernet 802.3:%s\n"
+++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
+++msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tipo>]\n"
++ 
++-#: ../ifconfig.c:255
+++#: ../ifconfig.c:217
++ #, c-format
++-msgid "          EtherTalk Phase 2 addr:%s\n"
++-msgstr "          Endereço EtherTalk fase 2:%s\n"
+++msgid "  [txqueuelen <NN>]\n"
+++msgstr "  [txqueuelen <NN>]\n"
++ 
++-#: ../ifconfig.c:264
+++#: ../ifconfig.c:220
++ #, c-format
++-msgid "          econet addr:%s\n"
++-msgstr "          Endereço econet:%s\n"
++-
++-#: ../ifconfig.c:270
++-msgid "[NO FLAGS] "
++-msgstr "[NENHUMA FLAG] "
++-
++-#: ../ifconfig.c:272
++-msgid "UP "
++-msgstr "UP "
++-
++-#: ../ifconfig.c:274
++-msgid "BROADCAST "
++-msgstr "BROADCAST"
++-
++-#: ../ifconfig.c:276
++-msgid "DEBUG "
++-msgstr "DEBUG "
++-
++-#: ../ifconfig.c:278
++-msgid "LOOPBACK "
++-msgstr "LOOPBACK"
++-
++-#: ../ifconfig.c:280
++-msgid "POINTOPOINT "
++-msgstr "POINTOPOINT "
++-
++-#: ../ifconfig.c:282
++-msgid "NOTRAILERS "
++-msgstr "NOTRAILERS "
++-
++-#: ../ifconfig.c:284
++-msgid "RUNNING "
++-msgstr "RUNNING "
+++msgid "  [[-]dynamic]\n"
+++msgstr "  [[-]dynamic]\n"
++ 
++-#: ../ifconfig.c:286
++-msgid "NOARP "
++-msgstr "NOARP "
+++#: ../ifconfig.c:222
+++#, c-format
+++msgid ""
+++"  [up|down] ...\n"
+++"\n"
+++msgstr ""
+++"  [up|down] ...\n"
+++"\n"
++ 
++-#: ../ifconfig.c:288
++-msgid "PROMISC "
++-msgstr "PROMISC "
+++#: ../ifconfig.c:224
+++#, c-format
+++msgid "  <HW>=Hardware Type.\n"
+++msgstr "  <HW>=Tipo de Hardware.\n"
++ 
++-#: ../ifconfig.c:290
++-msgid "ALLMULTI "
++-msgstr "ALLMULTI "
+++#: ../ifconfig.c:225
+++#, c-format
+++msgid "  List of possible hardware types:\n"
+++msgstr "  Lista dos tipos possíveis de hardware:\n"
++ 
++-#: ../ifconfig.c:292
++-msgid "SLAVE "
++-msgstr "SLAVE "
+++#. 1 = ARPable
+++#: ../ifconfig.c:227
+++#, c-format
+++msgid "  <AF>=Address family. Default: %s\n"
+++msgstr "  <AF>=Família de endereços. Default: %s\n"
++ 
++-#: ../ifconfig.c:294
++-msgid "MASTER "
++-msgstr "MASTER "
+++#: ../ifconfig.c:228
+++#, c-format
+++msgid "  List of possible address families:\n"
+++msgstr "  Lista de famílias de endereços possíveis:\n"
++ 
++-#: ../ifconfig.c:296
++-msgid "MULTICAST "
++-msgstr "MULTICAST "
+++#: ../ifconfig.c:303
+++#, c-format
+++msgid "ifconfig: option `%s' not recognised.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:299
++-msgid "DYNAMIC "
++-msgstr "DYNAMIC "
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
+++msgid "ifconfig: `--help' gives usage information.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:302
+++#: ../ifconfig.c:380
++ #, c-format
++-msgid " MTU:%d  Metric:%d"
++-msgstr " MTU:%d  Métrica:%d"
+++msgid "Unknown media type.\n"
+++msgstr "Tipo desconhecido de mídia.\n"
++ 
++-#: ../ifconfig.c:306
+++#: ../ifconfig.c:417
++ #, c-format
++-msgid "  Outfill:%d  Keepalive:%d"
++-msgstr "  Outfill:%d  Keepalive:%d"
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:320
+++#: ../ifconfig.c:429
++ #, c-format
++-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
++-msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposições:%lu frame:%lu\n"
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:325
+++#: ../ifconfig.c:441
++ #, c-format
++-msgid "             compressed:%lu\n"
++-msgstr "             compactados:%lu\n"
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:329
+++#: ../ifconfig.c:465
++ #, c-format
++-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
++ msgstr ""
++-"Pacotes TX:%lu erros:%lu descartados:%lu sobreposições:%lu portadora:%lu\n"
++ 
++-#: ../ifconfig.c:333
+++#: ../ifconfig.c:523
++ #, c-format
++-msgid "          collisions:%lu "
++-msgstr "          colisões:%lu "
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:335
+++#: ../ifconfig.c:652
++ #, c-format
++-msgid "compressed:%lu "
++-msgstr "compactados:%lu "
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:337
+++#: ../ifconfig.c:684
++ #, c-format
++-msgid "txqueuelen:%d "
++-msgstr "txqueuelen:%d "
++-
++-#: ../ifconfig.c:345
++-#, c-format
++-msgid "Interrupt:%d "
++-msgstr "IRQ:%d "
++-
++-#. Only print devices using it for
++-#. I/O maps
++-#: ../ifconfig.c:348
++-#, c-format
++-msgid "Base address:0x%x "
++-msgstr "Endereço de E/S:0x%x "
+++msgid "hw address type `%s' has no handler to set address. failed.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:350
+++#: ../ifconfig.c:693
++ #, c-format
++-msgid "Memory:%lx-%lx "
++-msgstr "Memória:%lx-%lx "
+++msgid "%s: invalid %s address.\n"
+++msgstr "%s: endereço %s inválido.\n"
++ 
++-#: ../ifconfig.c:353
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
++ #, c-format
++-msgid "DMA chan:%x "
++-msgstr "Canal DMA:%x "
+++msgid "No support for INET6 on this system.\n"
+++msgstr "Este sistema não tem suporte a INET6.\n"
++ 
++-#: ../ifconfig.c:384 ../ifconfig.c:405
+++#: ../ifconfig.c:780 ../ifconfig.c:871
++ #, c-format
++-msgid "%s: unknown interface: %s\n"
++-msgstr "%s: interface desconhecida: %s\n"
++-
++-#: ../ifconfig.c:421
++-msgid ""
++-"Usage:\n"
++-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
++-msgstr ""
++-"Uso:\n"
++-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endereço>]\n"
++-
++-#: ../ifconfig.c:425
++-msgid "  [add <address>[/<prefixlen>]]\n"
++-msgstr "  [add <endereço>[/<tam_prefixo>]]\n"
++-
++-#: ../ifconfig.c:427
++-msgid "  [del <address>[/<prefixlen>]]\n"
++-msgstr "  [del <endereço>[/<tam_prefixo>]]\n"
++-
++-#: ../ifconfig.c:432
++-msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
++-msgstr "  [[-]broadcast [<endereço>]]  [[-]pointopoint [<endereço>]]\n"
++-
++-#: ../ifconfig.c:433
++-msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++-msgstr "  [netmask <endereço>]  [dstaddr <endereço>]  [tunnel <endereço>]\n"
++-
++-#: ../ifconfig.c:436
++-msgid "  [outfill <NN>] [keepalive <NN>]\n"
++-msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++-
++-#: ../ifconfig.c:438
++-msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
++-msgstr "  [hw <HW> <endereço>]  [metric <NN>]  [mtu <NN>]\n"
++-
++-#: ../ifconfig.c:439
++-msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-
++-#: ../ifconfig.c:440
++-msgid "  [multicast]  [[-]promisc]\n"
++-msgstr "  [multicast]  [[-]promisc]\n"
++-
++-#: ../ifconfig.c:441
++-msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++-msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tipo>]\n"
++-
++-#: ../ifconfig.c:443
++-msgid "  [txqueuelen <NN>]\n"
++-msgstr "  [txqueuelen <NN>]\n"
++-
++-#: ../ifconfig.c:446
++-msgid "  [[-]dynamic]\n"
++-msgstr "  [[-]dynamic]\n"
++-
++-#: ../ifconfig.c:448
++-msgid ""
++-"  [up|down] ...\n"
++-"\n"
+++msgid "Interface %s not initialized\n"
++ msgstr ""
++-"  [up|down] ...\n"
++-"\n"
++-
++-#: ../ifconfig.c:450
++-msgid "  <HW>=Hardware Type.\n"
++-msgstr "  <HW>=Tipo de Hardware.\n"
++-
++-#: ../ifconfig.c:451
++-msgid "  List of possible hardware types:\n"
++-msgstr "  Lista dos tipos possíveis de hardware:\n"
++-
++-#. 1 = ARPable
++-#: ../ifconfig.c:453
++-#, c-format
++-msgid "  <AF>=Address family. Default: %s\n"
++-msgstr "  <AF>=Família de endereços. Default: %s\n"
++-
++-#: ../ifconfig.c:454
++-msgid "  List of possible address families:\n"
++-msgstr "  Lista de famílias de endereços possíveis:\n"
++-
++-#: ../ifconfig.c:593
++-msgid "Unknown media type.\n"
++-msgstr "Tipo desconhecido de mídia.\n"
++ 
++-#: ../ifconfig.c:881
++-#, c-format
++-msgid "%s: invalid %s address.\n"
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, fuzzy, c-format
+++msgid "Bad address.\n"
++ msgstr "%s: endereço %s inválido.\n"
++ 
++-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
++-msgid "No support for INET6 on this system.\n"
++-msgstr "Este sistema não tem suporte a INET6.\n"
++-
++-#: ../ifconfig.c:983
+++#: ../ifconfig.c:885
+++#, c-format
++ msgid "Address deletion not supported on this system.\n"
++ msgstr "Remoção de endereço não suportada neste sistema.\n"
++ 
++-#: ../ifconfig.c:1066
++-msgid "No support for INET on this system.\n"
++-msgstr "Este sistema não tem suporte a INET.\n"
+++#: ../ifconfig.c:957
+++#, fuzzy, c-format
+++msgid "ifconfig: Cannot set address for this protocol family.\n"
+++msgstr "Não sei como configurar endereços para a família %d.\n"
++ 
++-#: ../ifconfig.c:1076
+++#: ../ifconfig.c:983
+++#, c-format
++ msgid "No support for ECONET on this system.\n"
++ msgstr "Este sistema não tem suporte a ECONET.\n"
++ 
++-#: ../ifconfig.c:1084
+++#: ../ifconfig.c:991
++ #, c-format
++ msgid "Don't know how to set addresses for family %d.\n"
++ msgstr "Não sei como configurar endereços para a família %d.\n"
++ 
++-#: ../netstat.c:383
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr ""
+++
+++#: ../netstat.c:434
++ #, c-format
++ msgid ""
++ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
++-msgstr ""
++-"(Não foi possível ler informações para \"-p\": geteuid()=%d mas você deve "
++-"ser root.)\n"
+++msgstr "(Não foi possível ler informações para \"-p\": geteuid()=%d mas você deve ser root.)\n"
++ 
++-#: ../netstat.c:387
+++#: ../netstat.c:438
+++#, c-format
++ msgid ""
++ "(Not all processes could be identified, non-owned process info\n"
++ " will not be shown, you would have to be root to see it all.)\n"
++ msgstr ""
++-"(Nem todos os processos puderam ser identificados, informações sobre "
++-"processos\n"
+++"(Nem todos os processos puderam ser identificados, informações sobre processos\n"
++ " de outrem não serão mostrados, você deve ser root para vê-los todos.)\n"
++ 
++-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
++ msgid "LISTENING"
++ msgstr "OUVINDO"
++ 
++-#: ../netstat.c:395
+++#: ../netstat.c:446
++ msgid "CONN SENT"
++ msgstr "CONN ENVIADO"
++ 
++-#: ../netstat.c:396 ../netstat.c:1168
+++#: ../netstat.c:447 ../netstat.c:1268
++ msgid "DISC SENT"
++ msgstr "DISC ENVIADO"
++ 
++-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
++ msgid "ESTABLISHED"
++ msgstr "ESTABELECIDA"
++ 
++-#: ../netstat.c:419
+++#: ../netstat.c:470
+++#, c-format
++ msgid "Active NET/ROM sockets\n"
++ msgstr "Ative sockets NET/ROM\n"
++ 
++-#: ../netstat.c:420
+++#: ../netstat.c:471
+++#, c-format
++ msgid ""
++-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
++-"Recv-Q\n"
++-msgstr ""
++-"Usuário    Destino    Origem  Dispositivo Estado      Vr/Vs  Send-Q  Recv-Q\n"
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
+++msgstr "Usuário    Destino    Origem  Dispositivo Estado      Vr/Vs  Send-Q  Recv-Q\n"
++ 
++-#: ../netstat.c:430 ../netstat.c:1208
+++#: ../netstat.c:481 ../netstat.c:1308
++ #, c-format
++ msgid "Problem reading data from %s\n"
++ msgstr "Problemas lendo dados de %s\n"
++ 
++-#: ../netstat.c:465
+++#: ../netstat.c:516
++ msgid "SYN_SENT"
++ msgstr "SYN_ENVIADO"
++ 
++-#: ../netstat.c:466
+++#: ../netstat.c:517
++ msgid "SYN_RECV"
++ msgstr "SYN_RECEBIDO"
++ 
++-#: ../netstat.c:467
+++#: ../netstat.c:518
++ msgid "FIN_WAIT1"
++ msgstr "ESPERA_FIN1"
++ 
++-#: ../netstat.c:468
+++#: ../netstat.c:519
++ msgid "FIN_WAIT2"
++ msgstr "ESPERA_FIN2"
++ 
++-#: ../netstat.c:469
+++#: ../netstat.c:520
++ msgid "TIME_WAIT"
++ msgstr "TIME_WAIT"
++ 
++-#: ../netstat.c:470
+++#: ../netstat.c:521
++ msgid "CLOSE"
++ msgstr "FECHAR"
++ 
++-#: ../netstat.c:471
+++#: ../netstat.c:522
++ msgid "CLOSE_WAIT"
++ msgstr "ESPERANDO_FECHAR"
++ 
++-#: ../netstat.c:472
+++#: ../netstat.c:523
++ msgid "LAST_ACK"
++ msgstr "ÚLTIMO_ACK"
++ 
++-#: ../netstat.c:473
+++#: ../netstat.c:524
++ msgid "LISTEN"
++ msgstr "OUÇA"
++ 
++-#: ../netstat.c:474
+++#: ../netstat.c:525
++ msgid "CLOSING"
++ msgstr "FECHANDO"
++ 
++-#: ../netstat.c:544
+++#: ../netstat.c:596
++ #, c-format
++ msgid "warning, got bogus igmp6 line %d.\n"
++ msgstr "atenção, recebi linha igmp6 inválida %d.\n"
++ 
++-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
++-#: ../netstat.c:935 ../netstat.c:940
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
++ #, c-format
++ msgid "netstat: unsupported address family %d !\n"
++ msgstr "netstat: família de protocolos %d não suportada!\n"
++ 
++-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
++ #, c-format
++ msgid "warning, got bogus igmp line %d.\n"
++ msgstr "atenção, recebi linha igmp inválida %d.\n"
++ 
++-#: ../netstat.c:666
+++#: ../netstat.c:677
+++#, fuzzy, c-format
+++msgid "Active X.25 sockets\n"
+++msgstr "Ativar sockets AX.25\n"
+++
+++#. IMHO, Vr/Vs is not very usefull --SF
+++#: ../netstat.c:679
+++#, fuzzy, c-format
+++msgid ""
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
+++msgstr "Destino    Origem Dispositivo Estado       Vr/Vs  Send-Q  Recv-Q\n"
+++
+++#: ../netstat.c:759
+++#, c-format
++ msgid "warning, got bogus tcp line.\n"
++ msgstr "atenção, recebi linha tcp inválida.\n"
++ 
++-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
++ #, c-format
++ msgid "off (0.00/%ld/%d)"
++ msgstr "desligado (0.00/%ld/%ld)"
++ 
++-#: ../netstat.c:708
+++#: ../netstat.c:804
++ #, c-format
++ msgid "on (%2.2f/%ld/%d)"
++ msgstr "em (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:713
+++#: ../netstat.c:809
++ #, c-format
++ msgid "keepalive (%2.2f/%ld/%d)"
++ msgstr "keepalive (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:718
+++#: ../netstat.c:814
++ #, c-format
++ msgid "timewait (%2.2f/%ld/%d)"
++ msgstr "timewait (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
++ #, c-format
++ msgid "unkn-%d (%2.2f/%ld/%d)"
++ msgstr "desconh.-%d (%2.2f/%ld)"
++ 
++-#: ../netstat.c:799
+++#: ../netstat.c:894
+++#, c-format
++ msgid "warning, got bogus udp line.\n"
++ msgstr "atenção, recebi linha udp inválida.\n"
++ 
++-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
++ msgid "UNKNOWN"
++ msgstr "DESCONHECIDA"
++ 
++-#: ../netstat.c:860 ../netstat.c:980
+++#: ../netstat.c:958 ../netstat.c:1080
++ #, c-format
++ msgid "on%d (%2.2f/%ld/%d)"
++ msgstr "ligado %d (%2.2f/%ld)"
++ 
++-#: ../netstat.c:949
+++#: ../netstat.c:1046
+++#, c-format
++ msgid "warning, got bogus raw line.\n"
++ msgstr "atenção, recebi linha raw inválida.\n"
++ 
++-#: ../netstat.c:1028
+++#: ../netstat.c:1128
+++#, c-format
++ msgid "warning, got bogus unix line.\n"
++ msgstr "atenção, recebi linha unix inválida.\n"
++ 
++-#: ../netstat.c:1055
+++#: ../netstat.c:1155
++ msgid "STREAM"
++ msgstr "STREAM"
++ 
++-#: ../netstat.c:1059
+++#: ../netstat.c:1159
++ msgid "DGRAM"
++ msgstr "DGRAM"
++ 
++-#: ../netstat.c:1063
+++#: ../netstat.c:1163
++ msgid "RAW"
++ msgstr "RAW"
++ 
++-#: ../netstat.c:1067
+++#: ../netstat.c:1167
++ msgid "RDM"
++ msgstr "RDM"
++ 
++-#: ../netstat.c:1071
+++#: ../netstat.c:1171
++ msgid "SEQPACKET"
++ msgstr "SEQPACKET"
++ 
++-#: ../netstat.c:1080
+++#: ../netstat.c:1180
++ msgid "FREE"
++ msgstr "LIVRE"
++ 
++-#: ../netstat.c:1096
+++#: ../netstat.c:1196
++ msgid "CONNECTING"
++ msgstr "CONECTANDO"
++ 
++-#: ../netstat.c:1100
+++#: ../netstat.c:1200
++ msgid "CONNECTED"
++ msgstr "CONECTADO"
++ 
++-#: ../netstat.c:1104
+++#: ../netstat.c:1204
++ msgid "DISCONNECTING"
++ msgstr "DESCONECTANDO"
++ 
++-#: ../netstat.c:1135
+++#: ../netstat.c:1235
+++#, c-format
++ msgid "Active UNIX domain sockets "
++ msgstr "Domain sockets UNIX ativos "
++ 
++-#: ../netstat.c:1137 ../netstat.c:1666
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
++ msgid "(servers and established)"
++ msgstr "(servidores e estabelecidas)"
++ 
++-#: ../netstat.c:1140 ../netstat.c:1669
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
++ msgid "(only servers)"
++ msgstr "(sem os servidores)"
++ 
++-#: ../netstat.c:1142 ../netstat.c:1671
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
++ msgid "(w/o servers)"
++ msgstr "(sem os servidores)"
++ 
++-#: ../netstat.c:1145
+++#: ../netstat.c:1245
+++#, c-format
++ msgid ""
++ "\n"
++ "Proto RefCnt Flags       Type       State         I-Node"
++@@ -993,114 +919,118 @@ msgstr ""
++ "\n"
++ "Proto CntRef Flags       Tipo       Estado        I-Node Rota"
++ 
++-#: ../netstat.c:1147
+++#: ../netstat.c:1247
+++#, c-format
++ msgid " Path\n"
++ msgstr " Caminho\n"
++ 
++-#: ../netstat.c:1167
+++#: ../netstat.c:1267
++ msgid "SABM SENT"
++ msgstr "SABM ENVIADO"
++ 
++-#: ../netstat.c:1170
+++#: ../netstat.c:1270
++ msgid "RECOVERY"
++ msgstr "RECUPERAÇÃO"
++ 
++-#: ../netstat.c:1184
+++#: ../netstat.c:1284
+++#, c-format
++ msgid "Active AX.25 sockets\n"
++ msgstr "Ativar sockets AX.25\n"
++ 
++-#: ../netstat.c:1185
+++#: ../netstat.c:1285
+++#, c-format
++ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
++ msgstr "Destino    Origem Dispositivo Estado       Vr/Vs  Send-Q  Recv-Q\n"
++ 
++-#: ../netstat.c:1228
+++#: ../netstat.c:1328
++ #, c-format
++ msgid "problem reading data from %s\n"
++ msgstr "problemas lendo dados de %s\n"
++ 
++-#: ../netstat.c:1279
+++#: ../netstat.c:1379
+++#, c-format
++ msgid ""
++ "Active IPX sockets\n"
++ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
++ "State"
++ msgstr ""
++ "Sockets IPX ativos\n"
++-"Proto Recv-Q Send-Q Endereço Local             Endereço Remoto           "
++-"Estado"
+++"Proto Recv-Q Send-Q Endereço Local             Endereço Remoto           Estado"
++ 
++-#: ../netstat.c:1281
+++#: ../netstat.c:1381
+++#, c-format
++ msgid " User"
++ msgstr " Usuário"
++ 
++-#: ../netstat.c:1315
+++#: ../netstat.c:1415
++ msgid "ESTAB"
++ msgstr "ESTAB"
++ 
++-#: ../netstat.c:1323
+++#: ../netstat.c:1423
++ msgid "UNK."
++ msgstr "DESC."
++ 
++-#: ../netstat.c:1367
++-msgid "     - no statistics available -"
++-msgstr "     - estatísticas não disponíveis -"
++-
++-#: ../netstat.c:1370
++-msgid "[NO FLAGS]"
++-msgstr "[SEM FLAGS]"
++-
++-#: ../netstat.c:1400
+++#: ../netstat.c:1461
+++#, c-format
++ msgid "Kernel Interface table\n"
++ msgstr "Tabela de Interfaces do Kernel\n"
++ 
++-#: ../netstat.c:1401
+++#: ../netstat.c:1465
+++#, fuzzy, c-format
++ msgid ""
++-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++-msgstr ""
++-"Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV "
++-"Opções\n"
+++msgstr "Iface     MTU Met  RX-OK RX-ERR RX-DRP RX-OVR  TX-OK TX-ERR TX-DRP TX-OV Opções\n"
++ 
++-#: ../netstat.c:1404
+++#: ../netstat.c:1469
++ msgid "missing interface information"
++ msgstr "falta informação da interface"
++ 
++-#: ../netstat.c:1425
+++#: ../netstat.c:1492
+++#, c-format
++ msgid ""
++-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ msgstr ""
++ "uso: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"
++ 
++-#: ../netstat.c:1426
+++#: ../netstat.c:1493
+++#, c-format
++ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ msgstr "     netstat [-vnNcaeo] [<Socket>]\n"
++ 
++-#: ../netstat.c:1427
+++#: ../netstat.c:1494
+++#, c-format
++ msgid ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++ msgstr "     netstat [-vnNcaeo] [<Socket>]\n"
++ 
++-#: ../netstat.c:1429
+++#: ../netstat.c:1496
+++#, c-format
++ msgid "        -r, --route              display routing table\n"
++ msgstr "        -r, --route             mostra tabela de roteamento\n"
++ 
++-#: ../netstat.c:1430
+++#: ../netstat.c:1497
+++#, c-format
++ msgid "        -i, --interfaces         display interface table\n"
++ msgstr "        -i, --interfaces        mostra tabela de interfaces\n"
++ 
++-#: ../netstat.c:1431
+++#: ../netstat.c:1498
+++#, c-format
++ msgid "        -g, --groups             display multicast group memberships\n"
++ msgstr ""
++ "        -o, --timers            mostra temporizadores\n"
++ "\n"
++ 
++-#: ../netstat.c:1432
+++#: ../netstat.c:1499
+++#, c-format
++ msgid ""
++ "        -s, --statistics         display networking statistics (like SNMP)\n"
++ msgstr "        -i, --interfaces        mostra tabela de interfaces\n"
++ 
++-#: ../netstat.c:1434
+++#: ../netstat.c:1501
+++#, c-format
++ msgid ""
++ "        -M, --masquerade         display masqueraded connections\n"
++ "\n"
++@@ -1108,19 +1038,38 @@ msgstr ""
++ "        -M, --masquerade        mostra conexões mascaradas\n"
++ "\n"
++ 
++-#: ../netstat.c:1438 ../route.c:87
+++#: ../netstat.c:1505
+++#, fuzzy, c-format
+++msgid "        --numeric-hosts          don't resolve host names\n"
+++msgstr "        -n, --numeric           não resolve nomes\n"
+++
+++#: ../netstat.c:1506
+++#, fuzzy, c-format
+++msgid "        --numeric-ports          don't resolve port names\n"
+++msgstr "        -n, --numeric           não resolve nomes\n"
+++
+++#: ../netstat.c:1507
+++#, fuzzy, c-format
+++msgid "        --numeric-users          don't resolve user names\n"
+++msgstr "        -n, --numeric           não resolve nomes\n"
+++
+++#: ../netstat.c:1508
+++#, c-format
++ msgid "        -N, --symbolic           resolve hardware names\n"
++ msgstr "        -n, --numeric           não resolve nomes\n"
++ 
++-#: ../netstat.c:1439 ../route.c:88
+++#: ../netstat.c:1509 ../route.c:88
+++#, c-format
++ msgid "        -e, --extend             display other/more information\n"
++ msgstr "        -e, --extend             mostra outras/mais informações\n"
++ 
++-#: ../netstat.c:1440
+++#: ../netstat.c:1510
+++#, c-format
++ msgid "        -p, --programs           display PID/Program name for sockets\n"
++ msgstr "        -r, --route             mostra tabela de roteamento\n"
++ 
++-#: ../netstat.c:1441
+++#: ../netstat.c:1511
+++#, c-format
++ msgid ""
++ "        -c, --continuous         continuous listing\n"
++ "\n"
++@@ -1128,30 +1077,33 @@ msgstr ""
++ "        -c, --continuous        listagem contínua\n"
++ "\n"
++ 
++-#: ../netstat.c:1442
+++#: ../netstat.c:1512
+++#, c-format
++ msgid "        -l, --listening          display listening server sockets\n"
++ msgstr "        -L, --netlink           mostra mensagens netlink do kernel\n"
++ 
++-#: ../netstat.c:1443
+++#: ../netstat.c:1513
+++#, c-format
++ msgid ""
++ "        -a, --all, --listening   display all sockets (default: connected)\n"
++ msgstr "        -a, --all, --listening  mostra tudo\n"
++ 
++-#: ../netstat.c:1444
+++#: ../netstat.c:1514
+++#, c-format
++ msgid "        -o, --timers             display timers\n"
++ msgstr ""
++ "        -o, --timers            mostra temporizadores\n"
++ "\n"
++ 
++-#: ../netstat.c:1445 ../route.c:89
+++#: ../netstat.c:1515 ../route.c:89
+++#, c-format
++ msgid ""
++ "        -F, --fib                display Forwarding Information Base "
++ "(default)\n"
++-msgstr ""
++-"        -F, --fib             mostra a Base de Informações de Repasse "
++-"(default)\n"
+++msgstr "        -F, --fib             mostra a Base de Informações de Repasse (default)\n"
++ 
++-#: ../netstat.c:1446 ../route.c:90
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
++ msgid ""
++ "        -C, --cache              display routing cache instead of FIB\n"
++ "\n"
++@@ -1159,136 +1111,145 @@ msgstr ""
++ "        -C, --cache              mostra cache de roteamento no lugar da FIB\n"
++ "\n"
++ 
++-#: ../netstat.c:1448
+++#: ../netstat.c:1518
+++#, c-format
++ msgid ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ msgstr ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ 
++-#: ../netstat.c:1449 ../route.c:92
++-#, c-format
++-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
+++#: ../netstat.c:1519
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
++ msgstr "  <AF>=Use '-A <af>' ou [--<af>' Default: %s\n"
++ 
++-#: ../netstat.c:1450 ../route.c:93
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
++ msgid "  List of possible address families (which support routing):\n"
++-msgstr ""
++-"  Lista das famílias de endereços possíveis (que suportam roteamento):\n"
+++msgstr "  Lista das famílias de endereços possíveis (que suportam roteamento):\n"
++ 
++-#: ../netstat.c:1663
+++#: ../netstat.c:1753
+++#, c-format
++ msgid "Active Internet connections "
++ msgstr "Conexões Internet Ativas "
++ 
++-#: ../netstat.c:1673
+++#: ../netstat.c:1763
+++#, c-format
++ msgid ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ msgstr ""
++ "\n"
++-"Proto Recv-Q Send-Q Endereço Local          Endereço Remoto         Estado   "
++-"  "
+++"Proto Recv-Q Send-Q Endereço Local          Endereço Remoto         Estado     "
++ 
++-#: ../netstat.c:1675
+++#: ../netstat.c:1765
+++#, c-format
++ msgid " User       Inode     "
++ msgstr " Usuário   "
++ 
++-#: ../netstat.c:1678
+++#: ../netstat.c:1768
+++#, c-format
++ msgid " Timer"
++ msgstr " Temporizador"
++ 
++-#: ../netstat.c:1708
+++#: ../netstat.c:1798
+++#, c-format
++ msgid "IPv4 Group Memberships\n"
++ msgstr "IPv4 Group Memberships\n"
++ 
++-#: ../netstat.c:1709
+++#: ../netstat.c:1799
+++#, c-format
++ msgid "Interface       RefCnt Group\n"
++ msgstr "Interface       CntRef Grupo\n"
++ 
++-#: ../rarp.c:43
+++#: ../rarp.c:44
++ msgid "This kernel does not support RARP.\n"
++ msgstr "Este kernel não tem suporte a RARP.\n"
++ 
++-#: ../rarp.c:82
+++#: ../rarp.c:83
++ #, c-format
++ msgid "no RARP entry for %s.\n"
++ msgstr "Sem entrada RARP para %s.\n"
++ 
++-#: ../rarp.c:95
+++#: ../rarp.c:96
++ #, c-format
++ msgid "%s: bad hardware address\n"
++ msgstr "%s: endereço de hardware inválido\n"
++ 
++-#: ../rarp.c:127
+++#: ../rarp.c:128
++ #, c-format
++ msgid "rarp: cannot open file %s:%s.\n"
++ msgstr "rarp: não foi possível abrir o arquivo %s:%s.\n"
++ 
++-#: ../rarp.c:139
+++#: ../rarp.c:140
++ #, c-format
++ msgid "rarp: format error at %s:%u\n"
++ msgstr "rarp: erro de formato em %s:%u\n"
++ 
++-#: ../rarp.c:143 ../rarp.c:287
+++#: ../rarp.c:144 ../rarp.c:289
++ #, c-format
++ msgid "rarp: %s: unknown host\n"
++ msgstr "rarp: %s: máquina desconhecida\n"
++ 
++-#: ../rarp.c:146
+++#: ../rarp.c:147
++ #, c-format
++ msgid "rarp: cannot set entry from %s:%u\n"
++ msgstr "rarp: não é possível incluir uma entrada para %s:%u\n"
++ 
++-#: ../rarp.c:175
+++#: ../rarp.c:176
+++#, c-format
++ msgid "Usage: rarp -a                               list entries in cache.\n"
++ msgstr ""
++ "Uso: rarp -a                                   lista entradas no cache\n"
++ 
++-#: ../rarp.c:176
+++#: ../rarp.c:177
+++#, c-format
++ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
++-msgstr ""
++-"     rarp -d máquina                           remove entrada do cache\n"
+++msgstr "     rarp -d máquina                           remove entrada do cache\n"
++ 
++-#: ../rarp.c:177
+++#: ../rarp.c:178
+++#, c-format
++ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
++-msgstr ""
++-"     rarp [-t tipo-hw] -s máquina endereço-hw  adiciona entrada ao cache\n"
+++msgstr "     rarp [-t tipo-hw] -s máquina endereço-hw  adiciona entrada ao cache\n"
++ 
++-#: ../rarp.c:178
+++#: ../rarp.c:179
+++#, c-format
++ msgid ""
++ "       rarp -f                               add entries from /etc/ethers.\n"
++ msgstr ""
++ "       rarp -f                               adiciona entradas a partir do\n"
++ "                                             arquivo ethers.\n"
++ 
++-#: ../rarp.c:179
+++#: ../rarp.c:180
+++#, c-format
++ msgid ""
++ "       rarp -V                               display program version.\n"
++ "\n"
++-msgstr ""
++-"     rarp -V                                   mostra versão do programa\n"
+++msgstr "     rarp -V                                   mostra versão do programa\n"
++ 
++-#: ../rarp.c:236
+++#: ../rarp.c:238
++ #, c-format
++ msgid "%s: illegal option mix.\n"
++ msgstr "%s: mistura ilegal de opções.\n"
++ 
++-#: ../rarp.c:267
+++#: ../rarp.c:269
++ #, c-format
++ msgid "rarp: %s: unknown hardware type.\n"
++ msgstr "rarp: %s: tipo desconhecido de hardware.\n"
++ 
++-#: ../route.c:79
+++#: ../route.c:80
+++#, c-format
++ msgid ""
++ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
++ msgstr ""
++-"Uso: route [-nNvee] [-FC] [famílias_de_endereços]  Lista as tabelas de "
++-"rotea-\n"
+++"Uso: route [-nNvee] [-FC] [famílias_de_endereços]  Lista as tabelas de rotea-\n"
++ "                                                   mento do kernel\n"
++ 
++-#: ../route.c:80
+++#: ../route.c:81
+++#, c-format
++ msgid ""
++ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
++ "\n"
++@@ -1298,35 +1259,42 @@ msgstr ""
++ "                                                   mento da família.\n"
++ "\n"
++ 
++-#: ../route.c:82
+++#: ../route.c:83
+++#, c-format
++ msgid ""
++ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
++ "specified AF.\n"
++ msgstr ""
++-"       route {-h|--help} [família_de_endereços]    Sintaxe para a AF "
++-"(Família\n"
++-"                                                   de endereços) "
++-"espeficicada.\n"
+++"       route {-h|--help} [família_de_endereços]    Sintaxe para a AF (Família\n"
+++"                                                   de endereços) espeficicada.\n"
++ 
++-#: ../route.c:83
+++#: ../route.c:84
+++#, c-format
++ msgid ""
++ "       route {-V|--version}                  Display version/author and "
++ "exit.\n"
++ "\n"
++ msgstr ""
++-"       route {-V|--version}                        Mostra a versão do "
++-"comando\n"
+++"       route {-V|--version}                        Mostra a versão do comando\n"
++ "                                                   e sai.\n"
++ 
+++#: ../route.c:92
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "  <AF>=Use '-A <af>' ou [--<af>' Default: %s\n"
+++
++ #: ../plipconfig.c:66
+++#, c-format
++ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
++ msgstr "Uso: ifconfig [-a] [-i] [-v] interface\n"
++ 
++ #: ../plipconfig.c:67
+++#, c-format
++ msgid "                  [nibble NN] [trigger NN]\n"
++ msgstr "                [[família] endereço]\n"
++ 
++ #: ../plipconfig.c:68
+++#, c-format
++ msgid "       plipconfig -V | --version\n"
++ msgstr "       plipconfig -V | --version\n"
++ 
++@@ -1335,25 +1303,29 @@ msgstr "       plipconfig -V | --version
++ msgid "%s\tnibble %lu  trigger %lu\n"
++ msgstr "%s\tnibble %lu  trigger %lu\n"
++ 
++-#: ../iptunnel.c:79
+++#: ../iptunnel.c:85
+++#, c-format
++ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
++ msgstr "Uso: iptunnel { add | change | del | show } [ NOME ]\n"
++ 
++-#: ../iptunnel.c:80
+++#: ../iptunnel.c:86
+++#, c-format
++ msgid ""
++ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
++-msgstr ""
++-"          [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n"
+++msgstr "          [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n"
++ 
++-#: ../iptunnel.c:81
+++#: ../iptunnel.c:87
+++#, c-format
++ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ msgstr "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ 
++-#: ../iptunnel.c:82
+++#: ../iptunnel.c:88
+++#, c-format
++ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
++ msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev DISP_FÍSICO ]\n"
++ 
++-#: ../iptunnel.c:83
+++#: ../iptunnel.c:89
+++#, c-format
++ msgid ""
++ "       iptunnel -V | --version\n"
++ "\n"
++@@ -1361,451 +1333,734 @@ msgstr ""
++ "       iptunnel -V | --version\n"
++ "\n"
++ 
++-#: ../iptunnel.c:84
+++#: ../iptunnel.c:90
+++#, c-format
++ msgid "Where: NAME := STRING\n"
++ msgstr "Onde: NAME := STRING\n"
++ 
++-#: ../iptunnel.c:85
+++#: ../iptunnel.c:91
+++#, c-format
++ msgid "       ADDR := { IP_ADDRESS | any }\n"
++ msgstr "       END := { ENDEREÇO_IP | any }\n"
++ 
++-#: ../iptunnel.c:86
+++#: ../iptunnel.c:92
+++#, c-format
++ msgid "       TOS  := { NUMBER | inherit }\n"
++ msgstr "       TOS  := { NÚMERO | inherit }\n"
++ 
++-#: ../iptunnel.c:87
+++#: ../iptunnel.c:93
+++#, c-format
++ msgid "       TTL  := { 1..255 | inherit }\n"
++ msgstr "       TTL  := { 1..255 | inherit }\n"
++ 
++-#: ../iptunnel.c:88
+++#: ../iptunnel.c:94
+++#, c-format
++ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
++ msgstr "       KEY  := { QUATRO_NÚMEROS_SEPARADOS_POR_PONTOS | NÚMERO }\n"
++ 
++-#: ../iptunnel.c:326
+++#: ../iptunnel.c:332
+++#, c-format
++ msgid "Keys are not allowed with ipip and sit.\n"
++ msgstr "Chaves não são permitidas com ipip e sit.\n"
++ 
++-#: ../iptunnel.c:346
+++#: ../iptunnel.c:352
+++#, c-format
++ msgid "Broadcast tunnel requires a source address.\n"
++ msgstr "Um túnel de broadcast precisa de um endereço de origem.\n"
++ 
++-#: ../iptunnel.c:361
+++#: ../iptunnel.c:367
+++#, c-format
++ msgid "ttl != 0 and noptmudisc are incompatible\n"
++ msgstr "ttl != 0 e noptmudisc são incompatíveis\n"
++ 
++-#: ../iptunnel.c:373
+++#: ../iptunnel.c:379
+++#, c-format
++ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
++ msgstr "não foi possível determinar o modo do túnel (ip, gre ou sit)\n"
++ 
++-#: ../iptunnel.c:411
+++#: ../iptunnel.c:417
++ #, c-format
++ msgid "%s: %s/ip  remote %s  local %s "
++ msgstr "%s: %s/ip  remoto %s  local %s "
++ 
++-#: ../iptunnel.c:415
+++#: ../iptunnel.c:421
++ msgid "unknown"
++ msgstr "Desconhecido"
++ 
++-#: ../iptunnel.c:447
+++#: ../iptunnel.c:453
+++#, c-format
++ msgid "  Drop packets out of sequence.\n"
++ msgstr "  Descarte pacotes fora de seqüência.\n"
++ 
++-#: ../iptunnel.c:449
+++#: ../iptunnel.c:455
+++#, c-format
++ msgid "  Checksum in received packet is required.\n"
++ msgstr "  É necessário checksum nos pacotes recebidos.\n"
++ 
++-#: ../iptunnel.c:451
+++#: ../iptunnel.c:457
+++#, c-format
++ msgid "  Sequence packets on output.\n"
++ msgstr "  Seqüencie pacotes na saída.\n"
++ 
++-#: ../iptunnel.c:453
+++#: ../iptunnel.c:459
+++#, c-format
++ msgid "  Checksum output packets.\n"
++ msgstr "  Calcule o checksum para pacotes de saída.\n"
++ 
++-#: ../iptunnel.c:481
+++#: ../iptunnel.c:487
+++#, c-format
++ msgid "Wrong format of /proc/net/dev. Sorry.\n"
++ msgstr "Formato errado de /proc/net/dev. Desculpe.\n"
++ 
++-#: ../iptunnel.c:494
+++#: ../iptunnel.c:500
++ #, c-format
++ msgid "Failed to get type of [%s]\n"
++ msgstr "Não foi possível obter o tipo de [%s]\n"
++ 
++-#: ../iptunnel.c:510
+++#: ../iptunnel.c:516
+++#, c-format
++ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
++ msgstr "RX: Pacotes    Bytes        Erros  CsunErrs ForaSeq  Mcasts\n"
++ 
++-#: ../iptunnel.c:513
+++#: ../iptunnel.c:519
+++#, c-format
++ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
++ msgstr "TX: Pacotes    Bytes        Erros  DeadLoop SemRota  SemBufs\n"
++ 
++-#: ../statistics.c:45
+++#: ../statistics.c:47
++ msgid "ICMP input histogram:"
++ msgstr "Histograma de entrada ICMP:"
++ 
++-#: ../statistics.c:46
+++#: ../statistics.c:48
++ msgid "ICMP output histogram:"
++ msgstr "Histograma de saída ICMP"
++ 
++-#: ../statistics.c:63
+++#: ../statistics.c:65
++ #, c-format
++ msgid "Forwarding is %s"
++ msgstr "Repassagem está %s"
++ 
++-#: ../statistics.c:64
++-#, c-format
++-msgid "Default TTL is %d"
+++#: ../statistics.c:66
+++#, fuzzy, c-format
+++msgid "Default TTL is %u"
++ msgstr "Default TTL é %d"
++ 
++-#: ../statistics.c:65
++-#, c-format
++-msgid "%d total packets received"
+++#: ../statistics.c:67
+++#, fuzzy, c-format
+++msgid "%u total packets received"
++ msgstr "%d total de pacotes recebidos"
++ 
++-#: ../statistics.c:66
++-#, c-format
++-msgid "%d with invalid headers"
+++#: ../statistics.c:68
+++#, fuzzy, c-format
+++msgid "%u with invalid headers"
++ msgstr "%d com cabeçalhos inválidos"
++ 
++-#: ../statistics.c:67
++-#, c-format
++-msgid "%d with invalid addresses"
+++#: ../statistics.c:69
+++#, fuzzy, c-format
+++msgid "%u with invalid addresses"
++ msgstr "%d com endereços inválidos"
++ 
++-#: ../statistics.c:68
++-#, c-format
++-msgid "%d forwarded"
+++#: ../statistics.c:70
+++#, fuzzy, c-format
+++msgid "%u forwarded"
++ msgstr "%d repassados"
++ 
++-#: ../statistics.c:69
++-#, c-format
++-msgid "%d with unknown protocol"
+++#: ../statistics.c:71
+++#, fuzzy, c-format
+++msgid "%u with unknown protocol"
++ msgstr "%d com protocolo desconhecido"
++ 
++-#: ../statistics.c:70
++-#, c-format
++-msgid "%d incoming packets discarded"
+++#: ../statistics.c:72
+++#, fuzzy, c-format
+++msgid "%u incoming packets discarded"
++ msgstr "%d pacotes entrantes descartados"
++ 
++-#: ../statistics.c:71
++-#, c-format
++-msgid "%d incoming packets delivered"
+++#: ../statistics.c:73
+++#, fuzzy, c-format
+++msgid "%u incoming packets delivered"
++ msgstr "%d pacotes entrantes despachados"
++ 
++-#: ../statistics.c:72
++-#, c-format
++-msgid "%d requests sent out"
+++#: ../statistics.c:74
+++#, fuzzy, c-format
+++msgid "%u requests sent out"
++ msgstr "%d requisições enviadas"
++ 
++ #. ?
++-#: ../statistics.c:73
++-#, c-format
++-msgid "%d outgoing packets dropped"
+++#: ../statistics.c:75
+++#, fuzzy, c-format
+++msgid "%u outgoing packets dropped"
++ msgstr "%d pacotes saintes descartados"
++ 
++-#: ../statistics.c:74
++-#, c-format
++-msgid "%d dropped because of missing route"
+++#: ../statistics.c:76
+++#, fuzzy, c-format
+++msgid "%u dropped because of missing route"
++ msgstr "%d descartados devido a falta de rota"
++ 
++-#: ../statistics.c:75
++-#, c-format
++-msgid "%d fragments dropped after timeout"
+++#: ../statistics.c:77
+++#, fuzzy, c-format
+++msgid "%u fragments dropped after timeout"
++ msgstr "%d fragmentos descartados após estouro de tempo"
++ 
++-#: ../statistics.c:76
++-#, c-format
++-msgid "%d reassemblies required"
+++#: ../statistics.c:78
+++#, fuzzy, c-format
+++msgid "%u reassemblies required"
++ msgstr "%d remontagens requeridas"
++ 
++ #. ?
++-#: ../statistics.c:77
++-#, c-format
++-msgid "%d packets reassembled ok"
+++#: ../statistics.c:79
+++#, fuzzy, c-format
+++msgid "%u packets reassembled ok"
++ msgstr "%d pacotes remontados sem problemas"
++ 
++-#: ../statistics.c:78
++-#, c-format
++-msgid "%d packet reassembles failed"
+++#: ../statistics.c:80
+++#, fuzzy, c-format
+++msgid "%u packet reassembles failed"
++ msgstr "%d remontagens de pacotes falharam"
++ 
++-#: ../statistics.c:79
++-#, c-format
++-msgid "%d fragments received ok"
+++#: ../statistics.c:81
+++#, fuzzy, c-format
+++msgid "%u fragments received ok"
++ msgstr "%d fragmentos recebidos sem problemas"
++ 
++-#: ../statistics.c:80
++-#, c-format
++-msgid "%d fragments failed"
+++#: ../statistics.c:82
+++#, fuzzy, c-format
+++msgid "%u fragments failed"
++ msgstr "%d fragmentos falharam"
++ 
++-#: ../statistics.c:81
++-#, c-format
++-msgid "%d fragments created"
+++#: ../statistics.c:83
+++#, fuzzy, c-format
+++msgid "%u fragments created"
++ msgstr "%d fragmentos criados"
++ 
++-#: ../statistics.c:86
++-#, c-format
++-msgid "%d ICMP messages received"
+++#: ../statistics.c:88
+++#, fuzzy, c-format
+++msgid "%u ICMP messages received"
++ msgstr "%d mensagens ICMP recebidas"
++ 
++-#: ../statistics.c:87
++-#, c-format
++-msgid "%d input ICMP message failed."
+++#: ../statistics.c:89
+++#, fuzzy, c-format
+++msgid "%u input ICMP message failed."
++ msgstr "%d mensagens ICMP entrantes falharam."
++ 
++-#: ../statistics.c:88 ../statistics.c:101
++-#, c-format
++-msgid "destination unreachable: %d"
+++#: ../statistics.c:90 ../statistics.c:103
+++#, fuzzy, c-format
+++msgid "destination unreachable: %u"
++ msgstr "destino não alcançável: %d"
++ 
++-#: ../statistics.c:89
++-#, c-format
++-msgid "timeout in transit: %d"
+++#: ../statistics.c:91
+++#, fuzzy, c-format
+++msgid "timeout in transit: %u"
++ msgstr "estouro de tempo em trânsito: %d"
++ 
++-#: ../statistics.c:90 ../statistics.c:103
++-#, c-format
++-msgid "wrong parameters: %d"
+++#: ../statistics.c:92 ../statistics.c:105
+++#, fuzzy, c-format
+++msgid "wrong parameters: %u"
++ msgstr "parâmetros errados: %d"
++ 
++ #. ?
++-#: ../statistics.c:91
++-#, c-format
++-msgid "source quenchs: %d"
+++#: ../statistics.c:93
+++#, fuzzy, c-format
+++msgid "source quenches: %u"
++ msgstr "source quenchs: %d"
++ 
++-#: ../statistics.c:92
++-#, c-format
++-msgid "redirects: %d"
+++#: ../statistics.c:94
+++#, fuzzy, c-format
+++msgid "redirects: %u"
++ msgstr "redireções: %d"
++ 
++-#: ../statistics.c:93
++-#, c-format
++-msgid "echo requests: %d"
+++#: ../statistics.c:95
+++#, fuzzy, c-format
+++msgid "echo requests: %u"
++ msgstr "requisições de eco: %d"
++ 
++-#: ../statistics.c:94 ../statistics.c:107
++-#, c-format
++-msgid "echo replies: %d"
+++#: ../statistics.c:96 ../statistics.c:109
+++#, fuzzy, c-format
+++msgid "echo replies: %u"
++ msgstr "respostas de eco: %d"
++ 
++-#: ../statistics.c:95
++-#, c-format
++-msgid "timestamp request: %d"
+++#: ../statistics.c:97
+++#, fuzzy, c-format
+++msgid "timestamp request: %u"
++ msgstr "requisições de timestamp: %d"
++ 
++-#: ../statistics.c:96
++-#, c-format
++-msgid "timestamp reply: %d"
+++#: ../statistics.c:98
+++#, fuzzy, c-format
+++msgid "timestamp reply: %u"
++ msgstr "respostas a timestamps: %d"
++ 
++-#: ../statistics.c:97
++-#, c-format
++-msgid "address mask request: %d"
+++#: ../statistics.c:99
+++#, fuzzy, c-format
+++msgid "address mask request: %u"
++ msgstr "requisições de mascara de endereço: %d"
++ 
++ #. ?
++-#: ../statistics.c:98
++-msgid "address mask replies"
++-msgstr "resposta a mascara de endereço"
+++#: ../statistics.c:100 ../statistics.c:113
+++#, fuzzy, c-format
+++msgid "address mask replies: %u"
+++msgstr "respostas a máscara de endereço: %d"
++ 
++ #. ?
++-#: ../statistics.c:99
++-#, c-format
++-msgid "%d ICMP messages sent"
+++#: ../statistics.c:101
+++#, fuzzy, c-format
+++msgid "%u ICMP messages sent"
++ msgstr "%d mensagens ICMP enviadas"
++ 
++-#: ../statistics.c:100
++-#, c-format
++-msgid "%d ICMP messages failed"
+++#: ../statistics.c:102
+++#, fuzzy, c-format
+++msgid "%u ICMP messages failed"
++ msgstr "%d mensagens ICMP falharam"
++ 
++-#: ../statistics.c:102
++-#, c-format
++-msgid "time exceeded: %d"
+++#: ../statistics.c:104
+++#, fuzzy, c-format
+++msgid "time exceeded: %u"
++ msgstr "tempo excedido: %d"
++ 
++ #. ?
++-#: ../statistics.c:104
++-#, c-format
++-msgid "source quench: %d"
+++#: ../statistics.c:106
+++#, fuzzy, c-format
+++msgid "source quench: %u"
++ msgstr "source quench: %d"
++ 
++-#: ../statistics.c:105
++-#, c-format
++-msgid "redirect: %d"
+++#: ../statistics.c:107
+++#, fuzzy, c-format
+++msgid "redirect: %u"
++ msgstr "redireções: %d"
++ 
++-#: ../statistics.c:106
++-#, c-format
++-msgid "echo request: %d"
+++#: ../statistics.c:108
+++#, fuzzy, c-format
+++msgid "echo request: %u"
++ msgstr "requisições de eco: %d"
++ 
++-#: ../statistics.c:108
++-#, c-format
++-msgid "timestamp requests: %d"
+++#: ../statistics.c:110
+++#, fuzzy, c-format
+++msgid "timestamp requests: %u"
++ msgstr "requisições de timestamp: %d"
++ 
++-#: ../statistics.c:109
++-#, c-format
++-msgid "timestamp replies: %d"
+++#: ../statistics.c:111
+++#, fuzzy, c-format
+++msgid "timestamp replies: %u"
++ msgstr "respostas a timestamp: %d"
++ 
++-#: ../statistics.c:110
++-#, c-format
++-msgid "address mask requests: %d"
+++#: ../statistics.c:112
+++#, fuzzy, c-format
+++msgid "address mask requests: %u"
++ msgstr "requisições de máscara de endereço: %d"
++ 
++-#: ../statistics.c:111
++-#, c-format
++-msgid "address mask replies: %d"
++-msgstr "respostas a máscara de endereço: %d"
++-
++-#: ../statistics.c:116
+++#: ../statistics.c:118
++ #, c-format
++ msgid "RTO algorithm is %s"
++ msgstr "Algorítmo RTO é %s"
++ 
++-#: ../statistics.c:120
++-#, c-format
++-msgid "%d active connections openings"
+++#: ../statistics.c:122
+++#, fuzzy, c-format
+++msgid "%u active connections openings"
++ msgstr "%d tentativas de conexão falharam"
++ 
++-#: ../statistics.c:121
++-#, c-format
++-msgid "%d passive connection openings"
+++#: ../statistics.c:123
+++#, fuzzy, c-format
+++msgid "%u passive connection openings"
++ msgstr "%d opens passivos"
++ 
++-#: ../statistics.c:122
++-#, c-format
++-msgid "%d failed connection attempts"
+++#: ../statistics.c:124
+++#, fuzzy, c-format
+++msgid "%u failed connection attempts"
++ msgstr "%d tentativas de conexão falharam"
++ 
++-#: ../statistics.c:123
++-#, c-format
++-msgid "%d connection resets received"
+++#: ../statistics.c:125
+++#, fuzzy, c-format
+++msgid "%u connection resets received"
++ msgstr "%d resets de conexão recebidas"
++ 
++-#: ../statistics.c:124
++-#, c-format
++-msgid "%d connections established"
+++#: ../statistics.c:126
+++#, fuzzy, c-format
+++msgid "%u connections established"
++ msgstr "%d conexões estabelecidas"
++ 
++-#: ../statistics.c:125
++-#, c-format
++-msgid "%d segments received"
+++#: ../statistics.c:127
+++#, fuzzy, c-format
+++msgid "%u segments received"
++ msgstr "%d segmentos recebidos"
++ 
++-#: ../statistics.c:126
++-#, c-format
++-msgid "%d segments send out"
+++#: ../statistics.c:128
+++#, fuzzy, c-format
+++msgid "%u segments send out"
++ msgstr "%d segmentos enviados"
++ 
++-#: ../statistics.c:127
++-#, c-format
++-msgid "%d segments retransmited"
+++#: ../statistics.c:129
+++#, fuzzy, c-format
+++msgid "%u segments retransmited"
++ msgstr "%d segmentos retransmitidos"
++ 
++-#: ../statistics.c:128
++-#, c-format
++-msgid "%d bad segments received."
+++#: ../statistics.c:130
+++#, fuzzy, c-format
+++msgid "%u bad segments received."
++ msgstr "%d segmentos ruins recebidos."
++ 
++-#: ../statistics.c:129
++-#, c-format
++-msgid "%d resets sent"
+++#: ../statistics.c:131
+++#, fuzzy, c-format
+++msgid "%u resets sent"
++ msgstr "%d resets enviados"
++ 
++-#: ../statistics.c:134
++-#, c-format
++-msgid "%d packets received"
+++#: ../statistics.c:136
+++#, fuzzy, c-format
+++msgid "%u packets received"
++ msgstr "%d pacotes recebidos"
++ 
++-#: ../statistics.c:135
++-#, c-format
++-msgid "%d packets to unknown port received."
+++#: ../statistics.c:137
+++#, fuzzy, c-format
+++msgid "%u packets to unknown port received."
++ msgstr "%d pacotes para portas desconhecidas recebidos."
++ 
++-#: ../statistics.c:136
++-#, c-format
++-msgid "%d packet receive errors"
+++#: ../statistics.c:138
+++#, fuzzy, c-format
+++msgid "%u packet receive errors"
++ msgstr "%d erros de recepção de pacotes"
++ 
++-#: ../statistics.c:137
++-#, c-format
++-msgid "%d packets sent"
+++#: ../statistics.c:139
+++#, fuzzy, c-format
+++msgid "%u packets sent"
++ msgstr "%d pacotes enviados"
++ 
++-#: ../statistics.c:142
+++#: ../statistics.c:144
+++#, fuzzy, c-format
+++msgid "%u SYN cookies sent"
+++msgstr "%d pacotes enviados"
+++
+++#: ../statistics.c:145
+++#, fuzzy, c-format
+++msgid "%u SYN cookies received"
+++msgstr "%d pacotes recebidos"
+++
+++#: ../statistics.c:146
+++#, fuzzy, c-format
+++msgid "%u invalid SYN cookies received"
+++msgstr "%d pacotes recebidos"
+++
+++#: ../statistics.c:148
+++#, fuzzy, c-format
+++msgid "%u resets received for embryonic SYN_RECV sockets"
+++msgstr "%d resets recebidos para sockets embriônicos SYN_RECV"
+++
+++#: ../statistics.c:150
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue because of socket buffer overrun"
+++msgstr "%d pacotes retirados da fila de recepção devido a sobreposição de buffers de sockets"
+++
+++#. obsolete: 2.2.0 doesn't do that anymore
+++#: ../statistics.c:153
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue"
+++msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)"
+++
+++#: ../statistics.c:154
+++#, fuzzy, c-format
+++msgid ""
+++"%u packets dropped from out-of-order queue because of socket buffer overrun"
+++msgstr "%d pacotes descartados da fila de fora de ordem devido a sobreposição de buffers de sockets"
+++
+++#: ../statistics.c:156
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because they were out-of-window"
+++msgstr "%d pacotes ICMP descartados porque estavam fora da janela"
+++
+++#: ../statistics.c:158
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because socket was locked"
+++msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado"
+++
+++#: ../statistics.c:160
+++#, c-format
+++msgid "%u TCP sockets finished time wait in fast timer"
+++msgstr ""
+++
+++#: ../statistics.c:161
+++#, c-format
+++msgid "%u time wait sockets recycled by time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:162
+++#, c-format
+++msgid "%u TCP sockets finished time wait in slow timer"
+++msgstr ""
+++
+++#: ../statistics.c:163
+++#, c-format
+++msgid "%u passive connections rejected because of time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:165
+++#, c-format
+++msgid "%u active connections rejected because of time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:167
++ #, c-format
++-msgid "%d SYN cookies sent"
+++msgid "%u packets rejects in established connections because of timestamp"
+++msgstr ""
+++
+++#: ../statistics.c:169
+++#, fuzzy, c-format
+++msgid "%u delayed acks sent"
++ msgstr "%d pacotes enviados"
++ 
++-#: ../statistics.c:143
+++#: ../statistics.c:170
++ #, c-format
++-msgid "%d SYN cookies received"
++-msgstr "%d pacotes recebidos"
+++msgid "%u delayed acks further delayed because of locked socket"
+++msgstr ""
++ 
++-#: ../statistics.c:144
+++#: ../statistics.c:172
++ #, c-format
++-msgid "%d invalid SYN cookies received"
++-msgstr "%d pacotes recebidos"
+++msgid "Quick ack mode was activated %u times"
+++msgstr ""
++ 
++-#: ../statistics.c:146
+++#: ../statistics.c:173
++ #, c-format
++-msgid "%d resets received for embryonic SYN_RECV sockets"
++-msgstr "%d resets recebidos para sockets embriônicos SYN_RECV"
+++msgid "%u times the listen queue of a socket overflowed"
+++msgstr ""
++ 
++-#: ../statistics.c:148
+++#: ../statistics.c:175
++ #, c-format
++-msgid "%d packets pruned from receive queue because of socket buffer overrun"
+++msgid "%u SYNs to LISTEN sockets ignored"
++ msgstr ""
++-"%d pacotes retirados da fila de recepção devido a sobreposição de buffers de "
++-"sockets"
++ 
++-#. obsolete: 2.2.0 doesn't do that anymore
++-#: ../statistics.c:151
+++#: ../statistics.c:176
+++#, c-format
+++msgid "%u packets directly queued to recvmsg prequeue."
+++msgstr ""
+++
+++#: ../statistics.c:178
++ #, c-format
++-msgid "%d packets pruned from out-of-order queue"
+++msgid "%u of bytes directly received from backlog"
+++msgstr ""
+++
+++#: ../statistics.c:180
+++#, c-format
+++msgid "%u of bytes directly received from prequeue"
+++msgstr ""
+++
+++#: ../statistics.c:182
+++#, fuzzy, c-format
+++msgid "%u packets dropped from prequeue"
++ msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)"
++ 
++-#: ../statistics.c:152
+++#: ../statistics.c:183
+++#, fuzzy, c-format
+++msgid "%u packet headers predicted"
+++msgstr "%d pacotes recebidos"
+++
+++#: ../statistics.c:184
++ #, c-format
++-msgid ""
++-"%d packets dropped from out-of-order queue because of socket buffer overrun"
+++msgid "%u packets header predicted and directly queued to user"
++ msgstr ""
++-"%d pacotes descartados da fila de fora de ordem devido a sobreposição de "
++-"buffers de sockets"
++ 
++-#: ../statistics.c:154
+++#: ../statistics.c:186
++ #, c-format
++-msgid "%d ICMP packets dropped because they were out-of-window"
++-msgstr "%d pacotes ICMP descartados porque estavam fora da janela"
+++msgid "Ran %u times out of system memory during packet sending"
+++msgstr ""
++ 
++-#: ../statistics.c:156
+++#: ../statistics.c:188
+++#, fuzzy, c-format
+++msgid "%u acknowledgments not containing data received"
+++msgstr "%d pacotes para portas desconhecidas recebidos."
+++
+++#: ../statistics.c:189
++ #, c-format
++-msgid "%d ICMP packets dropped because socket was locked"
++-msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado"
+++msgid "%u predicted acknowledgments"
+++msgstr ""
+++
+++#: ../statistics.c:190
+++#, c-format
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:191
+++#, c-format
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr ""
+++
+++#: ../statistics.c:192
+++#, fuzzy, c-format
+++msgid "%u bad SACKs received"
+++msgstr "%d segmentos ruins recebidos."
+++
+++#: ../statistics.c:193
+++#, c-format
+++msgid "Detected reordering %u times using FACK"
+++msgstr ""
+++
+++#: ../statistics.c:194
+++#, c-format
+++msgid "Detected reordering %u times using SACK"
+++msgstr ""
+++
+++#: ../statistics.c:195
+++#, c-format
+++msgid "Detected reordering %u times using time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:196
+++#, c-format
+++msgid "Detected reordering %u times using reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:197
+++#, c-format
+++msgid "%u congestion windows fully recovered"
+++msgstr ""
+++
+++#: ../statistics.c:198
+++#, c-format
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
+++msgstr ""
+++
+++#: ../statistics.c:199
+++#, c-format
+++msgid "%u congestion window recovered using DSACK"
+++msgstr ""
+++
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr ""
+++
+++#: ../statistics.c:201
+++#, fuzzy, c-format
+++msgid "%u retransmits lost"
+++msgstr "%d resets enviados"
+++
+++#: ../statistics.c:202
+++#, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr ""
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr ""
+++
+++#: ../statistics.c:205
+++#, fuzzy, c-format
+++msgid "%u fast retransmits"
+++msgstr "%d segmentos retransmitidos"
+++
+++#: ../statistics.c:206
+++#, c-format
+++msgid "%u forward retransmits"
+++msgstr ""
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr ""
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr ""
+++
+++#: ../statistics.c:209
+++#, fuzzy, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr "%d segmentos retransmitidos"
+++
+++#: ../statistics.c:210
+++#, fuzzy, c-format
+++msgid "%u sack retransmits failed"
+++msgstr "%d remontagens de pacotes falharam"
+++
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr ""
+++
+++#: ../statistics.c:212
+++#, fuzzy, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr "%d pacotes retirados da fila de recepção devido a sobreposição de buffers de sockets"
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr ""
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr ""
+++
+++#: ../statistics.c:215
+++#, fuzzy, c-format
+++msgid "%u DSACKs received"
+++msgstr "%d pacotes recebidos"
+++
+++#: ../statistics.c:216
+++#, fuzzy, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr "%d total de pacotes recebidos"
+++
+++#: ../statistics.c:217
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr "%d resets de conexão recebidas"
+++
+++#: ../statistics.c:218
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr "%d resets de conexão recebidas"
+++
+++#: ../statistics.c:219
+++#, fuzzy, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr "%d resets de conexão recebidas"
+++
+++#: ../statistics.c:220
+++#, c-format
+++msgid "%u connections aborted due to memory pressure"
+++msgstr ""
+++
+++#: ../statistics.c:221
+++#, fuzzy, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr "%d resets de conexão recebidas"
++ 
++ #: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr ""
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr ""
+++
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr ""
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr ""
+++
+++#: ../statistics.c:292
++ msgid "enabled"
++ msgstr "habilitado"
++ 
++-#: ../statistics.c:222
+++#: ../statistics.c:292
++ msgid "disabled"
++ msgstr "desabilitado"
++ 
++-#: ../statistics.c:272
++-#, c-format
++-msgid "unknown title %s\n"
++-msgstr "título %s desconhecido\n"
++-
++-#: ../statistics.c:298
+++#: ../statistics.c:375
++ msgid "error parsing /proc/net/snmp"
++ msgstr "erro lendo /proc/net/snmp"
++ 
++-#: ../statistics.c:311
+++#: ../statistics.c:388
++ msgid "cannot open /proc/net/snmp"
++ msgstr "não foi possível abrir /proc/net/snmp"
++ 
++@@ -1819,89 +2074,95 @@ msgstr "O tipo de hardware `%s' não é su
++ msgid "Cannot change line discipline to `%s'.\n"
++ msgstr "Não foi possível mudar a disciplina da linha para `%s'.\n"
++ 
++-#: ../lib/af.c:145 ../lib/hw.c:148
+++#: ../lib/af.c:153 ../lib/hw.c:161
++ msgid "UNSPEC"
++ msgstr "Não Especificado"
++ 
++-#: ../lib/af.c:147
+++#: ../lib/af.c:155
++ msgid "UNIX Domain"
++ msgstr "UNIX Domain"
++ 
++-#: ../lib/af.c:150
+++#: ../lib/af.c:158
++ msgid "DARPA Internet"
++ msgstr "DARPA Internet"
++ 
++-#: ../lib/af.c:153
+++#: ../lib/af.c:161
++ msgid "IPv6"
++ msgstr "IPv6"
++ 
++-#: ../lib/af.c:156 ../lib/hw.c:169
+++#: ../lib/af.c:164 ../lib/hw.c:182
++ msgid "AMPR AX.25"
++ msgstr "AX.25 AMPR"
++ 
++-#: ../lib/af.c:159 ../lib/hw.c:175
+++#: ../lib/af.c:167 ../lib/hw.c:188
++ msgid "AMPR NET/ROM"
++ msgstr "NET/ROM AMPR"
++ 
++-#: ../lib/af.c:162
+++#: ../lib/af.c:170
++ msgid "Novell IPX"
++ msgstr "Novell IPX"
++ 
++-#: ../lib/af.c:165
+++#: ../lib/af.c:173
++ msgid "Appletalk DDP"
++ msgstr "Appletalk DDP"
++ 
++-#: ../lib/af.c:168 ../lib/hw.c:207
+++#: ../lib/af.c:176 ../lib/hw.c:223
++ msgid "Econet"
++ msgstr "Econet"
++ 
++-#: ../lib/af.c:171 ../lib/hw.c:172
+++#: ../lib/af.c:179
+++msgid "CCITT X.25"
+++msgstr ""
+++
+++#: ../lib/af.c:182 ../lib/hw.c:185
++ msgid "AMPR ROSE"
++ msgstr "AMPR ROSE"
++ 
++-#: ../lib/af.c:174 ../lib/hw.c:160
+++#: ../lib/af.c:185 ../lib/hw.c:173
++ msgid "Ash"
++ msgstr "Ash"
++ 
++-#: ../lib/af.c:232
+++#: ../lib/af.c:243
+++#, c-format
++ msgid "Please don't supply more than one address family.\n"
++ msgstr "Por favor não especifique mais que uma família de endereços.\n"
++ 
++-#: ../lib/af.c:293
+++#: ../lib/af.c:304
+++#, c-format
++ msgid "Too much address family arguments.\n"
++ msgstr "Excesso no número de famílias de endereços.\n"
++ 
++-#: ../lib/af.c:304
+++#: ../lib/af.c:315
++ #, c-format
++ msgid "Unknown address family `%s'.\n"
++ msgstr "Família de endereços `%s' desconhecida.\n"
++ 
++-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
++-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
++-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
++-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
++-msgid "[NONE SET]"
++-msgstr "[Nenhum configurado]"
++-
++-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
+++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
++ #, c-format
++ msgid "in_arcnet(%s): invalid arcnet address!\n"
++ msgstr "in_arcnet(%s): endereço arcnet inválido!\n"
++ 
++-#: ../lib/arcnet.c:108
+++#: ../lib/arcnet.c:97
++ #, c-format
++ msgid "in_arcnet(%s): trailing : ignored!\n"
++ msgstr "in_arcnet(%s): trailing : ignorado!\n"
++ 
++-#: ../lib/arcnet.c:120
+++#: ../lib/arcnet.c:109
++ #, c-format
++ msgid "in_arcnet(%s): trailing junk!\n"
++ msgstr "in_arcnet(%s): lixo no trailing!\n"
++ 
++ #: ../lib/ash.c:81
+++#, c-format
++ msgid "Malformed Ash address"
++ msgstr "Endereço Ash mal formado"
++ 
+++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
+++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
+++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
+++msgid "[NONE SET]"
+++msgstr "[Nenhum configurado]"
+++
++ #: ../lib/ax25.c:97 ../lib/netrom.c:100
++ msgid "Invalid callsign"
++ msgstr "Callsign inválido"
++@@ -1911,22 +2172,21 @@ msgid "Callsign too long"
++ msgstr "Callsign muito longo"
++ 
++ #: ../lib/ax25_gr.c:47
+++#, c-format
++ msgid "AX.25 not configured in this system.\n"
++ msgstr "O AX.25 não foi configurado neste sistema.\n"
++ 
++ #: ../lib/ax25_gr.c:50
+++#, c-format
++ msgid "Kernel AX.25 routing table\n"
++ msgstr "Tabela de roteamento AX.25 do kernel\n"
++ 
++ #. xxx
++ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
++ msgid "Destination  Iface    Use\n"
++ msgstr "Destino      Iface    Uso\n"
++ 
++-#: ../lib/ddp_gr.c:21
++-msgid "Routing table for `ddp' not yet supported.\n"
++-msgstr "Tabela de roteamento para `ddp' ainda não suportada.\n"
++-
++ #: ../lib/ether.c:74 ../lib/ether.c:91
++ #, c-format
++ msgid "in_ether(%s): invalid ether address!\n"
++@@ -1942,253 +2202,268 @@ msgstr "in_ether(%s): trailing : ignorad
++ msgid "in_ether(%s): trailing junk!\n"
++ msgstr "in_ether(%s): lixo no trailing!\n"
++ 
++-#: ../lib/fddi.c:95 ../lib/fddi.c:110
+++#: ../lib/fddi.c:84 ../lib/fddi.c:99
++ #, c-format
++ msgid "in_fddi(%s): invalid fddi address!\n"
++ msgstr "in_fddi(%S): endereço fddi inválido!\n"
++ 
++-#: ../lib/fddi.c:122
+++#: ../lib/fddi.c:111
++ #, c-format
++ msgid "in_fddi(%s): trailing : ignored!\n"
++ msgstr "in_fddi(%s): trailing : ignorado!\n"
++ 
++-#: ../lib/fddi.c:134
+++#: ../lib/fddi.c:123
++ #, c-format
++ msgid "in_fddi(%s): trailing junk!\n"
++ msgstr "in_fddi(%s): lixo no trailing!\n"
++ 
++-#: ../lib/getroute.c:97 ../lib/setroute.c:76
+++#: ../lib/getroute.c:101 ../lib/setroute.c:80
++ #, c-format
++ msgid "Address family `%s' not supported.\n"
++ msgstr "Família de endereços `%s' não suportada.\n"
++ 
++-#: ../lib/getroute.c:103 ../lib/setroute.c:80
+++#: ../lib/getroute.c:107 ../lib/setroute.c:84
++ #, c-format
++ msgid "No routing for address family `%s'.\n"
++ msgstr "Nenhum roteamento para a família `%s'\n"
++ 
++-#: ../lib/hippi.c:96 ../lib/hippi.c:111
+++#: ../lib/hippi.c:84 ../lib/hippi.c:99
++ #, c-format
++ msgid "in_hippi(%s): invalid hippi address!\n"
++ msgstr "in_fddi(%S): endereço fddi inválido!\n"
++ 
++-#: ../lib/hippi.c:123
+++#: ../lib/hippi.c:111
++ #, c-format
++ msgid "in_hippi(%s): trailing : ignored!\n"
++ msgstr "in_fddi(%s): trailing : ignorado!\n"
++ 
++-#: ../lib/hippi.c:134
+++#: ../lib/hippi.c:122
++ #, c-format
++ msgid "in_hippi(%s): trailing junk!\n"
++ msgstr "in_fddi(%s): lixo no trailing!\n"
++ 
++-#: ../lib/hw.c:147
+++#: ../lib/hw.c:160
++ msgid "Local Loopback"
++ msgstr "Loopback Local"
++ 
++-#: ../lib/hw.c:150
+++#: ../lib/hw.c:163
++ msgid "Serial Line IP"
++ msgstr "SLIP"
++ 
++-#: ../lib/hw.c:151
+++#: ../lib/hw.c:164
++ msgid "VJ Serial Line IP"
++ msgstr "SLIP VJ"
++ 
++-#: ../lib/hw.c:152
+++#: ../lib/hw.c:165
++ msgid "6-bit Serial Line IP"
++ msgstr "SLIP 6 bits"
++ 
++-#: ../lib/hw.c:153
+++#: ../lib/hw.c:166
++ msgid "VJ 6-bit Serial Line IP"
++ msgstr "SLIP VJ 6 bits"
++ 
++-#: ../lib/hw.c:154
+++#: ../lib/hw.c:167
++ msgid "Adaptive Serial Line IP"
++ msgstr "SLIP Adaptativo"
++ 
++-#: ../lib/hw.c:157
+++#: ../lib/hw.c:170
++ msgid "Ethernet"
++ msgstr "Ethernet"
++ 
++-#: ../lib/hw.c:163
+++#: ../lib/hw.c:176
++ msgid "Fiber Distributed Data Interface"
++ msgstr "FDDI - Fibra Ótica"
++ 
++-#: ../lib/hw.c:166
+++#: ../lib/hw.c:179
++ msgid "HIPPI"
++ msgstr "HIPPI"
++ 
++-#: ../lib/hw.c:178
+++#: ../lib/hw.c:191
+++msgid "generic X.25"
+++msgstr ""
+++
+++#: ../lib/hw.c:194
++ msgid "IPIP Tunnel"
++ msgstr "Túnel IPIP"
++ 
++-#: ../lib/hw.c:181
+++#: ../lib/hw.c:197
++ msgid "Point-to-Point Protocol"
++ msgstr "Protocolo Ponto-a-Ponto"
++ 
++-#: ../lib/hw.c:184
+++#: ../lib/hw.c:200
++ msgid "(Cisco)-HDLC"
++ msgstr "(Cisco)-HDLC"
++ 
++-#: ../lib/hw.c:185
+++#: ../lib/hw.c:201
++ msgid "LAPB"
++ msgstr "LAPB"
++ 
++-#: ../lib/hw.c:188
+++#: ../lib/hw.c:204
++ msgid "ARCnet"
++ msgstr "ARCnet"
++ 
++-#: ../lib/hw.c:191
+++#: ../lib/hw.c:207
++ msgid "Frame Relay DLCI"
++ msgstr "Frame Relay DLCI"
++ 
++-#: ../lib/hw.c:192
+++#: ../lib/hw.c:208
++ msgid "Frame Relay Access Device"
++ msgstr "FRAD - Dispositivo de Acesso a Frame Relay"
++ 
++-#: ../lib/hw.c:195
+++#: ../lib/hw.c:211
++ msgid "IPv6-in-IPv4"
++ msgstr "IPv6 sobre IPv4"
++ 
++-#: ../lib/hw.c:198
+++#: ../lib/hw.c:214
++ msgid "IrLAP"
++ msgstr "IrLAP"
++ 
++-#: ../lib/hw.c:201
+++#: ../lib/hw.c:217
++ msgid "16/4 Mbps Token Ring"
++ msgstr "16/4 Mbps Token Ring"
++ 
++-#: ../lib/hw.c:203
+++#: ../lib/hw.c:219
++ msgid "16/4 Mbps Token Ring (New)"
++ msgstr "16/4 Mbps Token Ring (Novo)"
++ 
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr ""
+++
++ #: ../lib/inet.c:153 ../lib/inet6.c:79
++ #, c-format
++ msgid "rresolve: unsupport address family %d !\n"
++ msgstr "rresolve: família de endereços %d não suportada!\n"
++ 
++-#: ../lib/inet6_gr.c:79
+++#: ../lib/inet6.c:131
+++#, fuzzy
+++msgid "[UNKNOWN]"
+++msgstr "DESCONHECIDA"
+++
+++#: ../lib/inet6_gr.c:71
+++#, c-format
++ msgid "INET6 (IPv6) not configured in this system.\n"
++ msgstr "NET/ROM não configurado neste sistema.\n"
++ 
++-#: ../lib/inet6_gr.c:82
+++#: ../lib/inet6_gr.c:74
+++#, c-format
++ msgid "Kernel IPv6 routing table\n"
++ msgstr "Tabela de Roteamento IPv6 do Kernel\n"
++ 
++-#: ../lib/inet6_gr.c:84
+++#: ../lib/inet6_gr.c:76
+++#, c-format
++ msgid ""
++-"Destination                                 Next Hop                         "
++-"       Flags Metric Ref    Use Iface\n"
++-msgstr ""
++-"Destino                                     Próximo \"Hop\"                  "
++-"        Opções Métrica Ref   Uso Iface\n"
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
+++msgstr "Destino                                     Próximo \"Hop\"                          Opções Métrica Ref   Uso Iface\n"
++ 
++-#: ../lib/inet6_gr.c:158
+++#: ../lib/inet6_gr.c:150
+++#, c-format
++ msgid "Kernel IPv6 Neighbour Cache\n"
++ msgstr "Cache de Vizinhos IPv6 do Kernel\n"
++ 
++-#: ../lib/inet6_gr.c:161
+++#: ../lib/inet6_gr.c:153
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State\n"
++-msgstr ""
++-"Vizinho                                     Endereço HW       Iface   Opções "
++-"Estado Ref\n"
+++msgstr "Vizinho                                     Endereço HW       Iface   Opções Estado Ref\n"
++ 
++-#: ../lib/inet6_gr.c:165
+++#: ../lib/inet6_gr.c:157
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State            Stale(sec) Delete(sec)\n"
++ msgstr ""
++-"Vizinho                                     Endereço HW       Iface   Opções "
++-"Estado Ref\n"
+++"Vizinho                                     Endereço HW       Iface   Opções Estado Ref\n"
++ "       Parado(seg) Remover(seg)\n"
++ 
++ #: ../lib/inet6_sr.c:46
+++#, c-format
++ msgid "Usage: inet6_route [-vF] del Target\n"
++ msgstr "Uso: inet6_route [-vF] del Destino\n"
++ 
++ #: ../lib/inet6_sr.c:47
+++#, c-format
++ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
++ msgstr "       inet6_route [-vF] add Destino [gw Gw] [metric M] [[dev] If]\n"
++ 
++ #: ../lib/inet6_sr.c:48
+++#, c-format
++ msgid "       inet6_route [-FC] flush      NOT supported\n"
++ msgstr "       inet6_route [-FC] flush      NÃO suportado\n"
++ 
++-#: ../lib/inet6_sr.c:182
+++#: ../lib/inet6_sr.c:188
+++#, c-format
++ msgid "Flushing `inet6' routing table not supported\n"
++ msgstr "Limpeza da tabela de roteamento `inet6' não é suportada\n"
++ 
++ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
++ msgid "INET (IPv4) not configured in this system.\n"
++ msgstr "NET/ROM não configurado neste sistema.\n"
++ 
++ #: ../lib/inet_gr.c:53
+++#, c-format
++ msgid "Kernel IP routing table\n"
++ msgstr "Tabela de Roteamento IP do Kernel\n"
++ 
++ #: ../lib/inet_gr.c:56
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface\n"
++-msgstr ""
++-"Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso "
++-"Iface\n"
+++msgstr "Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso Iface\n"
++ 
++ #: ../lib/inet_gr.c:59
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
++ "Iface\n"
++-msgstr ""
++-"Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt "
++-"Iface\n"
+++msgstr "Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt Iface\n"
++ 
++ #: ../lib/inet_gr.c:62
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt\n"
++-msgstr ""
++-"Destino         Roteador        MáscaraGen     Opções Métrica Ref   Uso "
++-"Iface    MSS   Janela irtt\n"
+++msgstr "Destino         Roteador        MáscaraGen     Opções Métrica Ref   Uso Iface    MSS   Janela irtt\n"
++ 
++ #: ../lib/inet_gr.c:237
+++#, c-format
++ msgid "Kernel IP routing cache\n"
++ msgstr "Tabela de Roteamento IP do Kernel\n"
++ 
++ #: ../lib/inet_gr.c:258
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface\n"
++-msgstr ""
++-"Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso "
++-"Iface\n"
+++msgstr "Destino         Roteador        MáscaraGen.    Opções Métrica Ref   Uso Iface\n"
++ 
++ #: ../lib/inet_gr.c:261
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags   MSS Window  irtt "
++ "Iface\n"
++-msgstr ""
++-"Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt "
++-"Iface\n"
+++msgstr "Destino         Roteador        MáscaraGen.    Opções   MSS Janela  irtt Iface\n"
++ 
++ #: ../lib/inet_gr.c:266
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  HH  Arp\n"
++-msgstr ""
++-"Destino         Roteador        Origem         Opções Métrica Ref   Uso "
++-"Iface    MSS   Janela irtt   HH  Arp\n"
+++msgstr "Destino         Roteador        Origem         Opções Métrica Ref   Uso Iface    MSS   Janela irtt   HH  Arp\n"
++ 
++ #: ../lib/inet_gr.c:290
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++-msgstr ""
++-"Destino         Roteador        Origem         Opções Métrica Ref   Uso "
++-"Iface    MSS   Janela irtt   HH  Arp\n"
+++msgstr "Destino         Roteador        Origem         Opções Métrica Ref   Uso Iface    MSS   Janela irtt   HH  Arp\n"
++ 
++-#: ../lib/inet_sr.c:50
+++#: ../lib/inet_sr.c:51
+++#, c-format
++ msgid ""
++ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++@@ -2196,31 +2471,36 @@ msgstr ""
++ "Uso: inet_route [-vF] del {-host|-net} Destino[/prefixo] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:51
+++#: ../lib/inet_sr.c:52
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
++ msgstr ""
++ "       inet_route [-vF] add {-host|-net} Destino[/prefixo] [gw Gw] [metric "
++ "M]\n"
++ 
++-#: ../lib/inet_sr.c:52
+++#: ../lib/inet_sr.c:53
+++#, c-format
++ msgid ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ msgstr ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ 
++-#: ../lib/inet_sr.c:53
+++#: ../lib/inet_sr.c:54
+++#, c-format
++ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:54
+++#: ../lib/inet_sr.c:55
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
++ msgstr ""
++ "       inet_route [-vF] add {-host|-net} Destino[/prefixo] [metric M] "
++ "reject\n"
++ 
++-#: ../lib/inet_sr.c:55
+++#: ../lib/inet_sr.c:56
+++#, c-format
++ msgid "       inet_route [-FC] flush      NOT supported\n"
++ msgstr "       inet_route [-FC] flush      NÃO suportado\n"
++ 
++@@ -2230,14 +2510,17 @@ msgid "route: %s: cannot use a NETWORK a
++ msgstr "route: %s: não é possível usar uma REDE como roteador!\n"
++ 
++ #: ../lib/inet_sr.c:174
+++#, c-format
++ msgid "route: Invalid MSS/MTU.\n"
++ msgstr "route: MSS inválido.\n"
++ 
++ #: ../lib/inet_sr.c:187
+++#, c-format
++ msgid "route: Invalid window.\n"
++ msgstr "route: janela inválida.\n"
++ 
++ #: ../lib/inet_sr.c:203
+++#, c-format
++ msgid "route: Invalid initial rtt.\n"
++ msgstr "route: rtt inicial inválido.\n"
++ 
++@@ -2252,75 +2535,92 @@ msgid "route: bogus netmask %s\n"
++ msgstr "route: netmask %s inválida\n"
++ 
++ #: ../lib/inet_sr.c:270
+++#, c-format
++ msgid "route: netmask doesn't match route address\n"
++ msgstr "route: a netmask não casa com o endereço de rede\n"
++ 
++ #: ../lib/inet_sr.c:306
+++#, c-format
++ msgid "Flushing `inet' routing table not supported\n"
++ msgstr "Não é suportado limpar a tabela de roteamento `inet'\n"
++ 
++ #: ../lib/inet_sr.c:310
+++#, c-format
++ msgid "Modifying `inet' routing cache not supported\n"
++ msgstr "Não é suportado modificar o cache de roteamento `inet'\n"
++ 
++ #: ../lib/ipx_gr.c:52
+++#, c-format
++ msgid "IPX not configured in this system.\n"
++ msgstr "O AX.25 não foi configurado neste sistema.\n"
++ 
++ #: ../lib/ipx_gr.c:56
+++#, c-format
++ msgid "Kernel IPX routing table\n"
++ msgstr "Tabela de roteamento IPX do kernel\n"
++ 
++ #. xxx
++ #: ../lib/ipx_gr.c:57
+++#, c-format
++ msgid "Destination               Router Net                Router Node\n"
++ msgstr "Destino                   Rede Roteadora            Nó Roteador\n"
++ 
++ #: ../lib/ipx_sr.c:33
+++#, c-format
++ msgid "IPX: this needs to be written\n"
++ msgstr "NET/ROM: isto precisa ser escrito\n"
++ 
++-#: ../lib/masq_info.c:197
+++#: ../lib/masq_info.c:198
+++#, c-format
++ msgid "IP masquerading entries\n"
++ msgstr "Entradas de IP mascarado\n"
++ 
++-#: ../lib/masq_info.c:200
+++#: ../lib/masq_info.c:201
+++#, c-format
++ msgid "prot   expire source               destination          ports\n"
++ msgstr "prot   expira origem               destino             portas\n"
++ 
++-#: ../lib/masq_info.c:203
+++#: ../lib/masq_info.c:204
+++#, c-format
++ msgid ""
++-"prot   expire    initseq delta prevd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
++ msgstr ""
++-"prot   expira    initseq delta prevd origem               destino            "
++-" portas\n"
+++"prot   expira    initseq delta prevd origem               "
+++"destino             portas\n"
++ 
++ #: ../lib/netrom_gr.c:48
+++#, c-format
++ msgid "NET/ROM not configured in this system.\n"
++ msgstr "NET/ROM não configurado neste sistema.\n"
++ 
++ #: ../lib/netrom_gr.c:51
+++#, c-format
++ msgid "Kernel NET/ROM routing table\n"
++ msgstr "Tabela de roteamento NET/ROM do kernel\n"
++ 
++ #: ../lib/netrom_gr.c:52
+++#, c-format
++ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
++ msgstr "Destino      Mnemônico Qualidade Vizinho   Iface\n"
++ 
++ #: ../lib/netrom_sr.c:34
+++#, c-format
++ msgid "netrom usage\n"
++ msgstr "uso de netrom\n"
++ 
++ #: ../lib/netrom_sr.c:44
+++#, c-format
++ msgid "NET/ROM: this needs to be written\n"
++ msgstr "NET/ROM: isto precisa ser escrito\n"
++ 
++ #: ../lib/ppp.c:44
+++#, c-format
++ msgid "You cannot start PPP with this program.\n"
++ msgstr "Você não pode iniciar o PPP com este programa.\n"
++ 
++ #: ../lib/ppp_ac.c:38
+++#, c-format
++ msgid "Sorry, use pppd!\n"
++ msgstr "Desculpe, use o pppd!\n"
++ 
++@@ -2329,51 +2629,314 @@ msgid "Node address must be ten digits"
++ msgstr "Endereço do nó deve ter dez dígitos"
++ 
++ #: ../lib/rose_gr.c:51
+++#, c-format
++ msgid "ROSE not configured in this system.\n"
++ msgstr "ROSE não configurada neste sistema.\n"
++ 
++ #: ../lib/rose_gr.c:54
+++#, c-format
++ msgid "Kernel ROSE routing table\n"
++ msgstr "Tabela de roteamento ROSE do kernel\n"
++ 
++-#: ../lib/tr.c:70 ../lib/tr.c:85
+++#: ../lib/tr.c:86 ../lib/tr.c:101
++ #, c-format
++ msgid "in_tr(%s): invalid token ring address!\n"
++ msgstr "in_tr(%s): endereço token ring inválido!\n"
++ 
++-#: ../lib/tr.c:97
+++#: ../lib/tr.c:113
++ #, c-format
++ msgid "in_tr(%s): trailing : ignored!\n"
++ msgstr "in_tr(%s): trailing : ignorado!\n"
++ 
++-#: ../lib/tr.c:109
+++#: ../lib/tr.c:125
++ #, c-format
++ msgid "in_tr(%s): trailing junk!\n"
++ msgstr "in_tr(%s): lixo no trailing!\n"
++ 
++-#: ../lib/interface.c:124
+++#: ../lib/interface.c:176
++ #, c-format
++ msgid "warning: no inet socket available: %s\n"
++ msgstr "atenção: nenhum socket inet disponível: %s\n"
++ 
++-#: ../lib/interface.c:270
+++#: ../lib/interface.c:325
++ #, c-format
++ msgid "Warning: cannot open %s (%s). Limited output.\n"
++ msgstr "Atenção: não foi possível abrir %s (%s). Saída limitada.\n"
++ 
++ #. Give better error message for this case.
++-#: ../lib/interface.c:504
+++#: ../lib/interface.c:571
++ msgid "Device not found"
++ msgstr "%s: dispositivo não encontrado"
++ 
++-#: ../lib/interface.c:508
+++#: ../lib/interface.c:575
++ #, c-format
++ msgid "%s: error fetching interface information: %s\n"
+++msgstr "%s: erro obtendo informações da interface: %s\n"
+++
+++#: ../lib/interface.c:608
+++msgid "     - no statistics available -"
+++msgstr "     - estatísticas não disponíveis -"
+++
+++#: ../lib/interface.c:612
+++#, c-format
+++msgid "[NO FLAGS]"
+++msgstr "[SEM FLAGS]"
+++
+++#: ../lib/interface.c:688
+++#, c-format
+++msgid "%-9.9s Link encap:%s  "
+++msgstr "%-9.9s  Encapsulamento do Link: %s  "
+++
+++#: ../lib/interface.c:693
+++#, c-format
+++msgid "HWaddr %s  "
+++msgstr "Endereço de HW %s  "
+++
+++#: ../lib/interface.c:696
+++#, c-format
+++msgid "Media:%s"
+++msgstr "Mídia:%s"
+++
+++#: ../lib/interface.c:698
+++#, c-format
+++msgid "(auto)"
+++msgstr "(auto)"
+++
+++#: ../lib/interface.c:705
+++#, c-format
+++msgid "          %s addr:%s "
+++msgstr "          %s end.: %s "
+++
+++#: ../lib/interface.c:708
+++#, c-format
+++msgid " P-t-P:%s "
+++msgstr " P-a-P:%s "
+++
+++#: ../lib/interface.c:711
+++#, c-format
+++msgid " Bcast:%s "
+++msgstr " Bcast:%s "
+++
+++#: ../lib/interface.c:713
+++#, c-format
+++msgid " Mask:%s\n"
+++msgstr " Masc:%s\n"
+++
+++#: ../lib/interface.c:730
+++#, c-format
+++msgid "          inet6 addr: %s/%d"
+++msgstr "          endereço inet6: %s/%d"
+++
+++#: ../lib/interface.c:732
+++#, c-format
+++msgid " Scope:"
+++msgstr " Escopo:"
+++
+++#: ../lib/interface.c:735
+++#, c-format
+++msgid "Global"
+++msgstr "Global"
+++
+++#: ../lib/interface.c:738
+++#, c-format
+++msgid "Link"
+++msgstr "Link"
+++
+++#: ../lib/interface.c:741
+++#, c-format
+++msgid "Site"
+++msgstr "Site"
+++
+++#: ../lib/interface.c:744
+++#, c-format
+++msgid "Compat"
+++msgstr "Compat"
+++
+++#: ../lib/interface.c:747
+++#, c-format
+++msgid "Host"
+++msgstr "Máquina"
+++
+++#: ../lib/interface.c:750
+++#, c-format
+++msgid "Unknown"
+++msgstr "Desconhecido"
+++
+++#: ../lib/interface.c:765
+++#, c-format
+++msgid "          IPX/Ethernet II addr:%s\n"
+++msgstr "      Endereço IPX/Ethernet II:%s\n"
+++
+++#: ../lib/interface.c:768
+++#, c-format
+++msgid "          IPX/Ethernet SNAP addr:%s\n"
+++msgstr "      Endereço IPX/Ethernet SNAP:%s\n"
+++
+++#: ../lib/interface.c:771
+++#, c-format
+++msgid "          IPX/Ethernet 802.2 addr:%s\n"
+++msgstr "      Endereço IPX/Ethernet 802.2:%s\n"
+++
+++#: ../lib/interface.c:774
+++#, c-format
+++msgid "          IPX/Ethernet 802.3 addr:%s\n"
+++msgstr "      Endereço IPX/Ethernet 802.3:%s\n"
+++
+++#: ../lib/interface.c:784
+++#, c-format
+++msgid "          EtherTalk Phase 2 addr:%s\n"
+++msgstr "          Endereço EtherTalk fase 2:%s\n"
+++
+++#: ../lib/interface.c:793
+++#, c-format
+++msgid "          econet addr:%s\n"
+++msgstr "          Endereço econet:%s\n"
+++
+++#: ../lib/interface.c:800
+++#, c-format
+++msgid "[NO FLAGS] "
+++msgstr "[NENHUMA FLAG] "
+++
+++#: ../lib/interface.c:802
+++#, c-format
+++msgid "UP "
+++msgstr "UP "
+++
+++#: ../lib/interface.c:804
+++#, c-format
+++msgid "BROADCAST "
+++msgstr "BROADCAST"
+++
+++#: ../lib/interface.c:806
+++#, c-format
+++msgid "DEBUG "
+++msgstr "DEBUG "
+++
+++#: ../lib/interface.c:808
+++#, c-format
+++msgid "LOOPBACK "
+++msgstr "LOOPBACK"
+++
+++#: ../lib/interface.c:810
+++#, c-format
+++msgid "POINTOPOINT "
+++msgstr "POINTOPOINT "
+++
+++#: ../lib/interface.c:812
+++#, c-format
+++msgid "NOTRAILERS "
+++msgstr "NOTRAILERS "
+++
+++#: ../lib/interface.c:814
+++#, c-format
+++msgid "RUNNING "
+++msgstr "RUNNING "
+++
+++#: ../lib/interface.c:816
+++#, c-format
+++msgid "NOARP "
+++msgstr "NOARP "
+++
+++#: ../lib/interface.c:818
+++#, c-format
+++msgid "PROMISC "
+++msgstr "PROMISC "
+++
+++#: ../lib/interface.c:820
+++#, c-format
+++msgid "ALLMULTI "
+++msgstr "ALLMULTI "
+++
+++#: ../lib/interface.c:822
+++#, c-format
+++msgid "SLAVE "
+++msgstr "SLAVE "
+++
+++#: ../lib/interface.c:824
+++#, c-format
+++msgid "MASTER "
+++msgstr "MASTER "
+++
+++#: ../lib/interface.c:826
+++#, c-format
+++msgid "MULTICAST "
+++msgstr "MULTICAST "
+++
+++#: ../lib/interface.c:829
+++#, c-format
+++msgid "DYNAMIC "
+++msgstr "DYNAMIC "
+++
+++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
+++#: ../lib/interface.c:832
+++#, c-format
+++msgid " MTU:%d  Metric:%d"
+++msgstr " MTU:%d  Métrica:%d"
+++
+++#: ../lib/interface.c:836
+++#, c-format
+++msgid "  Outfill:%d  Keepalive:%d"
+++msgstr "  Outfill:%d  Keepalive:%d"
+++
+++#: ../lib/interface.c:850
+++#, fuzzy, c-format
+++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
+++msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposições:%lu frame:%lu\n"
+++
+++#: ../lib/interface.c:855
+++#, c-format
+++msgid "             compressed:%lu\n"
+++msgstr "             compactados:%lu\n"
+++
+++#: ../lib/interface.c:895
+++#, fuzzy, c-format
+++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgstr "Pacotes TX:%lu erros:%lu descartados:%lu sobreposições:%lu portadora:%lu\n"
+++
+++#: ../lib/interface.c:899
+++#, c-format
+++msgid "          collisions:%lu "
+++msgstr "          colisões:%lu "
+++
+++#: ../lib/interface.c:901
+++#, c-format
+++msgid "compressed:%lu "
+++msgstr "compactados:%lu "
+++
+++#: ../lib/interface.c:903
+++#, c-format
+++msgid "txqueuelen:%d "
+++msgstr "txqueuelen:%d "
+++
+++#: ../lib/interface.c:905
+++#, c-format
+++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
++ msgstr ""
++-"%s: erro obtendo informações da interface: %s\n"
++-"\n"
++ 
++-#: ../lib/sockets.c:59
+++#: ../lib/interface.c:916
+++#, c-format
+++msgid "Interrupt:%d "
+++msgstr "IRQ:%d "
+++
+++#. Only print devices using it for
+++#. I/O maps
+++#: ../lib/interface.c:919
+++#, c-format
+++msgid "Base address:0x%x "
+++msgstr "Endereço de E/S:0x%x "
+++
+++#: ../lib/interface.c:921
+++#, c-format
+++msgid "Memory:%lx-%lx "
+++msgstr "Memória:%lx-%lx "
+++
+++#: ../lib/interface.c:924
+++#, c-format
+++msgid "DMA chan:%x "
+++msgstr "Canal DMA:%x "
+++
+++#: ../lib/sockets.c:63
+++#, c-format
++ msgid "No usable address families found.\n"
++ msgstr "Nenhuma família de endereços que possa ser usada foi encontrada.\n"
++ 
++@@ -2397,29 +2960,32 @@ msgstr "%s: endereço %s inválido.\n"
++ msgid "ip: argument is wrong: %s\n"
++ msgstr "ip: argumento errado: %s\n"
++ 
++-#: ../ipmaddr.c:56
+++#: ../ipmaddr.c:61
+++#, c-format
++ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
++ msgstr "Uso: ipmaddr [ add | del ] ENDMULTI dev STRING\n"
++ 
++-#: ../ipmaddr.c:57
+++#: ../ipmaddr.c:62
+++#, c-format
++ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ msgstr "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ 
++-#: ../ipmaddr.c:58
+++#: ../ipmaddr.c:63
+++#, c-format
++ msgid "       ipmaddr -V | -version\n"
++ msgstr "       ipmaddr -V | -version\n"
++ 
++-#: ../ipmaddr.c:258
+++#: ../ipmaddr.c:263
++ #, c-format
++ msgid "family %d "
++ msgstr "família %d "
++ 
++-#: ../ipmaddr.c:267
+++#: ../ipmaddr.c:272
++ #, c-format
++ msgid " users %d"
++ msgstr " usuários %d"
++ 
++-#: ../ipmaddr.c:353
+++#: ../ipmaddr.c:358
++ msgid "Cannot create socket"
++ msgstr "Não foi possível criar o socket"
++ 
++@@ -2434,6 +3000,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
++ msgstr "slattach: tty_lock: (%s): %s\n"
++ 
++ #: ../slattach.c:192
+++#, c-format
++ msgid "slattach: cannot write PID file\n"
++ msgstr "slattach: não foi possível escrever o arquivo PID\n"
++ 
++@@ -2452,39 +3019,69 @@ msgstr "slattach: tty_hangup(DROP): %s\n
++ msgid "slattach: tty_hangup(RAISE): %s\n"
++ msgstr "slattach: tty_hangup(RAISE): %s\n"
++ 
++-#: ../slattach.c:486
+++#: ../slattach.c:468
+++#, fuzzy, c-format
+++msgid "slattach: tty name too long\n"
+++msgstr "%s: nome muito longo\n"
+++
+++#: ../slattach.c:498
+++#, c-format
++ msgid "slattach: tty_open: cannot get current state!\n"
++ msgstr "slattach: tty_open: não foi possível obter o estado corrente!\n"
++ 
++-#: ../slattach.c:493
+++#: ../slattach.c:505
+++#, c-format
++ msgid "slattach: tty_open: cannot get current line disc!\n"
++-msgstr ""
++-"slattach: tty_open: não foi possível obter a disciplina de linha corrente!\n"
+++msgstr "slattach: tty_open: não foi possível obter a disciplina de linha corrente!\n"
++ 
++-#: ../slattach.c:501
+++#: ../slattach.c:513
+++#, c-format
++ msgid "slattach: tty_open: cannot set RAW mode!\n"
++ msgstr "slattach: tty_open: não foi possível configurar o modo RAW!\n"
++ 
++-#: ../slattach.c:508
+++#: ../slattach.c:520
++ #, c-format
++ msgid "slattach: tty_open: cannot set %s bps!\n"
++ msgstr "slattach: tty_open: não foi possível configurar %s bps!\n"
++ 
++-#: ../slattach.c:518
+++#: ../slattach.c:530
+++#, c-format
++ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
++ msgstr "slattach: tty_open: não foi possível configurar modo 8N1!\n"
++ 
++-#: ../slattach.c:686
+++#: ../slattach.c:672
+++#, c-format
+++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
+++msgstr ""
+++
+++#: ../slattach.c:704
++ #, c-format
++ msgid "%s started"
++ msgstr "%s inicializado"
++ 
++-#: ../slattach.c:687
+++#: ../slattach.c:705
++ #, c-format
++ msgid " on %s"
++ msgstr " em %s"
++ 
++-#: ../slattach.c:688
+++#: ../slattach.c:706
++ #, c-format
++ msgid " interface %s\n"
++ msgstr "%s: interface desconhecida.\n"
+++
+++#~ msgid ""
+++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
+++#~ "<-''-\n"
+++#~ msgstr "  arp [-v]   [<HW>] [-i <if>] -s  <máquina> <end_hw>  [netmask <nm>] pub  <-''-\n"
+++
+++#~ msgid "%s: unknown interface: %s\n"
+++#~ msgstr "%s: interface desconhecida: %s\n"
+++
+++#~ msgid "address mask replies"
+++#~ msgstr "resposta a mascara de endereço"
+++
+++#~ msgid "unknown title %s\n"
+++#~ msgstr "título %s desconhecido\n"
+++
+++#~ msgid "Routing table for `ddp' not yet supported.\n"
+++#~ msgstr "Tabela de roteamento para `ddp' ainda não suportada.\n"
++Index: net-tools/po/net-tools.pot
++===================================================================
++--- net-tools.orig/po/net-tools.pot
+++++ net-tools/po/net-tools.pot
++@@ -1,253 +1,275 @@
++ # SOME DESCRIPTIVE TITLE.
++-# Copyright (C) YEAR Free Software Foundation, Inc.
+++# 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"
++-"POT-Creation-Date: 2001-04-15 15:40+0100\n"
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\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: ENCODING\n"
+++"Content-Transfer-Encoding: 8bit\n"
++ 
++-#: ../arp.c:111 ../arp.c:270
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
++ msgid "arp: need host name\n"
++ msgstr ""
++ 
++-#: ../arp.c:208 ../arp.c:222
+++#: ../arp.c:215 ../arp.c:230
++ #, c-format
++ msgid "No ARP entry for %s\n"
++ msgstr ""
++ 
++-#: ../arp.c:240
+++#: ../arp.c:248
++ #, c-format
++ msgid "arp: cant get HW-Address for `%s': %s.\n"
++ msgstr ""
++ 
++-#: ../arp.c:244
+++#: ../arp.c:252
+++#, c-format
++ msgid "arp: protocol type mismatch.\n"
++ msgstr ""
++ 
++-#: ../arp.c:253
+++#: ../arp.c:261
++ #, c-format
++ msgid "arp: device `%s' has HW address %s `%s'.\n"
++ msgstr ""
++ 
++-#: ../arp.c:283
+++#: ../arp.c:293
+++#, c-format
++ msgid "arp: need hardware address\n"
++ msgstr ""
++ 
++-#: ../arp.c:291
+++#: ../arp.c:301
+++#, c-format
++ msgid "arp: invalid hardware address\n"
++ msgstr ""
++ 
++-#: ../arp.c:388
+++#: ../arp.c:398
++ #, c-format
++ msgid "arp: cannot open etherfile %s !\n"
++ msgstr ""
++ 
++-#: ../arp.c:404
+++#: ../arp.c:414
++ #, c-format
++ msgid "arp: format error on line %u of etherfile %s !\n"
++ msgstr ""
++ 
++-#: ../arp.c:417
+++#: ../arp.c:427
++ #, c-format
++ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
++ msgstr ""
++ 
++-#: ../arp.c:438
+++#: ../arp.c:448
+++#, c-format
++ msgid ""
++ "Address                  HWtype  HWaddress           Flags Mask            "
++ "Iface\n"
++ msgstr ""
++ 
++-#: ../arp.c:468
+++#: ../arp.c:476
+++msgid "<from_interface>"
+++msgstr ""
+++
+++#: ../arp.c:478
++ msgid "(incomplete)"
++ msgstr ""
++ 
++-#: ../arp.c:485
+++#: ../arp.c:495
++ #, c-format
++ msgid "%s (%s) at "
++ msgstr ""
++ 
++-#: ../arp.c:491
+++#: ../arp.c:501
+++#, c-format
++ msgid "<incomplete> "
++ msgstr ""
++ 
++-#: ../arp.c:497
+++#: ../arp.c:507
++ #, c-format
++ msgid "netmask %s "
++ msgstr ""
++ 
++-#: ../arp.c:514
+++#: ../arp.c:524
++ #, c-format
++ msgid "on %s\n"
++ msgstr ""
++ 
++-#: ../arp.c:593
+++#: ../arp.c:605
++ #, c-format
++ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
++ msgstr ""
++ 
++-#: ../arp.c:597
+++#: ../arp.c:609
++ #, c-format
++ msgid "%s (%s) -- no entry\n"
++ msgstr ""
++ 
++-#: ../arp.c:599
+++#: ../arp.c:611
++ #, c-format
++ msgid "arp: in %d entries no match found.\n"
++ msgstr ""
++ 
++-#: ../arp.c:614
+++#: ../arp.c:626
+++#, c-format
++ msgid ""
++ "Usage:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
++ "cache\n"
++ msgstr ""
++ 
++-#: ../arp.c:615
+++#: ../arp.c:627
+++#, c-format
++ msgid ""
++-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
++ "entry\n"
++ msgstr ""
++ 
++-#: ../arp.c:616
+++#: ../arp.c:628
+++#, c-format
++ msgid ""
++-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
++ "file\n"
++ msgstr ""
++ 
++-#: ../arp.c:617
+++#: ../arp.c:629
+++#, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
++ "entry\n"
++ msgstr ""
++ 
++-#: ../arp.c:618
++-msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
++-"<-''-\n"
++-msgstr ""
++-
++-#: ../arp.c:619
+++#: ../arp.c:630
+++#, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
++ "<-''-\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../arp.c:621
+++#: ../arp.c:632
+++#, c-format
++ msgid ""
++ "        -a                       display (all) hosts in alternative (BSD) "
++ "style\n"
++ msgstr ""
++ 
++-#: ../arp.c:622
+++#: ../arp.c:633
+++#, c-format
++ msgid "        -s, --set                set a new ARP entry\n"
++ msgstr ""
++ 
++-#: ../arp.c:623
+++#: ../arp.c:634
+++#, c-format
++ msgid "        -d, --delete             delete a specified entry\n"
++ msgstr ""
++ 
++-#: ../arp.c:624 ../netstat.c:1490 ../route.c:86
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
++ msgid "        -v, --verbose            be verbose\n"
++ msgstr ""
++ 
++-#: ../arp.c:625 ../netstat.c:1491 ../route.c:87
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, c-format
++ msgid "        -n, --numeric            don't resolve names\n"
++ msgstr ""
++ 
++-#: ../arp.c:626
+++#: ../arp.c:637
+++#, c-format
++ msgid ""
++ "        -i, --device             specify network interface (e.g. eth0)\n"
++ msgstr ""
++ 
++-#: ../arp.c:627
+++#: ../arp.c:638
+++#, c-format
++ msgid "        -D, --use-device         read <hwaddr> from given device\n"
++ msgstr ""
++ 
++-#: ../arp.c:628
+++#: ../arp.c:639
+++#, c-format
++ msgid "        -A, -p, --protocol       specify protocol family\n"
++ msgstr ""
++ 
++-#: ../arp.c:629
+++#: ../arp.c:640
+++#, c-format
++ msgid ""
++-"        -f, --file               read new entries from file or from "
++-"/etc/ethers\n"
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../arp.c:631 ../rarp.c:182
+++#: ../arp.c:642 ../rarp.c:182
++ #, c-format
++ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
++ msgstr ""
++ 
++-#: ../arp.c:632 ../rarp.c:183
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
++ msgid "  List of possible hardware types (which support ARP):\n"
++ msgstr ""
++ 
++-#: ../arp.c:666 ../arp.c:751
+++#: ../arp.c:677 ../arp.c:762
++ #, c-format
++ msgid "%s: hardware type not supported!\n"
++ msgstr ""
++ 
++-#: ../arp.c:670
+++#: ../arp.c:681
++ #, c-format
++ msgid "%s: address family not supported!\n"
++ msgstr ""
++ 
++-#: ../arp.c:705
+++#: ../arp.c:716
+++#, c-format
++ msgid "arp: -N not yet supported.\n"
++ msgstr ""
++ 
++-#: ../arp.c:715
+++#: ../arp.c:726
++ #, c-format
++ msgid "arp: %s: unknown address family.\n"
++ msgstr ""
++ 
++-#: ../arp.c:724
+++#: ../arp.c:735
++ #, c-format
++ msgid "arp: %s: unknown hardware type.\n"
++ msgstr ""
++ 
++-#: ../arp.c:743
+++#: ../arp.c:754
++ #, c-format
++ msgid "arp: %s: kernel only supports 'inet'.\n"
++ msgstr ""
++ 
++-#: ../arp.c:756
+++#: ../arp.c:767
++ #, c-format
++ msgid "arp: %s: hardware type without ARP support.\n"
++ msgstr ""
++ 
++-#: ../hostname.c:70
+++#: ../hostname.c:71
++ #, c-format
++ msgid "Setting nodename to `%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:75
+++#: ../hostname.c:76
++ #, c-format
++ msgid "%s: you must be root to change the node name\n"
++ msgstr ""
++ 
++-#: ../hostname.c:78 ../hostname.c:98 ../hostname.c:117
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
++ #, c-format
++ msgid "%s: name too long\n"
++ msgstr ""
++ 
++-#: ../hostname.c:90
+++#: ../hostname.c:91
++ #, c-format
++ msgid "Setting hostname to `%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:95
+++#: ../hostname.c:96
++ #, c-format
++ msgid "%s: you must be root to change the host name\n"
++ msgstr ""
++@@ -262,103 +284,119 @@ msgstr ""
++ msgid "%s: you must be root to change the domain name\n"
++ msgstr ""
++ 
++-#: ../hostname.c:132
+++#: ../hostname.c:131
++ #, c-format
++ msgid "Resolving `%s' ...\n"
++ msgstr ""
++ 
++-#: ../hostname.c:138
+++#: ../hostname.c:137
++ #, c-format
++ msgid "Result: h_name=`%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:143
+++#: ../hostname.c:142
++ #, c-format
++ msgid "Result: h_aliases=`%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:148
+++#: ../hostname.c:147
++ #, c-format
++ msgid "Result: h_addr_list=`%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:210
+++#: ../hostname.c:208
++ #, c-format
++ msgid "%s: can't open `%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:224
+++#: ../hostname.c:222
+++#, c-format
++ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
++ msgstr ""
++ 
++-#: ../hostname.c:225
+++#: ../hostname.c:223
+++#, c-format
++ msgid ""
++ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
++ msgstr ""
++ 
++-#: ../hostname.c:227
+++#: ../hostname.c:225
+++#, c-format
++ msgid ""
++ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
++ "file)\n"
++ msgstr ""
++ 
++-#: ../hostname.c:229
+++#: ../hostname.c:227
+++#, c-format
++ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
++ msgstr ""
++ 
++-#: ../hostname.c:230
+++#: ../hostname.c:228
+++#, c-format
++ msgid ""
++ "       hostname [-v]                         display hostname\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../hostname.c:231
+++#: ../hostname.c:229
+++#, c-format
++ msgid ""
++ "       hostname -V|--version|-h|--help       print info and exit\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../hostname.c:232
+++#: ../hostname.c:230
+++#, c-format
++ msgid ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../hostname.c:233
+++#: ../hostname.c:231
+++#, c-format
++ msgid "    -s, --short           short host name\n"
++ msgstr ""
++ 
++-#: ../hostname.c:234
+++#: ../hostname.c:232
+++#, c-format
++ msgid "    -a, --alias           alias names\n"
++ msgstr ""
++ 
++-#: ../hostname.c:235
+++#: ../hostname.c:233
+++#, c-format
++ msgid "    -i, --ip-address      addresses for the hostname\n"
++ msgstr ""
++ 
++-#: ../hostname.c:236
+++#: ../hostname.c:234
+++#, c-format
++ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
++ msgstr ""
++ 
++-#: ../hostname.c:237
+++#: ../hostname.c:235
+++#, c-format
++ msgid "    -d, --domain          DNS domain name\n"
++ msgstr ""
++ 
++-#: ../hostname.c:238
+++#: ../hostname.c:236
+++#, c-format
++ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
++ msgstr ""
++ 
++-#: ../hostname.c:240
+++#: ../hostname.c:238
+++#, c-format
++ msgid "    -n, --node            DECnet node name\n"
++ msgstr ""
++ 
++-#: ../hostname.c:242
+++#: ../hostname.c:240
+++#, c-format
++ msgid ""
++ "    -F, --file            read hostname or NIS domainname from given file\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../hostname.c:244
+++#: ../hostname.c:242
+++#, c-format
++ msgid ""
++ "   This command can read or set the hostname or the NIS domainname. You can\n"
++ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
++@@ -367,587 +405,706 @@ msgid ""
++ "   part of the FQDN) in the /etc/hosts file.\n"
++ msgstr ""
++ 
++-#: ../hostname.c:340
+++#: ../hostname.c:338
++ #, c-format
++ msgid "%s: You can't change the DNS domain name with this command\n"
++ msgstr ""
++ 
++-#: ../hostname.c:341
+++#: ../hostname.c:339
+++#, c-format
++ msgid ""
++ "\n"
++ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
++ msgstr ""
++ 
++-#: ../hostname.c:342
+++#: ../hostname.c:340
+++#, c-format
++ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
++ msgstr ""
++ 
++-#: ../hostname.c:359
+++#: ../hostname.c:357
++ #, c-format
++ msgid "gethostname()=`%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:376
+++#: ../hostname.c:374
++ #, c-format
++ msgid "getdomainname()=`%s'\n"
++ msgstr ""
++ 
++-#: ../hostname.c:391
+++#: ../hostname.c:389
++ #, c-format
++ msgid "getnodename()=`%s'\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:108
+++#: ../ifconfig.c:107
+++#, c-format
++ msgid ""
++-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:130 ../ifconfig.c:162
+++#: ../ifconfig.c:129 ../ifconfig.c:161
++ #, c-format
++-msgid "%s: unknown interface: %s\n"
+++msgid "%s: ERROR while getting interface flags: %s\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:154 ../ifconfig.c:734 ../ifconfig.c:825 ../ifconfig.c:936
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
+++#, c-format
++ msgid "No support for INET on this system.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:177
+++#: ../ifconfig.c:193
+++#, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:202
+++#, c-format
++ msgid ""
++ "Usage:\n"
++-"  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:179
+++#: ../ifconfig.c:204
+++#, c-format
++ msgid "  [add <address>[/<prefixlen>]]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:180
+++#: ../ifconfig.c:205
+++#, c-format
++ msgid "  [del <address>[/<prefixlen>]]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:181
+++#: ../ifconfig.c:206
+++#, c-format
++ msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:182
+++#: ../ifconfig.c:207
+++#, c-format
++ msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:185
+++#: ../ifconfig.c:210
+++#, c-format
++ msgid "  [outfill <NN>] [keepalive <NN>]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:187
+++#: ../ifconfig.c:212
+++#, c-format
++ msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:188
+++#: ../ifconfig.c:213
+++#, c-format
++ msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:189
+++#: ../ifconfig.c:214
+++#, c-format
++ msgid "  [multicast]  [[-]promisc]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:190
+++#: ../ifconfig.c:215
+++#, c-format
++ msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:192
+++#: ../ifconfig.c:217
+++#, c-format
++ msgid "  [txqueuelen <NN>]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:195
+++#: ../ifconfig.c:220
+++#, c-format
++ msgid "  [[-]dynamic]\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:197
+++#: ../ifconfig.c:222
+++#, c-format
++ msgid ""
++ "  [up|down] ...\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:199
+++#: ../ifconfig.c:224
+++#, c-format
++ msgid "  <HW>=Hardware Type.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:200
+++#: ../ifconfig.c:225
+++#, c-format
++ msgid "  List of possible hardware types:\n"
++ msgstr ""
++ 
++ #. 1 = ARPable
++-#: ../ifconfig.c:202
+++#: ../ifconfig.c:227
++ #, c-format
++ msgid "  <AF>=Address family. Default: %s\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:203
+++#: ../ifconfig.c:228
+++#, c-format
++ msgid "  List of possible address families:\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:278
+++#: ../ifconfig.c:303
++ #, c-format
++ msgid "ifconfig: option `%s' not recognised.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:280 ../ifconfig.c:925
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
++ msgid "ifconfig: `--help' gives usage information.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:355
+++#: ../ifconfig.c:380
+++#, c-format
++ msgid "Unknown media type.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:647
+++#: ../ifconfig.c:417
+++#, c-format
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:429
+++#, c-format
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:441
+++#, c-format
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:465
+++#, c-format
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:523
+++#, c-format
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:652
+++#, c-format
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:684
++ #, c-format
++ msgid "hw address type `%s' has no handler to set address. failed.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:656
+++#: ../ifconfig.c:693
++ #, c-format
++ msgid "%s: invalid %s address.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
+++#, c-format
++ msgid "No support for INET6 on this system.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:743 ../ifconfig.c:834
+++#: ../ifconfig.c:780 ../ifconfig.c:871
++ #, c-format
++ msgid "Interface %s not initialized\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:755 ../ifconfig.c:845
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, c-format
++ msgid "Bad address.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:848
+++#: ../ifconfig.c:885
+++#, c-format
++ msgid "Address deletion not supported on this system.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:920
+++#: ../ifconfig.c:957
+++#, c-format
++ msgid "ifconfig: Cannot set address for this protocol family.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:946
+++#: ../ifconfig.c:983
+++#, c-format
++ msgid "No support for ECONET on this system.\n"
++ msgstr ""
++ 
++-#: ../ifconfig.c:954
+++#: ../ifconfig.c:991
++ #, c-format
++ msgid "Don't know how to set addresses for family %d.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:430
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr ""
+++
+++#: ../netstat.c:434
++ #, c-format
++ msgid ""
++ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
++ msgstr ""
++ 
++-#: ../netstat.c:434
+++#: ../netstat.c:438
+++#, c-format
++ msgid ""
++ "(Not all processes could be identified, non-owned process info\n"
++ " will not be shown, you would have to be root to see it all.)\n"
++ msgstr ""
++ 
++-#: ../netstat.c:441 ../netstat.c:1176 ../netstat.c:1253
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
++ msgid "LISTENING"
++ msgstr ""
++ 
++-#: ../netstat.c:442
+++#: ../netstat.c:446
++ msgid "CONN SENT"
++ msgstr ""
++ 
++-#: ../netstat.c:443 ../netstat.c:1255
+++#: ../netstat.c:447 ../netstat.c:1268
++ msgid "DISC SENT"
++ msgstr ""
++ 
++-#: ../netstat.c:444 ../netstat.c:511 ../netstat.c:894 ../netstat.c:1256
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
++ msgid "ESTABLISHED"
++ msgstr ""
++ 
++-#: ../netstat.c:466
+++#: ../netstat.c:470
+++#, c-format
++ msgid "Active NET/ROM sockets\n"
++ msgstr ""
++ 
++-#: ../netstat.c:467
+++#: ../netstat.c:471
+++#, c-format
++ msgid ""
++-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
++-"Recv-Q\n"
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
++ msgstr ""
++ 
++-#: ../netstat.c:477 ../netstat.c:1295
+++#: ../netstat.c:481 ../netstat.c:1308
++ #, c-format
++ msgid "Problem reading data from %s\n"
++ msgstr ""
++ 
++-#: ../netstat.c:512
+++#: ../netstat.c:516
++ msgid "SYN_SENT"
++ msgstr ""
++ 
++-#: ../netstat.c:513
+++#: ../netstat.c:517
++ msgid "SYN_RECV"
++ msgstr ""
++ 
++-#: ../netstat.c:514
+++#: ../netstat.c:518
++ msgid "FIN_WAIT1"
++ msgstr ""
++ 
++-#: ../netstat.c:515
+++#: ../netstat.c:519
++ msgid "FIN_WAIT2"
++ msgstr ""
++ 
++-#: ../netstat.c:516
+++#: ../netstat.c:520
++ msgid "TIME_WAIT"
++ msgstr ""
++ 
++-#: ../netstat.c:517
+++#: ../netstat.c:521
++ msgid "CLOSE"
++ msgstr ""
++ 
++-#: ../netstat.c:518
+++#: ../netstat.c:522
++ msgid "CLOSE_WAIT"
++ msgstr ""
++ 
++-#: ../netstat.c:519
+++#: ../netstat.c:523
++ msgid "LAST_ACK"
++ msgstr ""
++ 
++-#: ../netstat.c:520
+++#: ../netstat.c:524
++ msgid "LISTEN"
++ msgstr ""
++ 
++-#: ../netstat.c:521
+++#: ../netstat.c:525
++ msgid "CLOSING"
++ msgstr ""
++ 
++-#: ../netstat.c:592
+++#: ../netstat.c:596
++ #, c-format
++ msgid "warning, got bogus igmp6 line %d.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:597 ../netstat.c:635 ../netstat.c:756 ../netstat.c:888
++-#: ../netstat.c:1019 ../netstat.c:1024
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
++ #, c-format
++ msgid "netstat: unsupported address family %d !\n"
++ msgstr ""
++ 
++-#: ../netstat.c:610 ../netstat.c:615 ../netstat.c:623 ../netstat.c:630
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
++ #, c-format
++ msgid "warning, got bogus igmp line %d.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:673
+++#: ../netstat.c:677
+++#, c-format
++ msgid "Active X.25 sockets\n"
++ msgstr ""
++ 
++ #. IMHO, Vr/Vs is not very usefull --SF
++-#: ../netstat.c:675
+++#: ../netstat.c:679
+++#, c-format
++ msgid ""
++-"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  "
++-"Recv-Q\n"
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
++ msgstr ""
++ 
++-#: ../netstat.c:752
+++#: ../netstat.c:759
+++#, c-format
++ msgid "warning, got bogus tcp line.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:793 ../netstat.c:943 ../netstat.c:1062
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
++ #, c-format
++ msgid "off (0.00/%ld/%d)"
++ msgstr ""
++ 
++-#: ../netstat.c:797
+++#: ../netstat.c:804
++ #, c-format
++ msgid "on (%2.2f/%ld/%d)"
++ msgstr ""
++ 
++-#: ../netstat.c:802
+++#: ../netstat.c:809
++ #, c-format
++ msgid "keepalive (%2.2f/%ld/%d)"
++ msgstr ""
++ 
++-#: ../netstat.c:807
+++#: ../netstat.c:814
++ #, c-format
++ msgid "timewait (%2.2f/%ld/%d)"
++ msgstr ""
++ 
++-#: ../netstat.c:812 ../netstat.c:952 ../netstat.c:1072
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
++ #, c-format
++ msgid "unkn-%d (%2.2f/%ld/%d)"
++ msgstr ""
++ 
++-#: ../netstat.c:884
+++#: ../netstat.c:894
+++#, c-format
++ msgid "warning, got bogus udp line.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:902 ../netstat.c:1162 ../netstat.c:1195
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
++ msgid "UNKNOWN"
++ msgstr ""
++ 
++-#: ../netstat.c:948 ../netstat.c:1067
+++#: ../netstat.c:958 ../netstat.c:1080
++ #, c-format
++ msgid "on%d (%2.2f/%ld/%d)"
++ msgstr ""
++ 
++-#: ../netstat.c:1033
+++#: ../netstat.c:1046
+++#, c-format
++ msgid "warning, got bogus raw line.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1115
+++#: ../netstat.c:1128
+++#, c-format
++ msgid "warning, got bogus unix line.\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1142
+++#: ../netstat.c:1155
++ msgid "STREAM"
++ msgstr ""
++ 
++-#: ../netstat.c:1146
+++#: ../netstat.c:1159
++ msgid "DGRAM"
++ msgstr ""
++ 
++-#: ../netstat.c:1150
+++#: ../netstat.c:1163
++ msgid "RAW"
++ msgstr ""
++ 
++-#: ../netstat.c:1154
+++#: ../netstat.c:1167
++ msgid "RDM"
++ msgstr ""
++ 
++-#: ../netstat.c:1158
+++#: ../netstat.c:1171
++ msgid "SEQPACKET"
++ msgstr ""
++ 
++-#: ../netstat.c:1167
+++#: ../netstat.c:1180
++ msgid "FREE"
++ msgstr ""
++ 
++-#: ../netstat.c:1183
+++#: ../netstat.c:1196
++ msgid "CONNECTING"
++ msgstr ""
++ 
++-#: ../netstat.c:1187
+++#: ../netstat.c:1200
++ msgid "CONNECTED"
++ msgstr ""
++ 
++-#: ../netstat.c:1191
+++#: ../netstat.c:1204
++ msgid "DISCONNECTING"
++ msgstr ""
++ 
++-#: ../netstat.c:1222
+++#: ../netstat.c:1235
+++#, c-format
++ msgid "Active UNIX domain sockets "
++ msgstr ""
++ 
++-#: ../netstat.c:1224 ../netstat.c:1735
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
++ msgid "(servers and established)"
++ msgstr ""
++ 
++-#: ../netstat.c:1227 ../netstat.c:1738
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
++ msgid "(only servers)"
++ msgstr ""
++ 
++-#: ../netstat.c:1229 ../netstat.c:1740
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
++ msgid "(w/o servers)"
++ msgstr ""
++ 
++-#: ../netstat.c:1232
+++#: ../netstat.c:1245
+++#, c-format
++ msgid ""
++ "\n"
++ "Proto RefCnt Flags       Type       State         I-Node"
++ msgstr ""
++ 
++-#: ../netstat.c:1234
+++#: ../netstat.c:1247
+++#, c-format
++ msgid " Path\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1254
+++#: ../netstat.c:1267
++ msgid "SABM SENT"
++ msgstr ""
++ 
++-#: ../netstat.c:1257
+++#: ../netstat.c:1270
++ msgid "RECOVERY"
++ msgstr ""
++ 
++-#: ../netstat.c:1271
+++#: ../netstat.c:1284
+++#, c-format
++ msgid "Active AX.25 sockets\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1272
+++#: ../netstat.c:1285
+++#, c-format
++ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1315
+++#: ../netstat.c:1328
++ #, c-format
++ msgid "problem reading data from %s\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1366
+++#: ../netstat.c:1379
+++#, c-format
++ msgid ""
++ "Active IPX sockets\n"
++ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
++ "State"
++ msgstr ""
++ 
++-#: ../netstat.c:1368
+++#: ../netstat.c:1381
+++#, c-format
++ msgid " User"
++ msgstr ""
++ 
++-#: ../netstat.c:1402
+++#: ../netstat.c:1415
++ msgid "ESTAB"
++ msgstr ""
++ 
++-#: ../netstat.c:1410
+++#: ../netstat.c:1423
++ msgid "UNK."
++ msgstr ""
++ 
++-#: ../netstat.c:1448
+++#: ../netstat.c:1461
+++#, c-format
++ msgid "Kernel Interface table\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1452
+++#: ../netstat.c:1465
+++#, c-format
++ msgid ""
++-"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1456
+++#: ../netstat.c:1469
++ msgid "missing interface information"
++ msgstr ""
++ 
++-#: ../netstat.c:1479
+++#: ../netstat.c:1492
+++#, c-format
++ msgid ""
++-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1480
+++#: ../netstat.c:1493
+++#, c-format
++ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1481
+++#: ../netstat.c:1494
+++#, c-format
++ msgid ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1483
+++#: ../netstat.c:1496
+++#, c-format
++ msgid "        -r, --route              display routing table\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1484
+++#: ../netstat.c:1497
+++#, c-format
++ msgid "        -i, --interfaces         display interface table\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1485
+++#: ../netstat.c:1498
+++#, c-format
++ msgid "        -g, --groups             display multicast group memberships\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1486
+++#: ../netstat.c:1499
+++#, c-format
++ msgid ""
++ "        -s, --statistics         display networking statistics (like SNMP)\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1488
+++#: ../netstat.c:1501
+++#, c-format
++ msgid ""
++ "        -M, --masquerade         display masqueraded connections\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1492
+++#: ../netstat.c:1505
+++#, c-format
++ msgid "        --numeric-hosts          don't resolve host names\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1493
+++#: ../netstat.c:1506
+++#, c-format
++ msgid "        --numeric-ports          don't resolve port names\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1494
+++#: ../netstat.c:1507
+++#, c-format
++ msgid "        --numeric-users          don't resolve user names\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1495
+++#: ../netstat.c:1508
+++#, c-format
++ msgid "        -N, --symbolic           resolve hardware names\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1496 ../route.c:88
+++#: ../netstat.c:1509 ../route.c:88
+++#, c-format
++ msgid "        -e, --extend             display other/more information\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1497
+++#: ../netstat.c:1510
+++#, c-format
++ msgid "        -p, --programs           display PID/Program name for sockets\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1498
+++#: ../netstat.c:1511
+++#, c-format
++ msgid ""
++ "        -c, --continuous         continuous listing\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1499
+++#: ../netstat.c:1512
+++#, c-format
++ msgid "        -l, --listening          display listening server sockets\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1500
+++#: ../netstat.c:1513
+++#, c-format
++ msgid ""
++ "        -a, --all, --listening   display all sockets (default: connected)\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1501
+++#: ../netstat.c:1514
+++#, c-format
++ msgid "        -o, --timers             display timers\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1502 ../route.c:89
+++#: ../netstat.c:1515 ../route.c:89
+++#, c-format
++ msgid ""
++ "        -F, --fib                display Forwarding Information Base "
++ "(default)\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1503 ../route.c:90
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
++ msgid ""
++ "        -C, --cache              display routing cache instead of FIB\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1505
+++#: ../netstat.c:1518
+++#, c-format
++ msgid ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1506 ../route.c:92
+++#: ../netstat.c:1519
++ #, c-format
++-msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1507 ../route.c:93
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
++ msgid "  List of possible address families (which support routing):\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1732
+++#: ../netstat.c:1753
+++#, c-format
++ msgid "Active Internet connections "
++ msgstr ""
++ 
++-#: ../netstat.c:1742
+++#: ../netstat.c:1763
+++#, c-format
++ msgid ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ msgstr ""
++ 
++-#: ../netstat.c:1744
+++#: ../netstat.c:1765
+++#, c-format
++ msgid " User       Inode     "
++ msgstr ""
++ 
++-#: ../netstat.c:1747
+++#: ../netstat.c:1768
+++#, c-format
++ msgid " Timer"
++ msgstr ""
++ 
++-#: ../netstat.c:1777
+++#: ../netstat.c:1798
+++#, c-format
++ msgid "IPv4 Group Memberships\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1778
+++#: ../netstat.c:1799
+++#, c-format
++ msgid "Interface       RefCnt Group\n"
++ msgstr ""
++ 
++@@ -986,23 +1143,28 @@ msgid "rarp: cannot set entry from %s:%u
++ msgstr ""
++ 
++ #: ../rarp.c:176
+++#, c-format
++ msgid "Usage: rarp -a                               list entries in cache.\n"
++ msgstr ""
++ 
++ #: ../rarp.c:177
+++#, c-format
++ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
++ msgstr ""
++ 
++ #: ../rarp.c:178
+++#, c-format
++ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
++ msgstr ""
++ 
++ #: ../rarp.c:179
+++#, c-format
++ msgid ""
++ "       rarp -f                               add entries from /etc/ethers.\n"
++ msgstr ""
++ 
++ #: ../rarp.c:180
+++#, c-format
++ msgid ""
++ "       rarp -V                               display program version.\n"
++ "\n"
++@@ -1019,38 +1181,50 @@ msgid "rarp: %s: unknown hardware type.\
++ msgstr ""
++ 
++ #: ../route.c:80
+++#, c-format
++ msgid ""
++ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
++ msgstr ""
++ 
++ #: ../route.c:81
+++#, c-format
++ msgid ""
++ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
++ "\n"
++ msgstr ""
++ 
++ #: ../route.c:83
+++#, c-format
++ msgid ""
++ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
++ "specified AF.\n"
++ msgstr ""
++ 
++ #: ../route.c:84
+++#, c-format
++ msgid ""
++ "       route {-V|--version}                  Display version/author and "
++ "exit.\n"
++ "\n"
++ msgstr ""
++ 
+++#: ../route.c:92
+++#, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr ""
+++
++ #: ../plipconfig.c:66
+++#, c-format
++ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
++ msgstr ""
++ 
++ #: ../plipconfig.c:67
+++#, c-format
++ msgid "                  [nibble NN] [trigger NN]\n"
++ msgstr ""
++ 
++ #: ../plipconfig.c:68
+++#, c-format
++ msgid "       plipconfig -V | --version\n"
++ msgstr ""
++ 
++@@ -1060,61 +1234,75 @@ msgid "%s\tnibble %lu  trigger %lu\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:85
+++#, c-format
++ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:86
+++#, c-format
++ msgid ""
++ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:87
+++#, c-format
++ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:88
+++#, c-format
++ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:89
+++#, c-format
++ msgid ""
++ "       iptunnel -V | --version\n"
++ "\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:90
+++#, c-format
++ msgid "Where: NAME := STRING\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:91
+++#, c-format
++ msgid "       ADDR := { IP_ADDRESS | any }\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:92
+++#, c-format
++ msgid "       TOS  := { NUMBER | inherit }\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:93
+++#, c-format
++ msgid "       TTL  := { 1..255 | inherit }\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:94
+++#, c-format
++ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:332
+++#, c-format
++ msgid "Keys are not allowed with ipip and sit.\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:352
+++#, c-format
++ msgid "Broadcast tunnel requires a source address.\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:367
+++#, c-format
++ msgid "ttl != 0 and noptmudisc are incompatible\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:379
+++#, c-format
++ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
++ msgstr ""
++ 
++@@ -1128,22 +1316,27 @@ msgid "unknown"
++ msgstr ""
++ 
++ #: ../iptunnel.c:453
+++#, c-format
++ msgid "  Drop packets out of sequence.\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:455
+++#, c-format
++ msgid "  Checksum in received packet is required.\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:457
+++#, c-format
++ msgid "  Sequence packets on output.\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:459
+++#, c-format
++ msgid "  Checksum output packets.\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:487
+++#, c-format
++ msgid "Wrong format of /proc/net/dev. Sorry.\n"
++ msgstr ""
++ 
++@@ -1153,10 +1346,12 @@ msgid "Failed to get type of [%s]\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:516
+++#, c-format
++ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
++ msgstr ""
++ 
++ #: ../iptunnel.c:519
+++#, c-format
++ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
++ msgstr ""
++ 
++@@ -1563,12 +1758,12 @@ msgstr ""
++ 
++ #: ../statistics.c:178
++ #, c-format
++-msgid "%u packets directly received from backlog"
+++msgid "%u of bytes directly received from backlog"
++ msgstr ""
++ 
++ #: ../statistics.c:180
++ #, c-format
++-msgid "%u packets directly received from prequeue"
+++msgid "%u of bytes directly received from prequeue"
++ msgstr ""
++ 
++ #: ../statistics.c:182
++@@ -1578,7 +1773,7 @@ msgstr ""
++ 
++ #: ../statistics.c:183
++ #, c-format
++-msgid "%u packets header predicted"
+++msgid "%u packet headers predicted"
++ msgstr ""
++ 
++ #: ../statistics.c:184
++@@ -1591,19 +1786,209 @@ msgstr ""
++ msgid "Ran %u times out of system memory during packet sending"
++ msgstr ""
++ 
++-#: ../statistics.c:253
+++#: ../statistics.c:188
+++#, c-format
+++msgid "%u acknowledgments not containing data received"
+++msgstr ""
+++
+++#: ../statistics.c:189
+++#, c-format
+++msgid "%u predicted acknowledgments"
+++msgstr ""
+++
+++#: ../statistics.c:190
+++#, c-format
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:191
+++#, c-format
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr ""
+++
+++#: ../statistics.c:192
+++#, c-format
+++msgid "%u bad SACKs received"
+++msgstr ""
+++
+++#: ../statistics.c:193
+++#, c-format
+++msgid "Detected reordering %u times using FACK"
+++msgstr ""
+++
+++#: ../statistics.c:194
+++#, c-format
+++msgid "Detected reordering %u times using SACK"
+++msgstr ""
+++
+++#: ../statistics.c:195
+++#, c-format
+++msgid "Detected reordering %u times using time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:196
+++#, c-format
+++msgid "Detected reordering %u times using reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:197
+++#, c-format
+++msgid "%u congestion windows fully recovered"
+++msgstr ""
+++
+++#: ../statistics.c:198
+++#, c-format
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
+++msgstr ""
+++
+++#: ../statistics.c:199
+++#, c-format
+++msgid "%u congestion window recovered using DSACK"
+++msgstr ""
+++
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr ""
+++
+++#: ../statistics.c:201
+++#, c-format
+++msgid "%u retransmits lost"
+++msgstr ""
+++
+++#: ../statistics.c:202
+++#, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr ""
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr ""
+++
+++#: ../statistics.c:205
+++#, c-format
+++msgid "%u fast retransmits"
+++msgstr ""
+++
+++#: ../statistics.c:206
+++#, c-format
+++msgid "%u forward retransmits"
+++msgstr ""
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr ""
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr ""
+++
+++#: ../statistics.c:209
+++#, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr ""
+++
+++#: ../statistics.c:210
+++#, c-format
+++msgid "%u sack retransmits failed"
+++msgstr ""
+++
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr ""
+++
+++#: ../statistics.c:212
+++#, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr ""
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr ""
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr ""
+++
+++#: ../statistics.c:215
+++#, c-format
+++msgid "%u DSACKs received"
+++msgstr ""
+++
+++#: ../statistics.c:216
+++#, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr ""
+++
+++#: ../statistics.c:217
+++#, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr ""
+++
+++#: ../statistics.c:218
+++#, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr ""
+++
+++#: ../statistics.c:219
+++#, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr ""
+++
+++#: ../statistics.c:220
+++#, c-format
+++msgid "%u connections aborted due to memory pressure"
+++msgstr ""
+++
+++#: ../statistics.c:221
+++#, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr ""
+++
+++#: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr ""
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr ""
+++
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr ""
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr ""
+++
+++#: ../statistics.c:292
++ msgid "enabled"
++ msgstr ""
++ 
++-#: ../statistics.c:253
+++#: ../statistics.c:292
++ msgid "disabled"
++ msgstr ""
++ 
++-#: ../statistics.c:336
+++#: ../statistics.c:375
++ msgid "error parsing /proc/net/snmp"
++ msgstr ""
++ 
++-#: ../statistics.c:349
+++#: ../statistics.c:388
++ msgid "cannot open /proc/net/snmp"
++ msgstr ""
++ 
++@@ -1617,7 +2002,7 @@ msgstr ""
++ msgid "Cannot change line discipline to `%s'.\n"
++ msgstr ""
++ 
++-#: ../lib/af.c:153 ../lib/hw.c:156
+++#: ../lib/af.c:153 ../lib/hw.c:161
++ msgid "UNSPEC"
++ msgstr ""
++ 
++@@ -1633,11 +2018,11 @@ msgstr ""
++ msgid "IPv6"
++ msgstr ""
++ 
++-#: ../lib/af.c:164 ../lib/hw.c:177
+++#: ../lib/af.c:164 ../lib/hw.c:182
++ msgid "AMPR AX.25"
++ msgstr ""
++ 
++-#: ../lib/af.c:167 ../lib/hw.c:183
+++#: ../lib/af.c:167 ../lib/hw.c:188
++ msgid "AMPR NET/ROM"
++ msgstr ""
++ 
++@@ -1649,7 +2034,7 @@ msgstr ""
++ msgid "Appletalk DDP"
++ msgstr ""
++ 
++-#: ../lib/af.c:176 ../lib/hw.c:218
+++#: ../lib/af.c:176 ../lib/hw.c:223
++ msgid "Econet"
++ msgstr ""
++ 
++@@ -1657,19 +2042,21 @@ msgstr ""
++ msgid "CCITT X.25"
++ msgstr ""
++ 
++-#: ../lib/af.c:182 ../lib/hw.c:180
+++#: ../lib/af.c:182 ../lib/hw.c:185
++ msgid "AMPR ROSE"
++ msgstr ""
++ 
++-#: ../lib/af.c:185 ../lib/hw.c:168
+++#: ../lib/af.c:185 ../lib/hw.c:173
++ msgid "Ash"
++ msgstr ""
++ 
++ #: ../lib/af.c:243
+++#, c-format
++ msgid "Please don't supply more than one address family.\n"
++ msgstr ""
++ 
++ #: ../lib/af.c:304
+++#, c-format
++ msgid "Too much address family arguments.\n"
++ msgstr ""
++ 
++@@ -1694,6 +2081,7 @@ msgid "in_arcnet(%s): trailing junk!\n"
++ msgstr ""
++ 
++ #: ../lib/ash.c:81
+++#, c-format
++ msgid "Malformed Ash address"
++ msgstr ""
++ 
++@@ -1712,22 +2100,21 @@ msgid "Callsign too long"
++ msgstr ""
++ 
++ #: ../lib/ax25_gr.c:47
+++#, c-format
++ msgid "AX.25 not configured in this system.\n"
++ msgstr ""
++ 
++ #: ../lib/ax25_gr.c:50
+++#, c-format
++ msgid "Kernel AX.25 routing table\n"
++ msgstr ""
++ 
++ #. xxx
++ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
++ msgid "Destination  Iface    Use\n"
++ msgstr ""
++ 
++-#: ../lib/ddp_gr.c:21
++-msgid "Routing table for `ddp' not yet supported.\n"
++-msgstr ""
++-
++ #: ../lib/ether.c:74 ../lib/ether.c:91
++ #, c-format
++ msgid "in_ether(%s): invalid ether address!\n"
++@@ -1783,90 +2170,94 @@ msgstr ""
++ msgid "in_hippi(%s): trailing junk!\n"
++ msgstr ""
++ 
++-#: ../lib/hw.c:155
+++#: ../lib/hw.c:160
++ msgid "Local Loopback"
++ msgstr ""
++ 
++-#: ../lib/hw.c:158
+++#: ../lib/hw.c:163
++ msgid "Serial Line IP"
++ msgstr ""
++ 
++-#: ../lib/hw.c:159
+++#: ../lib/hw.c:164
++ msgid "VJ Serial Line IP"
++ msgstr ""
++ 
++-#: ../lib/hw.c:160
+++#: ../lib/hw.c:165
++ msgid "6-bit Serial Line IP"
++ msgstr ""
++ 
++-#: ../lib/hw.c:161
+++#: ../lib/hw.c:166
++ msgid "VJ 6-bit Serial Line IP"
++ msgstr ""
++ 
++-#: ../lib/hw.c:162
+++#: ../lib/hw.c:167
++ msgid "Adaptive Serial Line IP"
++ msgstr ""
++ 
++-#: ../lib/hw.c:165
+++#: ../lib/hw.c:170
++ msgid "Ethernet"
++ msgstr ""
++ 
++-#: ../lib/hw.c:171
+++#: ../lib/hw.c:176
++ msgid "Fiber Distributed Data Interface"
++ msgstr ""
++ 
++-#: ../lib/hw.c:174
+++#: ../lib/hw.c:179
++ msgid "HIPPI"
++ msgstr ""
++ 
++-#: ../lib/hw.c:186
+++#: ../lib/hw.c:191
++ msgid "generic X.25"
++ msgstr ""
++ 
++-#: ../lib/hw.c:189
+++#: ../lib/hw.c:194
++ msgid "IPIP Tunnel"
++ msgstr ""
++ 
++-#: ../lib/hw.c:192
+++#: ../lib/hw.c:197
++ msgid "Point-to-Point Protocol"
++ msgstr ""
++ 
++-#: ../lib/hw.c:195
+++#: ../lib/hw.c:200
++ msgid "(Cisco)-HDLC"
++ msgstr ""
++ 
++-#: ../lib/hw.c:196
+++#: ../lib/hw.c:201
++ msgid "LAPB"
++ msgstr ""
++ 
++-#: ../lib/hw.c:199
+++#: ../lib/hw.c:204
++ msgid "ARCnet"
++ msgstr ""
++ 
++-#: ../lib/hw.c:202
+++#: ../lib/hw.c:207
++ msgid "Frame Relay DLCI"
++ msgstr ""
++ 
++-#: ../lib/hw.c:203
+++#: ../lib/hw.c:208
++ msgid "Frame Relay Access Device"
++ msgstr ""
++ 
++-#: ../lib/hw.c:206
+++#: ../lib/hw.c:211
++ msgid "IPv6-in-IPv4"
++ msgstr ""
++ 
++-#: ../lib/hw.c:209
+++#: ../lib/hw.c:214
++ msgid "IrLAP"
++ msgstr ""
++ 
++-#: ../lib/hw.c:212
+++#: ../lib/hw.c:217
++ msgid "16/4 Mbps Token Ring"
++ msgstr ""
++ 
++-#: ../lib/hw.c:214
+++#: ../lib/hw.c:219
++ msgid "16/4 Mbps Token Ring (New)"
++ msgstr ""
++ 
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr ""
+++
++ #: ../lib/inet.c:153 ../lib/inet6.c:79
++ #, c-format
++ msgid "rresolve: unsupport address family %d !\n"
++@@ -1877,131 +2268,157 @@ msgid "[UNKNOWN]"
++ msgstr ""
++ 
++ #: ../lib/inet6_gr.c:71
+++#, c-format
++ msgid "INET6 (IPv6) not configured in this system.\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_gr.c:74
+++#, c-format
++ msgid "Kernel IPv6 routing table\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_gr.c:76
+++#, c-format
++ msgid ""
++-"Destination                                 Next Hop                         "
++-"       Flags Metric Ref    Use Iface\n"
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_gr.c:150
+++#, c-format
++ msgid "Kernel IPv6 Neighbour Cache\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_gr.c:153
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_gr.c:157
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State            Stale(sec) Delete(sec)\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_sr.c:46
+++#, c-format
++ msgid "Usage: inet6_route [-vF] del Target\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_sr.c:47
+++#, c-format
++ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_sr.c:48
+++#, c-format
++ msgid "       inet6_route [-FC] flush      NOT supported\n"
++ msgstr ""
++ 
++ #: ../lib/inet6_sr.c:188
+++#, c-format
++ msgid "Flushing `inet6' routing table not supported\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
++ msgid "INET (IPv4) not configured in this system.\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:53
+++#, c-format
++ msgid "Kernel IP routing table\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:56
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:59
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
++ "Iface\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:62
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:237
+++#, c-format
++ msgid "Kernel IP routing cache\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:258
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:261
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags   MSS Window  irtt "
++ "Iface\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:266
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  HH  Arp\n"
++ msgstr ""
++ 
++ #: ../lib/inet_gr.c:290
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++ msgstr ""
++ 
++-#: ../lib/inet_sr.c:50
+++#: ../lib/inet_sr.c:51
+++#, c-format
++ msgid ""
++ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++ msgstr ""
++ 
++-#: ../lib/inet_sr.c:51
+++#: ../lib/inet_sr.c:52
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
++ msgstr ""
++ 
++-#: ../lib/inet_sr.c:52
+++#: ../lib/inet_sr.c:53
+++#, c-format
++ msgid ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ msgstr ""
++ 
++-#: ../lib/inet_sr.c:53
+++#: ../lib/inet_sr.c:54
+++#, c-format
++ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ msgstr ""
++ 
++-#: ../lib/inet_sr.c:54
+++#: ../lib/inet_sr.c:55
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
++ msgstr ""
++ 
++-#: ../lib/inet_sr.c:55
+++#: ../lib/inet_sr.c:56
+++#, c-format
++ msgid "       inet_route [-FC] flush      NOT supported\n"
++ msgstr ""
++ 
++@@ -2011,14 +2428,17 @@ msgid "route: %s: cannot use a NETWORK a
++ msgstr ""
++ 
++ #: ../lib/inet_sr.c:174
+++#, c-format
++ msgid "route: Invalid MSS/MTU.\n"
++ msgstr ""
++ 
++ #: ../lib/inet_sr.c:187
+++#, c-format
++ msgid "route: Invalid window.\n"
++ msgstr ""
++ 
++ #: ../lib/inet_sr.c:203
+++#, c-format
++ msgid "route: Invalid initial rtt.\n"
++ msgstr ""
++ 
++@@ -2033,73 +2453,90 @@ msgid "route: bogus netmask %s\n"
++ msgstr ""
++ 
++ #: ../lib/inet_sr.c:270
+++#, c-format
++ msgid "route: netmask doesn't match route address\n"
++ msgstr ""
++ 
++ #: ../lib/inet_sr.c:306
+++#, c-format
++ msgid "Flushing `inet' routing table not supported\n"
++ msgstr ""
++ 
++ #: ../lib/inet_sr.c:310
+++#, c-format
++ msgid "Modifying `inet' routing cache not supported\n"
++ msgstr ""
++ 
++ #: ../lib/ipx_gr.c:52
+++#, c-format
++ msgid "IPX not configured in this system.\n"
++ msgstr ""
++ 
++ #: ../lib/ipx_gr.c:56
+++#, c-format
++ msgid "Kernel IPX routing table\n"
++ msgstr ""
++ 
++ #. xxx
++ #: ../lib/ipx_gr.c:57
+++#, c-format
++ msgid "Destination               Router Net                Router Node\n"
++ msgstr ""
++ 
++ #: ../lib/ipx_sr.c:33
+++#, c-format
++ msgid "IPX: this needs to be written\n"
++ msgstr ""
++ 
++ #: ../lib/masq_info.c:198
+++#, c-format
++ msgid "IP masquerading entries\n"
++ msgstr ""
++ 
++ #: ../lib/masq_info.c:201
+++#, c-format
++ msgid "prot   expire source               destination          ports\n"
++ msgstr ""
++ 
++ #: ../lib/masq_info.c:204
+++#, c-format
++ msgid ""
++-"prot   expire    initseq delta prevd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
++ msgstr ""
++ 
++ #: ../lib/netrom_gr.c:48
+++#, c-format
++ msgid "NET/ROM not configured in this system.\n"
++ msgstr ""
++ 
++ #: ../lib/netrom_gr.c:51
+++#, c-format
++ msgid "Kernel NET/ROM routing table\n"
++ msgstr ""
++ 
++ #: ../lib/netrom_gr.c:52
+++#, c-format
++ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
++ msgstr ""
++ 
++ #: ../lib/netrom_sr.c:34
+++#, c-format
++ msgid "netrom usage\n"
++ msgstr ""
++ 
++ #: ../lib/netrom_sr.c:44
+++#, c-format
++ msgid "NET/ROM: this needs to be written\n"
++ msgstr ""
++ 
++ #: ../lib/ppp.c:44
+++#, c-format
++ msgid "You cannot start PPP with this program.\n"
++ msgstr ""
++ 
++ #: ../lib/ppp_ac.c:38
+++#, c-format
++ msgid "Sorry, use pppd!\n"
++ msgstr ""
++ 
++@@ -2108,287 +2545,314 @@ msgid "Node address must be ten digits"
++ msgstr ""
++ 
++ #: ../lib/rose_gr.c:51
+++#, c-format
++ msgid "ROSE not configured in this system.\n"
++ msgstr ""
++ 
++ #: ../lib/rose_gr.c:54
+++#, c-format
++ msgid "Kernel ROSE routing table\n"
++ msgstr ""
++ 
++-#: ../lib/tr.c:70 ../lib/tr.c:85
+++#: ../lib/tr.c:86 ../lib/tr.c:101
++ #, c-format
++ msgid "in_tr(%s): invalid token ring address!\n"
++ msgstr ""
++ 
++-#: ../lib/tr.c:97
+++#: ../lib/tr.c:113
++ #, c-format
++ msgid "in_tr(%s): trailing : ignored!\n"
++ msgstr ""
++ 
++-#: ../lib/tr.c:109
+++#: ../lib/tr.c:125
++ #, c-format
++ msgid "in_tr(%s): trailing junk!\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:164
+++#: ../lib/interface.c:176
++ #, c-format
++ msgid "warning: no inet socket available: %s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:316
+++#: ../lib/interface.c:325
++ #, c-format
++ msgid "Warning: cannot open %s (%s). Limited output.\n"
++ msgstr ""
++ 
++ #. Give better error message for this case.
++-#: ../lib/interface.c:556
+++#: ../lib/interface.c:571
++ msgid "Device not found"
++ msgstr ""
++ 
++-#: ../lib/interface.c:560
+++#: ../lib/interface.c:575
++ #, c-format
++ msgid "%s: error fetching interface information: %s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:593
+++#: ../lib/interface.c:608
++ msgid "     - no statistics available -"
++ msgstr ""
++ 
++-#: ../lib/interface.c:597
+++#: ../lib/interface.c:612
+++#, c-format
++ msgid "[NO FLAGS]"
++ msgstr ""
++ 
++-#: ../lib/interface.c:673
+++#: ../lib/interface.c:688
++ #, c-format
++ msgid "%-9.9s Link encap:%s  "
++ msgstr ""
++ 
++-#: ../lib/interface.c:678
+++#: ../lib/interface.c:693
++ #, c-format
++ msgid "HWaddr %s  "
++ msgstr ""
++ 
++-#: ../lib/interface.c:681
+++#: ../lib/interface.c:696
++ #, c-format
++ msgid "Media:%s"
++ msgstr ""
++ 
++-#: ../lib/interface.c:683
+++#: ../lib/interface.c:698
+++#, c-format
++ msgid "(auto)"
++ msgstr ""
++ 
++-#: ../lib/interface.c:690
+++#: ../lib/interface.c:705
++ #, c-format
++ msgid "          %s addr:%s "
++ msgstr ""
++ 
++-#: ../lib/interface.c:693
+++#: ../lib/interface.c:708
++ #, c-format
++ msgid " P-t-P:%s "
++ msgstr ""
++ 
++-#: ../lib/interface.c:696
+++#: ../lib/interface.c:711
++ #, c-format
++ msgid " Bcast:%s "
++ msgstr ""
++ 
++-#: ../lib/interface.c:698
+++#: ../lib/interface.c:713
++ #, c-format
++ msgid " Mask:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:715
+++#: ../lib/interface.c:730
++ #, c-format
++ msgid "          inet6 addr: %s/%d"
++ msgstr ""
++ 
++-#: ../lib/interface.c:717
+++#: ../lib/interface.c:732
+++#, c-format
++ msgid " Scope:"
++ msgstr ""
++ 
++-#: ../lib/interface.c:720
+++#: ../lib/interface.c:735
+++#, c-format
++ msgid "Global"
++ msgstr ""
++ 
++-#: ../lib/interface.c:723
+++#: ../lib/interface.c:738
+++#, c-format
++ msgid "Link"
++ msgstr ""
++ 
++-#: ../lib/interface.c:726
+++#: ../lib/interface.c:741
+++#, c-format
++ msgid "Site"
++ msgstr ""
++ 
++-#: ../lib/interface.c:729
+++#: ../lib/interface.c:744
+++#, c-format
++ msgid "Compat"
++ msgstr ""
++ 
++-#: ../lib/interface.c:732
+++#: ../lib/interface.c:747
+++#, c-format
++ msgid "Host"
++ msgstr ""
++ 
++-#: ../lib/interface.c:735
+++#: ../lib/interface.c:750
+++#, c-format
++ msgid "Unknown"
++ msgstr ""
++ 
++-#: ../lib/interface.c:750
+++#: ../lib/interface.c:765
++ #, c-format
++ msgid "          IPX/Ethernet II addr:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:753
+++#: ../lib/interface.c:768
++ #, c-format
++ msgid "          IPX/Ethernet SNAP addr:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:756
+++#: ../lib/interface.c:771
++ #, c-format
++ msgid "          IPX/Ethernet 802.2 addr:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:759
+++#: ../lib/interface.c:774
++ #, c-format
++ msgid "          IPX/Ethernet 802.3 addr:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:769
+++#: ../lib/interface.c:784
++ #, c-format
++ msgid "          EtherTalk Phase 2 addr:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:778
+++#: ../lib/interface.c:793
++ #, c-format
++ msgid "          econet addr:%s\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:785
+++#: ../lib/interface.c:800
+++#, c-format
++ msgid "[NO FLAGS] "
++ msgstr ""
++ 
++-#: ../lib/interface.c:787
+++#: ../lib/interface.c:802
+++#, c-format
++ msgid "UP "
++ msgstr ""
++ 
++-#: ../lib/interface.c:789
+++#: ../lib/interface.c:804
+++#, c-format
++ msgid "BROADCAST "
++ msgstr ""
++ 
++-#: ../lib/interface.c:791
+++#: ../lib/interface.c:806
+++#, c-format
++ msgid "DEBUG "
++ msgstr ""
++ 
++-#: ../lib/interface.c:793
+++#: ../lib/interface.c:808
+++#, c-format
++ msgid "LOOPBACK "
++ msgstr ""
++ 
++-#: ../lib/interface.c:795
+++#: ../lib/interface.c:810
+++#, c-format
++ msgid "POINTOPOINT "
++ msgstr ""
++ 
++-#: ../lib/interface.c:797
+++#: ../lib/interface.c:812
+++#, c-format
++ msgid "NOTRAILERS "
++ msgstr ""
++ 
++-#: ../lib/interface.c:799
+++#: ../lib/interface.c:814
+++#, c-format
++ msgid "RUNNING "
++ msgstr ""
++ 
++-#: ../lib/interface.c:801
+++#: ../lib/interface.c:816
+++#, c-format
++ msgid "NOARP "
++ msgstr ""
++ 
++-#: ../lib/interface.c:803
+++#: ../lib/interface.c:818
+++#, c-format
++ msgid "PROMISC "
++ msgstr ""
++ 
++-#: ../lib/interface.c:805
+++#: ../lib/interface.c:820
+++#, c-format
++ msgid "ALLMULTI "
++ msgstr ""
++ 
++-#: ../lib/interface.c:807
+++#: ../lib/interface.c:822
+++#, c-format
++ msgid "SLAVE "
++ msgstr ""
++ 
++-#: ../lib/interface.c:809
+++#: ../lib/interface.c:824
+++#, c-format
++ msgid "MASTER "
++ msgstr ""
++ 
++-#: ../lib/interface.c:811
+++#: ../lib/interface.c:826
+++#, c-format
++ msgid "MULTICAST "
++ msgstr ""
++ 
++-#: ../lib/interface.c:814
+++#: ../lib/interface.c:829
+++#, c-format
++ msgid "DYNAMIC "
++ msgstr ""
++ 
++ #. DONT FORGET TO ADD THE FLAGS IN ife_print_short
++-#: ../lib/interface.c:817
+++#: ../lib/interface.c:832
++ #, c-format
++ msgid " MTU:%d  Metric:%d"
++ msgstr ""
++ 
++-#: ../lib/interface.c:821
+++#: ../lib/interface.c:836
++ #, c-format
++ msgid "  Outfill:%d  Keepalive:%d"
++ msgstr ""
++ 
++-#: ../lib/interface.c:835
+++#: ../lib/interface.c:850
++ #, c-format
++ msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:840
+++#: ../lib/interface.c:855
++ #, c-format
++ msgid "             compressed:%lu\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:852
+++#: ../lib/interface.c:895
++ #, c-format
++ msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:856
+++#: ../lib/interface.c:899
++ #, c-format
++ msgid "          collisions:%lu "
++ msgstr ""
++ 
++-#: ../lib/interface.c:858
+++#: ../lib/interface.c:901
++ #, c-format
++ msgid "compressed:%lu "
++ msgstr ""
++ 
++-#: ../lib/interface.c:860
+++#: ../lib/interface.c:903
++ #, c-format
++ msgid "txqueuelen:%d "
++ msgstr ""
++ 
++-#: ../lib/interface.c:862
+++#: ../lib/interface.c:905
++ #, c-format
++ msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
++ msgstr ""
++ 
++-#: ../lib/interface.c:873
+++#: ../lib/interface.c:916
++ #, c-format
++ msgid "Interrupt:%d "
++ msgstr ""
++ 
++ #. Only print devices using it for
++ #. I/O maps
++-#: ../lib/interface.c:876
+++#: ../lib/interface.c:919
++ #, c-format
++ msgid "Base address:0x%x "
++ msgstr ""
++ 
++-#: ../lib/interface.c:878
+++#: ../lib/interface.c:921
++ #, c-format
++ msgid "Memory:%lx-%lx "
++ msgstr ""
++ 
++-#: ../lib/interface.c:881
+++#: ../lib/interface.c:924
++ #, c-format
++ msgid "DMA chan:%x "
++ msgstr ""
++ 
++ #: ../lib/sockets.c:63
+++#, c-format
++ msgid "No usable address families found.\n"
++ msgstr ""
++ 
++@@ -2413,14 +2877,17 @@ msgid "ip: argument is wrong: %s\n"
++ msgstr ""
++ 
++ #: ../ipmaddr.c:61
+++#, c-format
++ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
++ msgstr ""
++ 
++ #: ../ipmaddr.c:62
+++#, c-format
++ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ msgstr ""
++ 
++ #: ../ipmaddr.c:63
+++#, c-format
++ msgid "       ipmaddr -V | -version\n"
++ msgstr ""
++ 
++@@ -2449,6 +2916,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
++ msgstr ""
++ 
++ #: ../slattach.c:192
+++#, c-format
++ msgid "slattach: cannot write PID file\n"
++ msgstr ""
++ 
++@@ -2468,18 +2936,22 @@ msgid "slattach: tty_hangup(RAISE): %s\n
++ msgstr ""
++ 
++ #: ../slattach.c:468
+++#, c-format
++ msgid "slattach: tty name too long\n"
++ msgstr ""
++ 
++ #: ../slattach.c:498
+++#, c-format
++ msgid "slattach: tty_open: cannot get current state!\n"
++ msgstr ""
++ 
++ #: ../slattach.c:505
+++#, c-format
++ msgid "slattach: tty_open: cannot get current line disc!\n"
++ msgstr ""
++ 
++ #: ../slattach.c:513
+++#, c-format
++ msgid "slattach: tty_open: cannot set RAW mode!\n"
++ msgstr ""
++ 
++@@ -2489,6 +2961,7 @@ msgid "slattach: tty_open: cannot set %s
++ msgstr ""
++ 
++ #: ../slattach.c:530
+++#, c-format
++ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
++ msgstr ""
++ 
++Index: net-tools/po/et_EE.po
++===================================================================
++--- net-tools.orig/po/et_EE.po
+++++ net-tools/po/et_EE.po
++@@ -6,7 +6,8 @@
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: net-tools 1.58\n"
++-"POT-Creation-Date: 2001-02-15 21:28+0200\n"
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
++ "PO-Revision-Date: 2001-02-15 18:00+0300\n"
++ "Last-Translator: Meelis Roos <mroos@linux.ee>\n"
++ "Language-Team: Estonian <linux-ee@eenet.ee>\n"
++@@ -14,53 +15,58 @@ msgstr ""
++ "Content-Type: text/plain; charset=iso-8859-15\n"
++ "Content-Transfer-Encoding: 8bit\n"
++ 
++-#: ../arp.c:110 ../arp.c:269
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
++ msgid "arp: need host name\n"
++ msgstr "arp: puudub hosti nimi\n"
++ 
++-#: ../arp.c:207 ../arp.c:221
+++#: ../arp.c:215 ../arp.c:230
++ #, c-format
++ msgid "No ARP entry for %s\n"
++ msgstr "%s jaoks pole ARP kirjet\n"
++ 
++-#: ../arp.c:239
+++#: ../arp.c:248
++ #, c-format
++ msgid "arp: cant get HW-Address for `%s': %s.\n"
++ msgstr "arp: ei saa riistvaralist aadressi `%s' jaoks: %s\n"
++ 
++-#: ../arp.c:243
+++#: ../arp.c:252
+++#, c-format
++ msgid "arp: protocol type mismatch.\n"
++ msgstr "arp: vale protokolli tüüp\n"
++ 
++-#: ../arp.c:252
+++#: ../arp.c:261
++ #, c-format
++ msgid "arp: device `%s' has HW address %s `%s'.\n"
++ msgstr "arp: seadmel `%s' on riistvaraline aadress %s `%s'\n"
++ 
++-#: ../arp.c:282
+++#: ../arp.c:293
+++#, c-format
++ msgid "arp: need hardware address\n"
++ msgstr "arp: puudub riistvaraline aadress\n"
++ 
++-#: ../arp.c:290
+++#: ../arp.c:301
+++#, c-format
++ msgid "arp: invalid hardware address\n"
++ msgstr "arp: vigane riistvaraline aadress\n"
++ 
++-#: ../arp.c:387
+++#: ../arp.c:398
++ #, c-format
++ msgid "arp: cannot open etherfile %s !\n"
++ msgstr "arp: ei saa avada faili %s\n"
++ 
++-#: ../arp.c:403
+++#: ../arp.c:414
++ #, c-format
++ msgid "arp: format error on line %u of etherfile %s !\n"
++ msgstr "arp: formaadiviga real %u failis %s\n"
++ 
++-#: ../arp.c:416
+++#: ../arp.c:427
++ #, c-format
++ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
++ msgstr "arp: ei saa kehtestada ARP kirjet real %u failis %s\n"
++ 
++-#: ../arp.c:437
+++#: ../arp.c:448
+++#, c-format
++ msgid ""
++ "Address                  HWtype  HWaddress           Flags Mask            "
++ "Iface\n"
++@@ -68,45 +74,52 @@ msgstr ""
++ "Aadress                  HWtüüp  HWaadress           Lipud Mask            "
++ "Liides\n"
++ 
++-#: ../arp.c:467
+++#: ../arp.c:476
+++#, fuzzy
+++msgid "<from_interface>"
+++msgstr " liides %s\n"
+++
+++#: ../arp.c:478
++ msgid "(incomplete)"
++ msgstr "(mittetäielik)"
++ 
++-#: ../arp.c:484
+++#: ../arp.c:495
++ #, c-format
++ msgid "%s (%s) at "
++ msgstr "%s (%s) aadressil "
++ 
++-#: ../arp.c:490
+++#: ../arp.c:501
+++#, c-format
++ msgid "<incomplete> "
++ msgstr "<mittetäielik>"
++ 
++-#: ../arp.c:496
+++#: ../arp.c:507
++ #, c-format
++ msgid "netmask %s "
++ msgstr "võrgumask %s "
++ 
++-#: ../arp.c:513
+++#: ../arp.c:524
++ #, c-format
++ msgid "on %s\n"
++ msgstr "liides %s\n"
++ 
++-#: ../arp.c:592
+++#: ../arp.c:605
++ #, c-format
++ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
++ msgstr "ARP kirjeid kokku: %s\tignoreerisin: %d\tleidsin: %d\n"
++ 
++-#: ../arp.c:596
+++#: ../arp.c:609
++ #, c-format
++ msgid "%s (%s) -- no entry\n"
++ msgstr "%s (%s) -- pole kirjet\n"
++ 
++-#: ../arp.c:598
+++#: ../arp.c:611
++ #, c-format
++ msgid "arp: in %d entries no match found.\n"
++ msgstr "arp: ei leidnud %d kirje hulgast sobivat\n"
++ 
++-#: ../arp.c:613
+++#: ../arp.c:626
+++#, c-format
++ msgid ""
++ "Usage:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
++@@ -116,47 +129,45 @@ msgstr ""
++ "ARP cache vaatamine:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hosti nimi>]\n"
++ 
++-#: ../arp.c:614
+++#: ../arp.c:627
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
++ "entry\n"
++ msgstr ""
++ "ARP kirje kustutamine:\n"
++ "  arp [-v]          [-i <if>] -d  <hosti nimi> [pub] [nopub]\n"
++ 
++-#: ../arp.c:615
+++#: ../arp.c:628
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
++ "file\n"
++ msgstr ""
++ "ARP kirjete lisamine failist:\n"
++ "  arp [-vnD] [<HW>] [-i <if>] -f  [<failinimi>]\n"
++ 
++-#: ../arp.c:616
+++#: ../arp.c:629
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
++ "entry\n"
++ msgstr ""
++ "ARP kirje lisamine:\n"
++ "  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [temp] [nopub]\n"
++ 
++-#: ../arp.c:617
++-msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
++-"<-''-\n"
++-msgstr ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [netmask <nm>] pub\n"
++-
++-#: ../arp.c:618
+++#: ../arp.c:630
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
++ "<-''-\n"
++ "\n"
++ msgstr ""
++ "  arp [-v]   [<HW>] [-i <if>] -Ds <hosti nimi> <if> [netmask <nm>] pub\n"
++ "\n"
++ 
++-#: ../arp.c:620
+++#: ../arp.c:632
+++#, c-format
++ msgid ""
++ "        -a                       display (all) hosts in alternative (BSD) "
++ "style\n"
++@@ -164,122 +175,132 @@ msgstr ""
++ "        -a                       näita kõiki hoste alternatiivsel (BSD) "
++ "kujul\n"
++ 
++-#: ../arp.c:621
+++#: ../arp.c:633
+++#, c-format
++ msgid "        -s, --set                set a new ARP entry\n"
++ msgstr "        -s, --set                uue ARP kirje seadmine\n"
++ 
++-#: ../arp.c:622
+++#: ../arp.c:634
+++#, c-format
++ msgid "        -d, --delete             delete a specified entry\n"
++ msgstr "        -d, --delete             määratud kirje kustutamine\n"
++ 
++-#: ../arp.c:623 ../netstat.c:1485 ../route.c:85
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
++ msgid "        -v, --verbose            be verbose\n"
++ msgstr "        -v, --verbose            jutukas väljund\n"
++ 
++-#: ../arp.c:624
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, c-format
++ msgid "        -n, --numeric            don't resolve names\n"
++ msgstr "        -n, --numeric            mitte lahendada nimesid\n"
++ 
++-#: ../arp.c:625
+++#: ../arp.c:637
+++#, c-format
++ msgid ""
++ "        -i, --device             specify network interface (e.g. eth0)\n"
++ msgstr ""
++ "        -i, --device             võrguliidese täpsustamine (näiteks eth0)\n"
++ 
++-#: ../arp.c:626
+++#: ../arp.c:638
+++#, c-format
++ msgid "        -D, --use-device         read <hwaddr> from given device\n"
++ msgstr "        -D, --use-device         lugeda <hwaddr> vastavalt liideselt\n"
++ 
++-#: ../arp.c:627
+++#: ../arp.c:639
+++#, c-format
++ msgid "        -A, -p, --protocol       specify protocol family\n"
++ msgstr "        -A, -p, --protocol       protokollipere määramine\n"
++ 
++-#: ../arp.c:628
+++#: ../arp.c:640
+++#, c-format
++ msgid ""
++-"        -f, --file               read new entries from file or from "
++-"/etc/ethers\n"
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
++ "\n"
++ msgstr ""
++-"        -f, --file               lugeda kirjed antud failist või "
++-"/etc/ethers'st\n"
+++"        -f, --file               lugeda kirjed antud failist või /etc/"
+++"ethers'st\n"
++ "\n"
++ 
++-#: ../arp.c:630 ../rarp.c:181
+++#: ../arp.c:642 ../rarp.c:182
++ #, c-format
++ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
++ msgstr ""
++ "  <HW>=kasutage '-H <hw>' riistvaralise aadressi määramiseks.\n"
++ "       Vaikimisi: %s\n"
++ 
++-#: ../arp.c:631 ../rarp.c:182
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
++ msgid "  List of possible hardware types (which support ARP):\n"
++ msgstr "  Võimalike ARP-i toetavate riistvara tüüpide nimekiri:\n"
++ 
++-#: ../arp.c:664 ../arp.c:749
+++#: ../arp.c:677 ../arp.c:762
++ #, c-format
++ msgid "%s: hardware type not supported!\n"
++ msgstr "arp: riistvara tüüpi %s ei toetata\n"
++ 
++-#: ../arp.c:668
+++#: ../arp.c:681
++ #, c-format
++ msgid "%s: address family not supported!\n"
++ msgstr "arp: aadressiperekonda %s ei toetata\n"
++ 
++-#: ../arp.c:703
+++#: ../arp.c:716
+++#, c-format
++ msgid "arp: -N not yet supported.\n"
++ msgstr "arp: -N toetust pole veel\n"
++ 
++-#: ../arp.c:713
+++#: ../arp.c:726
++ #, c-format
++ msgid "arp: %s: unknown address family.\n"
++ msgstr "arp: tundmatu aadressiperekond %s\n"
++ 
++-#: ../arp.c:722
+++#: ../arp.c:735
++ #, c-format
++ msgid "arp: %s: unknown hardware type.\n"
++ msgstr "arp: tundmatu riistvara tüüp %s\n"
++ 
++-#: ../arp.c:741
+++#: ../arp.c:754
++ #, c-format
++ msgid "arp: %s: kernel only supports 'inet'.\n"
++ msgstr "arp: tuumas on ainult 'inet' aadressiperekonna toetus\n"
++ 
++-#: ../arp.c:754
+++#: ../arp.c:767
++ #, c-format
++ msgid "arp: %s: hardware type without ARP support.\n"
++ msgstr "arp: riistvara tüübil %s pole ARP toetust\n"
++ 
++-#: ../hostname.c:69
+++#: ../hostname.c:71
++ #, c-format
++ msgid "Setting nodename to `%s'\n"
++ msgstr "Sean sõlme nimeks `%s'\n"
++ 
++-#: ../hostname.c:74
+++#: ../hostname.c:76
++ #, c-format
++ msgid "%s: you must be root to change the node name\n"
++ msgstr "%s: ainult root saab sõlme nime muuta\n"
++ 
++-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
++ #, c-format
++ msgid "%s: name too long\n"
++ msgstr "%s: nimi on liiga pikk\n"
++ 
++-#: ../hostname.c:89
+++#: ../hostname.c:91
++ #, c-format
++ msgid "Setting hostname to `%s'\n"
++ msgstr "Sean hosti nimeks `%s'\n"
++ 
++-#: ../hostname.c:94
+++#: ../hostname.c:96
++ #, c-format
++ msgid "%s: you must be root to change the host name\n"
++ msgstr "%s: ainult root saab hosti nime muuta\n"
++ 
++-#: ../hostname.c:108
+++#: ../hostname.c:109
++ #, c-format
++ msgid "Setting domainname to `%s'\n"
++ msgstr "Sean domeeni nimeks `%s'\n"
++ 
++-#: ../hostname.c:113
+++#: ../hostname.c:114
++ #, c-format
++ msgid "%s: you must be root to change the domain name\n"
++ msgstr "%s: ainult root saab domeeni nime muuta\n"
++@@ -304,25 +325,28 @@ msgstr "Tulemus: h_aliases=`%s'\n"
++ msgid "Result: h_addr_list=`%s'\n"
++ msgstr "Tulemus: h_addr_list=`%s'\n"
++ 
++-#: ../hostname.c:209
+++#: ../hostname.c:208
++ #, c-format
++ msgid "%s: can't open `%s'\n"
++ msgstr "%s: ei saa avada faili `%s'\n"
++ 
++-#: ../hostname.c:223
+++#: ../hostname.c:222
+++#, c-format
++ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
++ msgstr ""
++ "Kasutamine:\n"
++ "  hostname [-v] {hosti nimi|-F fail}         hosti nime seadmine (ka "
++ "failist)\n"
++ 
++-#: ../hostname.c:224
+++#: ../hostname.c:223
+++#, c-format
++ msgid ""
++ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
++ msgstr ""
++ "  domainname [-v] {nisdomeen|-F fail}        NIS domeeni nime seadmine\n"
++ 
++-#: ../hostname.c:226
+++#: ../hostname.c:225
+++#, c-format
++ msgid ""
++ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
++ "file)\n"
++@@ -330,18 +354,21 @@ msgstr ""
++ "  nodename [-v] {nodename|-F fail}           DECneti võrgusõlme nime "
++ "seadmine\n"
++ 
++-#: ../hostname.c:228
+++#: ../hostname.c:227
+++#, c-format
++ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
++ msgstr ""
++ "  hostname [-v] [-d|-f|-s|-a|-i|-y|-n]       nime näitamine antud formaadis\n"
++ 
++-#: ../hostname.c:229
+++#: ../hostname.c:228
+++#, c-format
++ msgid ""
++ "       hostname [-v]                         display hostname\n"
++ "\n"
++ msgstr "  hostname [-v]                              hosti nime näitamine\n"
++ 
++-#: ../hostname.c:230
+++#: ../hostname.c:229
+++#, c-format
++ msgid ""
++ "       hostname -V|--version|-h|--help       print info and exit\n"
++ "\n"
++@@ -350,7 +377,8 @@ msgstr ""
++ "  hostname -h|--help                         seesama abiinfo\n"
++ "\n"
++ 
++-#: ../hostname.c:231
+++#: ../hostname.c:230
+++#, c-format
++ msgid ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++@@ -358,36 +386,44 @@ msgstr ""
++ "  dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++ 
++-#: ../hostname.c:232
+++#: ../hostname.c:231
+++#, c-format
++ msgid "    -s, --short           short host name\n"
++ msgstr "    -s, --short           lühike hosti nimi\n"
++ 
++-#: ../hostname.c:233
+++#: ../hostname.c:232
+++#, c-format
++ msgid "    -a, --alias           alias names\n"
++ msgstr "     -a, --alias          alias-nimed\n"
++ 
++-#: ../hostname.c:234
+++#: ../hostname.c:233
+++#, c-format
++ msgid "    -i, --ip-address      addresses for the hostname\n"
++ msgstr "    -i, --ip-address      hosti IP aadressid\n"
++ 
++-#: ../hostname.c:235
+++#: ../hostname.c:234
+++#, c-format
++ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
++ msgstr ""
++ "    -f, --fqdn, --long    pikk hosti nimi (FQDN - täielik süsteeminimi)\n"
++ 
++-#: ../hostname.c:236
+++#: ../hostname.c:235
+++#, c-format
++ msgid "    -d, --domain          DNS domain name\n"
++ msgstr "    -d, --domain          DNS domeeni nimi\n"
++ 
++-#: ../hostname.c:237
+++#: ../hostname.c:236
+++#, c-format
++ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
++ msgstr "    -y, --yp, --nis       NIS/YP domeeni nimi\n"
++ 
++-#: ../hostname.c:239
+++#: ../hostname.c:238
+++#, c-format
++ msgid "    -n, --node            DECnet node name\n"
++ msgstr "    -n, --node            DECneti võrgusõlme nimi\n"
++ 
++-#: ../hostname.c:241
+++#: ../hostname.c:240
+++#, c-format
++ msgid ""
++ "    -F, --file            read hostname or NIS domainname from given file\n"
++ "\n"
++@@ -395,7 +431,8 @@ msgstr ""
++ "    -F, --file            lugeda hosti või NIS domeeni nimi failist\n"
++ "\n"
++ 
++-#: ../hostname.c:243
+++#: ../hostname.c:242
+++#, c-format
++ msgid ""
++ "   This command can read or set the hostname or the NIS domainname. You can\n"
++ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
++@@ -415,6 +452,7 @@ msgid "%s: You can't change the DNS doma
++ msgstr "%s: selle käsuga ei saa muuta DNS domeeni nime\n"
++ 
++ #: ../hostname.c:339
+++#, c-format
++ msgid ""
++ "\n"
++ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
++@@ -423,6 +461,7 @@ msgstr ""
++ "Kui Te EI kasuta bind'i ega NIS'i nimede lahendamiseks, saate DNS domeeni\n"
++ 
++ #: ../hostname.c:340
+++#, c-format
++ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
++ msgstr "(mis on täieliku nime osa) nime muuta failist /etc/hosts.\n"
++ 
++@@ -441,76 +480,97 @@ msgstr "getdomainname()=`%s'\n"
++ msgid "getnodename()=`%s'\n"
++ msgstr "getnodename()=`%s'\n"
++ 
++-#: ../ifconfig.c:110
+++#: ../ifconfig.c:107
+++#, c-format
++ msgid ""
++-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++ msgstr ""
++-"Liides  MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Liides  MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
++ "Lip\n"
++ 
++-#: ../ifconfig.c:132 ../ifconfig.c:164
++-#, c-format
++-msgid "%s: unknown interface: %s\n"
++-msgstr "ifconfig: tundmatu liides %s: %s\n"
+++#: ../ifconfig.c:129 ../ifconfig.c:161
+++#, fuzzy, c-format
+++msgid "%s: ERROR while getting interface flags: %s\n"
+++msgstr "%s: viga liidese info küsimisel: %s\n"
++ 
++-#: ../ifconfig.c:156 ../ifconfig.c:740 ../ifconfig.c:831 ../ifconfig.c:937
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
+++#, c-format
++ msgid "No support for INET on this system.\n"
++ msgstr "Antud süsteem ei toeta INET aadressiperekonda\n"
++ 
++-#: ../ifconfig.c:179
+++#: ../ifconfig.c:193
+++#, fuzzy, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr "%s: viga liidese info küsimisel: %s\n"
+++
+++#: ../ifconfig.c:202
+++#, fuzzy, c-format
++ msgid ""
++ "Usage:\n"
++-"  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
++ msgstr ""
++ "Kasutamine:\n"
++ "  ifconfig [-a] [-i] [-v] [-s] <liides> [[<AF>] <aadress>]\n"
++ 
++-#: ../ifconfig.c:181
+++#: ../ifconfig.c:204
+++#, c-format
++ msgid "  [add <address>[/<prefixlen>]]\n"
++ msgstr "  [add <aadress>[/<prefiksi pikkus>]]\n"
++ 
++-#: ../ifconfig.c:182
+++#: ../ifconfig.c:205
+++#, c-format
++ msgid "  [del <address>[/<prefixlen>]]\n"
++ msgstr "  [del <aadress>[/<prefiksi pikkus>]]\n"
++ 
++-#: ../ifconfig.c:183
+++#: ../ifconfig.c:206
+++#, c-format
++ msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
++ msgstr "  [[-]broadcast [<aadress>]]  [[-]pointopoint [<aadress>]]\n"
++ 
++-#: ../ifconfig.c:184
+++#: ../ifconfig.c:207
+++#, c-format
++ msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++ msgstr "  [netmask <aadress>]  [dstaddr <aadress>]  [tunnel <aadress>]\n"
++ 
++-#: ../ifconfig.c:187
+++#: ../ifconfig.c:210
+++#, c-format
++ msgid "  [outfill <NN>] [keepalive <NN>]\n"
++ msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++ 
++-#: ../ifconfig.c:189
+++#: ../ifconfig.c:212
+++#, c-format
++ msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
++ msgstr "  [hw <HW> <aadress>]  [metric <NN>]  [mtu <NN>]\n"
++ 
++-#: ../ifconfig.c:190
+++#: ../ifconfig.c:213
+++#, c-format
++ msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ 
++-#: ../ifconfig.c:191
+++#: ../ifconfig.c:214
+++#, c-format
++ msgid "  [multicast]  [[-]promisc]\n"
++ msgstr "  [multicast]  [[-]promisc]\n"
++ 
++-#: ../ifconfig.c:192
+++#: ../ifconfig.c:215
+++#, c-format
++ msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++ msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <tüüp>]\n"
++ 
++-#: ../ifconfig.c:194
+++#: ../ifconfig.c:217
+++#, c-format
++ msgid "  [txqueuelen <NN>]\n"
++ msgstr "  [txqueuelen <NN>]\n"
++ 
++-#: ../ifconfig.c:197
+++#: ../ifconfig.c:220
+++#, c-format
++ msgid "  [[-]dynamic]\n"
++ msgstr "  [[-]dynamic]\n"
++ 
++-#: ../ifconfig.c:199
+++#: ../ifconfig.c:222
+++#, c-format
++ msgid ""
++ "  [up|down] ...\n"
++ "\n"
++@@ -518,73 +578,134 @@ msgstr ""
++ "  [up|down] ...\n"
++ "\n"
++ 
++-#: ../ifconfig.c:201
+++#: ../ifconfig.c:224
+++#, c-format
++ msgid "  <HW>=Hardware Type.\n"
++ msgstr "  <HW>=riistvara tüüp\n"
++ 
++-#: ../ifconfig.c:202
+++#: ../ifconfig.c:225
+++#, c-format
++ msgid "  List of possible hardware types:\n"
++ msgstr "  Võimalike riistvara tüüpide nimekiri:\n"
++ 
++ #. 1 = ARPable
++-#: ../ifconfig.c:204
+++#: ../ifconfig.c:227
++ #, c-format
++ msgid "  <AF>=Address family. Default: %s\n"
++ msgstr "  <AF>=aadressiperekond, vaikimisi %s\n"
++ 
++-#: ../ifconfig.c:205
+++#: ../ifconfig.c:228
+++#, c-format
++ msgid "  List of possible address families:\n"
++ msgstr "  Võimalike aadressiperekondade nimekiri:\n"
++ 
++-#: ../ifconfig.c:361
+++#: ../ifconfig.c:303
+++#, c-format
+++msgid "ifconfig: option `%s' not recognised.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
+++msgid "ifconfig: `--help' gives usage information.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:380
+++#, c-format
++ msgid "Unknown media type.\n"
++ msgstr "Tundmatu meedia tüüp\n"
++ 
++-#: ../ifconfig.c:653
+++#: ../ifconfig.c:417
+++#, c-format
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:429
+++#, c-format
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:441
+++#, c-format
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:465
+++#, c-format
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:523
+++#, c-format
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:652
+++#, c-format
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr ""
+++
+++#: ../ifconfig.c:684
++ #, c-format
++ msgid "hw address type `%s' has no handler to set address. failed.\n"
++ msgstr ""
++ "riistvara aadressi tüübil `%s' pole käsitlejat aadressi seadmiseks - ebaõnn\n"
++ 
++-#: ../ifconfig.c:662
+++#: ../ifconfig.c:693
++ #, c-format
++ msgid "%s: invalid %s address.\n"
++ msgstr "%s: vigane %s aadress\n"
++ 
++-#: ../ifconfig.c:706 ../ifconfig.c:796 ../ifconfig.c:882
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
+++#, c-format
++ msgid "No support for INET6 on this system.\n"
++ msgstr "Antud süsteem ei toeta INET6 aadressiperekonda\n"
++ 
++-#: ../ifconfig.c:749 ../ifconfig.c:840
+++#: ../ifconfig.c:780 ../ifconfig.c:871
++ #, c-format
++ msgid "Interface %s not initialized\n"
++ msgstr "Liides %s pole initsialiseeritud\n"
++ 
++-#: ../ifconfig.c:761 ../ifconfig.c:851
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, c-format
++ msgid "Bad address.\n"
++ msgstr "Vigane aadress\n"
++ 
++-#: ../ifconfig.c:854
+++#: ../ifconfig.c:885
+++#, c-format
++ msgid "Address deletion not supported on this system.\n"
++ msgstr "Antud süsteem ei toeta aadresside kustutamist\n"
++ 
++-#: ../ifconfig.c:947
+++#: ../ifconfig.c:957
+++#, fuzzy, c-format
+++msgid "ifconfig: Cannot set address for this protocol family.\n"
+++msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n"
+++
+++#: ../ifconfig.c:983
+++#, c-format
++ msgid "No support for ECONET on this system.\n"
++ msgstr "Antud süsteem ei toeta ECONET aadressiperekonda\n"
++ 
++-#: ../ifconfig.c:955
+++#: ../ifconfig.c:991
++ #, c-format
++ msgid "Don't know how to set addresses for family %d.\n"
++ msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n"
++ 
++-#: ../netstat.c:429
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr ""
+++
+++#: ../netstat.c:434
++ #, c-format
++ msgid ""
++ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
++ msgstr ""
++ "(\"-p\" jaoks ei saanud infot lugeda: geteuid()=%d, aga vaja oleks root'u)\n"
++ 
++-#: ../netstat.c:433
+++#: ../netstat.c:438
+++#, c-format
++ msgid ""
++ "(Not all processes could be identified, non-owned process info\n"
++ " will not be shown, you would have to be root to see it all.)\n"
++@@ -592,210 +713,223 @@ msgstr ""
++ "(Mõnesid protsesse ei saanud identifitseerida, teiste kasutajate\n"
++ "info lugemiseks peab olema root)\n"
++ 
++-#: ../netstat.c:440 ../netstat.c:1171 ../netstat.c:1248
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
++ msgid "LISTENING"
++ msgstr "LISTENING"
++ 
++-#: ../netstat.c:441
+++#: ../netstat.c:446
++ msgid "CONN SENT"
++ msgstr "CONN SENT"
++ 
++-#: ../netstat.c:442 ../netstat.c:1250
+++#: ../netstat.c:447 ../netstat.c:1268
++ msgid "DISC SENT"
++ msgstr "DISC SENT"
++ 
++-#: ../netstat.c:443 ../netstat.c:510 ../netstat.c:889 ../netstat.c:1251
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
++ msgid "ESTABLISHED"
++ msgstr "ESTABLISHED"
++ 
++-#: ../netstat.c:465
+++#: ../netstat.c:470
+++#, c-format
++ msgid "Active NET/ROM sockets\n"
++ msgstr "Aktiivsed NET/ROM soklid\n"
++ 
++-#: ../netstat.c:466
+++#: ../netstat.c:471
+++#, c-format
++ msgid ""
++-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
++-"Recv-Q\n"
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
++ msgstr ""
++ "Kasutaja   Sihtpunkt  Lähtepunkt Liides  Olek         Vr/Vs    SaatJrk "
++ "VvJrk\n"
++ 
++-#: ../netstat.c:476 ../netstat.c:1290
+++#: ../netstat.c:481 ../netstat.c:1308
++ #, c-format
++ msgid "Problem reading data from %s\n"
++ msgstr "Probleem andmete lugemisel failist %s\n"
++ 
++-#: ../netstat.c:511
+++#: ../netstat.c:516
++ msgid "SYN_SENT"
++ msgstr "SYN_SENT"
++ 
++-#: ../netstat.c:512
+++#: ../netstat.c:517
++ msgid "SYN_RECV"
++ msgstr "SYN_RECV"
++ 
++-#: ../netstat.c:513
+++#: ../netstat.c:518
++ msgid "FIN_WAIT1"
++ msgstr "FIN_WAIT1"
++ 
++-#: ../netstat.c:514
+++#: ../netstat.c:519
++ msgid "FIN_WAIT2"
++ msgstr "FIN_WAIT2"
++ 
++-#: ../netstat.c:515
+++#: ../netstat.c:520
++ msgid "TIME_WAIT"
++ msgstr "TIME_WAIT"
++ 
++-#: ../netstat.c:516
+++#: ../netstat.c:521
++ msgid "CLOSE"
++ msgstr "CLOSE"
++ 
++-#: ../netstat.c:517
+++#: ../netstat.c:522
++ msgid "CLOSE_WAIT"
++ msgstr "CLOSE_WAIT"
++ 
++-#: ../netstat.c:518
+++#: ../netstat.c:523
++ msgid "LAST_ACK"
++ msgstr "LAST_ACK"
++ 
++-#: ../netstat.c:519
+++#: ../netstat.c:524
++ msgid "LISTEN"
++ msgstr "LISTEN"
++ 
++-#: ../netstat.c:520
+++#: ../netstat.c:525
++ msgid "CLOSING"
++ msgstr "CLOSING"
++ 
++-#: ../netstat.c:587
+++#: ../netstat.c:596
++ #, c-format
++ msgid "warning, got bogus igmp6 line %d.\n"
++ msgstr "Hoiatus - sain imeliku igmp6 rea (nr. %d)\n"
++ 
++-#: ../netstat.c:592 ../netstat.c:630 ../netstat.c:751 ../netstat.c:883
++-#: ../netstat.c:1014 ../netstat.c:1019
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
++ #, c-format
++ msgid "netstat: unsupported address family %d !\n"
++ msgstr "netstat: aadressiperekonda %d ei toetata\n"
++ 
++-#: ../netstat.c:605 ../netstat.c:610 ../netstat.c:618 ../netstat.c:625
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
++ #, c-format
++ msgid "warning, got bogus igmp line %d.\n"
++ msgstr "Hoiatus - sain imeliku igmp rea (nr. %d)\n"
++ 
++-#: ../netstat.c:668
+++#: ../netstat.c:677
+++#, c-format
++ msgid "Active X.25 sockets\n"
++ msgstr "Aktiivsed X.25 soklid\n"
++ 
++ #. IMHO, Vr/Vs is not very usefull --SF
++-#: ../netstat.c:670
+++#: ../netstat.c:679
+++#, c-format
++ msgid ""
++-"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  "
++-"Recv-Q\n"
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
++ msgstr ""
++ "Sihtpunkt    Lähtepunkt      Liides  LCI  Olek         Vr/Vs  SaatJrk VvJrk\n"
++ 
++-#: ../netstat.c:747
+++#: ../netstat.c:759
+++#, c-format
++ msgid "warning, got bogus tcp line.\n"
++ msgstr "Hoiatus - sain imeliku tcp rea\n"
++ 
++-#: ../netstat.c:788 ../netstat.c:938 ../netstat.c:1057
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
++ #, c-format
++ msgid "off (0.00/%ld/%d)"
++ msgstr "eikäi ((0.00/%ld/%d)"
++ 
++-#: ../netstat.c:792
+++#: ../netstat.c:804
++ #, c-format
++ msgid "on (%2.2f/%ld/%d)"
++ msgstr "käib (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:797
+++#: ../netstat.c:809
++ #, c-format
++ msgid "keepalive (%2.2f/%ld/%d)"
++ msgstr "keepalive (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:802
+++#: ../netstat.c:814
++ #, c-format
++ msgid "timewait (%2.2f/%ld/%d)"
++ msgstr "timewait (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:807 ../netstat.c:947 ../netstat.c:1067
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
++ #, c-format
++ msgid "unkn-%d (%2.2f/%ld/%d)"
++ msgstr "eitea-%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:879
+++#: ../netstat.c:894
+++#, c-format
++ msgid "warning, got bogus udp line.\n"
++ msgstr "Hoiatus - sain imeliku udp rea\n"
++ 
++-#: ../netstat.c:897 ../netstat.c:1157 ../netstat.c:1190
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
++ msgid "UNKNOWN"
++ msgstr "TUNDMATU"
++ 
++-#: ../netstat.c:943 ../netstat.c:1062
+++#: ../netstat.c:958 ../netstat.c:1080
++ #, c-format
++ msgid "on%d (%2.2f/%ld/%d)"
++ msgstr "käib-%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:1028
+++#: ../netstat.c:1046
+++#, c-format
++ msgid "warning, got bogus raw line.\n"
++ msgstr "Hoiatus - sain imeliku raw rea\n"
++ 
++-#: ../netstat.c:1110
+++#: ../netstat.c:1128
+++#, c-format
++ msgid "warning, got bogus unix line.\n"
++ msgstr "Hoiatus - sain imeliku unix rea\n"
++ 
++-#: ../netstat.c:1137
+++#: ../netstat.c:1155
++ msgid "STREAM"
++ msgstr "STREAM"
++ 
++-#: ../netstat.c:1141
+++#: ../netstat.c:1159
++ msgid "DGRAM"
++ msgstr "DGRAM"
++ 
++-#: ../netstat.c:1145
+++#: ../netstat.c:1163
++ msgid "RAW"
++ msgstr "RAW"
++ 
++-#: ../netstat.c:1149
+++#: ../netstat.c:1167
++ msgid "RDM"
++ msgstr "RDM"
++ 
++-#: ../netstat.c:1153
+++#: ../netstat.c:1171
++ msgid "SEQPACKET"
++ msgstr "SEQPACKET"
++ 
++-#: ../netstat.c:1162
+++#: ../netstat.c:1180
++ msgid "FREE"
++ msgstr "VABA"
++ 
++-#: ../netstat.c:1178
+++#: ../netstat.c:1196
++ msgid "CONNECTING"
++ msgstr "ÜHENDUMAS"
++ 
++-#: ../netstat.c:1182
+++#: ../netstat.c:1200
++ msgid "CONNECTED"
++ msgstr "ÜHENDATUD"
++ 
++-#: ../netstat.c:1186
+++#: ../netstat.c:1204
++ msgid "DISCONNECTING"
++ msgstr "LAHTIÜHENDUMAS"
++ 
++-#: ../netstat.c:1217
+++#: ../netstat.c:1235
+++#, c-format
++ msgid "Active UNIX domain sockets "
++ msgstr "Aktiivsed UNIX domeeni soklid "
++ 
++-#: ../netstat.c:1219 ../netstat.c:1729
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
++ msgid "(servers and established)"
++ msgstr "(serverid ja ühendatud)"
++ 
++-#: ../netstat.c:1222 ../netstat.c:1732
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
++ msgid "(only servers)"
++ msgstr "(ainult serverid)"
++ 
++-#: ../netstat.c:1224 ../netstat.c:1734
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
++ msgid "(w/o servers)"
++ msgstr "(ilma serveriteta)"
++ 
++-#: ../netstat.c:1227
+++#: ../netstat.c:1245
+++#, c-format
++ msgid ""
++ "\n"
++ "Proto RefCnt Flags       Type       State         I-Node"
++@@ -803,32 +937,36 @@ msgstr ""
++ "\n"
++ "Proto Mitu   Lipud       Tüüp       Olek         I-kirje "
++ 
++-#: ../netstat.c:1229
+++#: ../netstat.c:1247
+++#, c-format
++ msgid " Path\n"
++ msgstr "Tee\n"
++ 
++-#: ../netstat.c:1249
+++#: ../netstat.c:1267
++ msgid "SABM SENT"
++ msgstr "SABM SENT"
++ 
++-#: ../netstat.c:1252
+++#: ../netstat.c:1270
++ msgid "RECOVERY"
++ msgstr "RECOVERY"
++ 
++-#: ../netstat.c:1266
+++#: ../netstat.c:1284
+++#, c-format
++ msgid "Active AX.25 sockets\n"
++ msgstr "Aktiivsed AX.25 soklid\n"
++ 
++-#: ../netstat.c:1267
+++#: ../netstat.c:1285
+++#, c-format
++ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
++ msgstr "Sihtpunkt  Lähtepunkt Liides  Olek         Vr/Vs    SaatJrk VvJrk\n"
++ 
++-#: ../netstat.c:1310
+++#: ../netstat.c:1328
++ #, c-format
++ msgid "problem reading data from %s\n"
++ msgstr "Probleem andmete lugemisel failist %s\n"
++ 
++-#: ../netstat.c:1361
+++#: ../netstat.c:1379
+++#, c-format
++ msgid ""
++ "Active IPX sockets\n"
++ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
++@@ -838,47 +976,53 @@ msgstr ""
++ "Proto VvJrk  SaatJrk Kohalik aadress           Väline aadress             "
++ "Olek "
++ 
++-#: ../netstat.c:1363
+++#: ../netstat.c:1381
+++#, c-format
++ msgid " User"
++ msgstr " Kasutaja"
++ 
++-#: ../netstat.c:1397
+++#: ../netstat.c:1415
++ msgid "ESTAB"
++ msgstr "ESTAB"
++ 
++-#: ../netstat.c:1405
+++#: ../netstat.c:1423
++ msgid "UNK."
++ msgstr "UNK."
++ 
++-#: ../netstat.c:1443
+++#: ../netstat.c:1461
+++#, c-format
++ msgid "Kernel Interface table\n"
++ msgstr "Tuuma liideste tabel\n"
++ 
++-#: ../netstat.c:1447
+++#: ../netstat.c:1465
+++#, fuzzy, c-format
++ msgid ""
++-"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++ msgstr ""
++-"Liides  MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Liides  MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Lip\n"
++ 
++-#: ../netstat.c:1451
+++#: ../netstat.c:1469
++ msgid "missing interface information"
++ msgstr "Puudulik informatsioon liideste kohta"
++ 
++-#: ../netstat.c:1474
+++#: ../netstat.c:1492
+++#, c-format
++ msgid ""
++-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ msgstr ""
++ "Kasutamine: netstat [-veenNcCF] [<Af>] -r\n"
++ "            netstat {-V|--version|-h|--help}\n"
++ 
++-#: ../netstat.c:1475
+++#: ../netstat.c:1493
+++#, c-format
++ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ msgstr "            netstat [-vnNcaeol] [<Sokkel> ...]\n"
++ 
++-#: ../netstat.c:1476
+++#: ../netstat.c:1494
+++#, c-format
++ msgid ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++@@ -886,25 +1030,30 @@ msgstr ""
++ "            netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++ 
++-#: ../netstat.c:1478
+++#: ../netstat.c:1496
+++#, c-format
++ msgid "        -r, --route              display routing table\n"
++ msgstr "        -r, --route              ruutingutabeli näitamine\n"
++ 
++-#: ../netstat.c:1479
+++#: ../netstat.c:1497
+++#, c-format
++ msgid "        -i, --interfaces         display interface table\n"
++ msgstr "        -i, --interfaces         liideste tabeli näitamine\n"
++ 
++-#: ../netstat.c:1480
+++#: ../netstat.c:1498
+++#, c-format
++ msgid "        -g, --groups             display multicast group memberships\n"
++ msgstr "        -g, --groups             multiedastuse gruppide näitamine\n"
++ 
++-#: ../netstat.c:1481
+++#: ../netstat.c:1499
+++#, c-format
++ msgid ""
++ "        -s, --statistics         display networking statistics (like SNMP)\n"
++ msgstr ""
++ "        -s, --statistics         võrgu statistika näitamine (SNMP stiilis)\n"
++ 
++-#: ../netstat.c:1483
+++#: ../netstat.c:1501
+++#, c-format
++ msgid ""
++ "        -M, --masquerade         display masqueraded connections\n"
++ "\n"
++@@ -912,36 +1061,39 @@ msgstr ""
++ "        -M, --masquerade         maskeeritavate ühenduste näitamine\n"
++ "\n"
++ 
++-#: ../netstat.c:1486 ../route.c:86
++-msgid "        -n, --numeric            dont resolve names\n"
++-msgstr "        -n, --numeric            mitte lahendada numbreid nimedeks\n"
++-
++-#: ../netstat.c:1487
++-msgid "        --numeric-hosts          dont resolve host names\n"
+++#: ../netstat.c:1505
+++#, fuzzy, c-format
+++msgid "        --numeric-hosts          don't resolve host names\n"
++ msgstr "        --numeric-hosts          mitte lahendada hostinimesid\n"
++ 
++-#: ../netstat.c:1488
++-msgid "        --numeric-ports          dont resolve port names\n"
+++#: ../netstat.c:1506
+++#, fuzzy, c-format
+++msgid "        --numeric-ports          don't resolve port names\n"
++ msgstr "        --numeric-ports          mitte lahendada pordinimesid\n"
++ 
++-#: ../netstat.c:1489
++-msgid "        --numeric-users          dont resolve user names\n"
+++#: ../netstat.c:1507
+++#, fuzzy, c-format
+++msgid "        --numeric-users          don't resolve user names\n"
++ msgstr "        --numeric-users          mitte lahendada kasutajanimesid\n"
++ 
++-#: ../netstat.c:1490
+++#: ../netstat.c:1508
+++#, c-format
++ msgid "        -N, --symbolic           resolve hardware names\n"
++ msgstr "        -N, --symbolic           lahendada riistvara aadressid\n"
++ 
++-#: ../netstat.c:1491 ../route.c:87
+++#: ../netstat.c:1509 ../route.c:88
+++#, c-format
++ msgid "        -e, --extend             display other/more information\n"
++ msgstr "        -e, --extend             muu info/lisainfo näitamine\n"
++ 
++-#: ../netstat.c:1492
+++#: ../netstat.c:1510
+++#, c-format
++ msgid "        -p, --programs           display PID/Program name for sockets\n"
++ msgstr ""
++ "        -p, --programs           soklite kohta PID/protsessi nime näitamine\n"
++ 
++-#: ../netstat.c:1493
+++#: ../netstat.c:1511
+++#, c-format
++ msgid ""
++ "        -c, --continuous         continuous listing\n"
++ "\n"
++@@ -949,22 +1101,26 @@ msgstr ""
++ "        -c, --continuous         pidevalt uuenev nimekiri\n"
++ "\n"
++ 
++-#: ../netstat.c:1494
+++#: ../netstat.c:1512
+++#, c-format
++ msgid "        -l, --listening          display listening server sockets\n"
++ msgstr "        -l, --listening          kuulavate serversoklite näitamine\n"
++ 
++-#: ../netstat.c:1495
+++#: ../netstat.c:1513
+++#, c-format
++ msgid ""
++ "        -a, --all, --listening   display all sockets (default: connected)\n"
++ msgstr ""
++ "        -a, --all, --listening   kõigi soklite näitamine (vaikimisi "
++ "ühendatud)\n"
++ 
++-#: ../netstat.c:1496
+++#: ../netstat.c:1514
+++#, c-format
++ msgid "        -o, --timers             display timers\n"
++ msgstr "        -o, --timers             taimerite näitamine\n"
++ 
++-#: ../netstat.c:1497 ../route.c:88
+++#: ../netstat.c:1515 ../route.c:89
+++#, c-format
++ msgid ""
++ "        -F, --fib                display Forwarding Information Base "
++ "(default)\n"
++@@ -972,7 +1128,8 @@ msgstr ""
++ "        -F, --fib                üldiste ruutingutabelite näitamine "
++ "(vaikimisi)\n"
++ 
++-#: ../netstat.c:1498 ../route.c:89
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
++ msgid ""
++ "        -C, --cache              display routing cache instead of FIB\n"
++ "\n"
++@@ -981,108 +1138,121 @@ msgstr ""
++ "näitamine\n"
++ "\n"
++ 
++-#: ../netstat.c:1500
+++#: ../netstat.c:1518
+++#, c-format
++ msgid ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ msgstr ""
++-"  <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ 
++-#: ../netstat.c:1501 ../route.c:91
++-#, c-format
++-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
+++#: ../netstat.c:1519
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
++ msgstr "  <AF>=kasutage '-A <af>' või '--<af>' vaikimisi: %s\n"
++ 
++-#: ../netstat.c:1502 ../route.c:92
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
++ msgid "  List of possible address families (which support routing):\n"
++ msgstr "  Võimalike ruutingu toetavate aadressiperekondade nimekiri:\n"
++ 
++-#: ../netstat.c:1726
+++#: ../netstat.c:1753
+++#, c-format
++ msgid "Active Internet connections "
++ msgstr "Aktiivsed internetiühendused "
++ 
++-#: ../netstat.c:1736
+++#: ../netstat.c:1763
+++#, c-format
++ msgid ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ msgstr ""
++ "\n"
++-"Proto  VvJrk SaatJrk Kohalik aadress        Väline aadress          Olek     "
++-"  "
+++"Proto  VvJrk SaatJrk Kohalik aadress        Väline aadress          "
+++"Olek       "
++ 
++-#: ../netstat.c:1738
+++#: ../netstat.c:1765
+++#, c-format
++ msgid " User       Inode     "
++ msgstr " Kasutaja   I-kirje   "
++ 
++-#: ../netstat.c:1741
+++#: ../netstat.c:1768
+++#, c-format
++ msgid " Timer"
++ msgstr " Taimer"
++ 
++-#: ../netstat.c:1771
+++#: ../netstat.c:1798
+++#, c-format
++ msgid "IPv4 Group Memberships\n"
++ msgstr "IPv4 grupikuuluvused\n"
++ 
++-#: ../netstat.c:1772
+++#: ../netstat.c:1799
+++#, c-format
++ msgid "Interface       RefCnt Group\n"
++ msgstr "Liides          Mitu   Grupp\n"
++ 
++-#: ../rarp.c:43
+++#: ../rarp.c:44
++ msgid "This kernel does not support RARP.\n"
++ msgstr "rarp: tuum ei toeta RARP'i\n"
++ 
++-#: ../rarp.c:82
+++#: ../rarp.c:83
++ #, c-format
++ msgid "no RARP entry for %s.\n"
++ msgstr "rarp: %s jaoks pole RARP kirjet\n"
++ 
++-#: ../rarp.c:95
+++#: ../rarp.c:96
++ #, c-format
++ msgid "%s: bad hardware address\n"
++ msgstr "rarp: vigane riistvaraline aadress %s\n"
++ 
++-#: ../rarp.c:127
+++#: ../rarp.c:128
++ #, c-format
++ msgid "rarp: cannot open file %s:%s.\n"
++ msgstr "rarp: ei saa avada faili %s:%s\n"
++ 
++-#: ../rarp.c:139
+++#: ../rarp.c:140
++ #, c-format
++ msgid "rarp: format error at %s:%u\n"
++ msgstr "rarp: vorminguviga failis %s real %u\n"
++ 
++-#: ../rarp.c:143 ../rarp.c:287
+++#: ../rarp.c:144 ../rarp.c:289
++ #, c-format
++ msgid "rarp: %s: unknown host\n"
++ msgstr "rarp: tundmatu host %s\n"
++ 
++-#: ../rarp.c:146
+++#: ../rarp.c:147
++ #, c-format
++ msgid "rarp: cannot set entry from %s:%u\n"
++ msgstr "rarp: ei saa kehtestada kirjet failist %s realt %u\n"
++ 
++-#: ../rarp.c:175
+++#: ../rarp.c:176
+++#, c-format
++ msgid "Usage: rarp -a                               list entries in cache.\n"
++ msgstr ""
++ "Kasutamine:\n"
++ "  rarp -a                              puhvris olevate kirjete vaatamine\n"
++ 
++-#: ../rarp.c:176
+++#: ../rarp.c:177
+++#, c-format
++ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
++ msgstr "  rarp -d <hosti nimi>                 kirje kustutamine puhvrist\n"
++ 
++-#: ../rarp.c:177
+++#: ../rarp.c:178
+++#, c-format
++ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
++ msgstr "  rarp [<HW>] -s <hosti nimi> <hwaddr> kirje lisamine puhvrisse\n"
++ 
++-#: ../rarp.c:178
+++#: ../rarp.c:179
+++#, c-format
++ msgid ""
++ "       rarp -f                               add entries from /etc/ethers.\n"
++ msgstr ""
++ "  rarp -f                              kirjete lisamine failist /etc/ethers\n"
++ 
++-#: ../rarp.c:179
+++#: ../rarp.c:180
+++#, c-format
++ msgid ""
++ "       rarp -V                               display program version.\n"
++ "\n"
++@@ -1090,24 +1260,26 @@ msgstr ""
++ "  rarp -V                              programmi versiooni näitamine\n"
++ "\n"
++ 
++-#: ../rarp.c:236
+++#: ../rarp.c:238
++ #, c-format
++ msgid "%s: illegal option mix.\n"
++ msgstr "%s: lubamatu võtmete kombinatsioon\n"
++ 
++-#: ../rarp.c:267
+++#: ../rarp.c:269
++ #, c-format
++ msgid "rarp: %s: unknown hardware type.\n"
++ msgstr "rarp: tundmatu riistvara tüüp %s\n"
++ 
++-#: ../route.c:79
+++#: ../route.c:80
+++#, c-format
++ msgid ""
++ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
++ msgstr ""
++ "Kasutamine:\n"
++ "    route [-nNvee] [-FC] [<AF>]           Tuuma ruutingutabeli näitamine\n"
++ 
++-#: ../route.c:80
+++#: ../route.c:81
+++#, c-format
++ msgid ""
++ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
++ "\n"
++@@ -1115,7 +1287,8 @@ msgstr ""
++ "    route [-v] [-FC] {add|del|flush} ...  Tuuma ruutingutabeli muutmine\n"
++ "\n"
++ 
++-#: ../route.c:82
+++#: ../route.c:83
+++#, c-format
++ msgid ""
++ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
++ "specified AF.\n"
++@@ -1123,7 +1296,8 @@ msgstr ""
++ "    route {-h|--help} [<AF>]              Detailne süntaks perekonna AF "
++ "jaoks\n"
++ 
++-#: ../route.c:83
+++#: ../route.c:84
+++#, c-format
++ msgid ""
++ "       route {-V|--version}                  Display version/author and "
++ "exit.\n"
++@@ -1132,15 +1306,23 @@ msgstr ""
++ "    route {-V|--version}                  Versiooni ja oskuste näitamine\n"
++ "\n"
++ 
+++#: ../route.c:92
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "  <AF>=kasutage '-A <af>' või '--<af>' vaikimisi: %s\n"
+++
++ #: ../plipconfig.c:66
+++#, c-format
++ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
++ msgstr "Kasutamine:  plipconfig [-a] [-i] [-v] liides\n"
++ 
++ #: ../plipconfig.c:67
+++#, c-format
++ msgid "                  [nibble NN] [trigger NN]\n"
++ msgstr "                        [nibble NN] [trigger NN]\n"
++ 
++ #: ../plipconfig.c:68
+++#, c-format
++ msgid "       plipconfig -V | --version\n"
++ msgstr "             plipconfig -V | --version\n"
++ 
++@@ -1149,25 +1331,30 @@ msgstr "             plipconfig -V | --v
++ msgid "%s\tnibble %lu  trigger %lu\n"
++ msgstr "%s\tnibble %lu  trigger %lu\n"
++ 
++-#: ../iptunnel.c:84
+++#: ../iptunnel.c:85
+++#, c-format
++ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
++ msgstr "Kasutamine: iptunnel { add | change | del | show } [ NIMI ]\n"
++ 
++-#: ../iptunnel.c:85
+++#: ../iptunnel.c:86
+++#, c-format
++ msgid ""
++ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
++ msgstr ""
++ "             [ mode { ipip | gre | sit } ] [ remote AADR ] [ local AADR ]\n"
++ 
++-#: ../iptunnel.c:86
+++#: ../iptunnel.c:87
+++#, c-format
++ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ msgstr "             [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ 
++-#: ../iptunnel.c:87
+++#: ../iptunnel.c:88
+++#, c-format
++ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
++ msgstr "             [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev LIIDES ]\n"
++ 
++-#: ../iptunnel.c:88
+++#: ../iptunnel.c:89
+++#, c-format
++ msgid ""
++ "       iptunnel -V | --version\n"
++ "\n"
++@@ -1175,83 +1362,99 @@ msgstr ""
++ "             iptunnel -V | --version\n"
++ "\n"
++ 
++-#: ../iptunnel.c:89
+++#: ../iptunnel.c:90
+++#, c-format
++ msgid "Where: NAME := STRING\n"
++ msgstr "Kus:   NIMI := STRING\n"
++ 
++-#: ../iptunnel.c:90
+++#: ../iptunnel.c:91
+++#, c-format
++ msgid "       ADDR := { IP_ADDRESS | any }\n"
++ msgstr "       AADR := { IP_AADRESS | any }\n"
++ 
++-#: ../iptunnel.c:91
+++#: ../iptunnel.c:92
+++#, c-format
++ msgid "       TOS  := { NUMBER | inherit }\n"
++ msgstr "       TOS  := { ARV | inherit }\n"
++ 
++-#: ../iptunnel.c:92
+++#: ../iptunnel.c:93
+++#, c-format
++ msgid "       TTL  := { 1..255 | inherit }\n"
++ msgstr "       TTL  := { 1..255 | inherit }\n"
++ 
++-#: ../iptunnel.c:93
+++#: ../iptunnel.c:94
+++#, c-format
++ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
++ msgstr ""
++ "       KEY  := { PUNKTIDEGA_ARVUNELIK | ARV }\n"
++ "       LIIDES := FÜÜSILISE_LIIDESE_NIMI\n"
++ 
++-#: ../iptunnel.c:331
+++#: ../iptunnel.c:332
+++#, c-format
++ msgid "Keys are not allowed with ipip and sit.\n"
++ msgstr "ipip ja sit juures ei ole võtmed lubatud\n"
++ 
++-#: ../iptunnel.c:351
+++#: ../iptunnel.c:352
+++#, c-format
++ msgid "Broadcast tunnel requires a source address.\n"
++ msgstr "Leviedastusega tunnel vajab lähteaadressi\n"
++ 
++-#: ../iptunnel.c:366
+++#: ../iptunnel.c:367
+++#, c-format
++ msgid "ttl != 0 and noptmudisc are incompatible\n"
++ msgstr "ttl != 0 ning noptmudisc ei sobi kokku\n"
++ 
++-#: ../iptunnel.c:378
+++#: ../iptunnel.c:379
+++#, c-format
++ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
++ msgstr "Ei suuda määrata tunneli moodi (ipip, gre või sit)\n"
++ 
++-#: ../iptunnel.c:416
+++#: ../iptunnel.c:417
++ #, c-format
++ msgid "%s: %s/ip  remote %s  local %s "
++ msgstr "%s: %s/ip teises otsas %s  siin %s "
++ 
++-#: ../iptunnel.c:420
+++#: ../iptunnel.c:421
++ msgid "unknown"
++ msgstr "tundmatu"
++ 
++-#: ../iptunnel.c:452
+++#: ../iptunnel.c:453
+++#, c-format
++ msgid "  Drop packets out of sequence.\n"
++ msgstr "  Järjekorravälised paketid visatakse minema\n"
++ 
++-#: ../iptunnel.c:454
+++#: ../iptunnel.c:455
+++#, c-format
++ msgid "  Checksum in received packet is required.\n"
++ msgstr "  Vastuvõetavates pakettides on kontrollsumma kohustuslik\n"
++ 
++-#: ../iptunnel.c:456
+++#: ../iptunnel.c:457
+++#, c-format
++ msgid "  Sequence packets on output.\n"
++ msgstr "  Väljuvad paketid varustatakse järjekorranumbritega\n"
++ 
++-#: ../iptunnel.c:458
+++#: ../iptunnel.c:459
+++#, c-format
++ msgid "  Checksum output packets.\n"
++ msgstr "  Väljuvad paketid varustatakse kontrollsummaga\n"
++ 
++-#: ../iptunnel.c:486
+++#: ../iptunnel.c:487
+++#, c-format
++ msgid "Wrong format of /proc/net/dev. Sorry.\n"
++ msgstr "/proc/net/dev on vales formaadis. Vale tuuma versioon?\n"
++ 
++-#: ../iptunnel.c:499
+++#: ../iptunnel.c:500
++ #, c-format
++ msgid "Failed to get type of [%s]\n"
++ msgstr "Ei suutnud kindlaks teha liidese %s tüüpi\n"
++ 
++-#: ../iptunnel.c:515
+++#: ../iptunnel.c:516
+++#, c-format
++ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
++ msgstr "RX: Pakette    Baite        Vigu   KSumVigu JrkVigu  Levipakette\n"
++ 
++-#: ../iptunnel.c:518
+++#: ../iptunnel.c:519
+++#, c-format
++ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
++ msgstr "TX: Pakette    Baite        Vigu   DeadLoop EiRuudi  MäluOtsas\n"
++ 
++@@ -1658,13 +1861,13 @@ msgid "%u packets directly queued to rec
++ msgstr "%u paketti pandi otse recvmsg eeljärjekorda"
++ 
++ #: ../statistics.c:178
++-#, c-format
++-msgid "%u packets directly received from backlog"
+++#, fuzzy, c-format
+++msgid "%u of bytes directly received from backlog"
++ msgstr "%u paketti võeti vastu otse backlog-ist"
++ 
++ #: ../statistics.c:180
++-#, c-format
++-msgid "%u packets directly received from prequeue"
+++#, fuzzy, c-format
+++msgid "%u of bytes directly received from prequeue"
++ msgstr "%u paketti võeti vastu otse eeljärjekorrast"
++ 
++ #: ../statistics.c:182
++@@ -1673,8 +1876,8 @@ msgid "%u packets dropped from prequeue"
++ msgstr "%u paketti kustutati eeljärjekorrast"
++ 
++ #: ../statistics.c:183
++-#, c-format
++-msgid "%u packets header predicted"
+++#, fuzzy, c-format
+++msgid "%u packet headers predicted"
++ msgstr "%u paketti päise õige ennustusega"
++ 
++ #: ../statistics.c:184
++@@ -1687,19 +1890,210 @@ msgstr "%u paketti päise õige ennustuseg
++ msgid "Ran %u times out of system memory during packet sending"
++ msgstr "Pakettide saatmisel sai %u korda süsteemne mälu otsa"
++ 
++-#: ../statistics.c:253
+++#: ../statistics.c:188
+++#, fuzzy, c-format
+++msgid "%u acknowledgments not containing data received"
+++msgstr "%u sisenevat paketti tundmatule pordile"
+++
+++#: ../statistics.c:189
+++#, c-format
+++msgid "%u predicted acknowledgments"
+++msgstr ""
+++
+++#: ../statistics.c:190
+++#, c-format
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:191
+++#, c-format
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr ""
+++
+++#: ../statistics.c:192
+++#, fuzzy, c-format
+++msgid "%u bad SACKs received"
+++msgstr "%u vigast segmenti võeti vastu"
+++
+++#: ../statistics.c:193
+++#, c-format
+++msgid "Detected reordering %u times using FACK"
+++msgstr ""
+++
+++#: ../statistics.c:194
+++#, c-format
+++msgid "Detected reordering %u times using SACK"
+++msgstr ""
+++
+++#: ../statistics.c:195
+++#, c-format
+++msgid "Detected reordering %u times using time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:196
+++#, c-format
+++msgid "Detected reordering %u times using reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:197
+++#, fuzzy, c-format
+++msgid "%u congestion windows fully recovered"
+++msgstr "%u ühenduse katkestust saabus"
+++
+++#: ../statistics.c:198
+++#, c-format
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
+++msgstr ""
+++
+++#: ../statistics.c:199
+++#, c-format
+++msgid "%u congestion window recovered using DSACK"
+++msgstr ""
+++
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr ""
+++
+++#: ../statistics.c:201
+++#, fuzzy, c-format
+++msgid "%u retransmits lost"
+++msgstr "%u katkestust saadeti"
+++
+++#: ../statistics.c:202
+++#, fuzzy, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr "%u segmenti saadeti uuesti"
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr ""
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr ""
+++
+++#: ../statistics.c:205
+++#, fuzzy, c-format
+++msgid "%u fast retransmits"
+++msgstr "%u segmenti saadeti uuesti"
+++
+++#: ../statistics.c:206
+++#, fuzzy, c-format
+++msgid "%u forward retransmits"
+++msgstr "%u edastati"
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr ""
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr ""
+++
+++#: ../statistics.c:209
+++#, fuzzy, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr "%u segmenti saadeti uuesti"
+++
+++#: ../statistics.c:210
+++#, fuzzy, c-format
+++msgid "%u sack retransmits failed"
+++msgstr "%u pakettide kokkupanekut ebaõnnestus"
+++
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr ""
+++
+++#: ../statistics.c:212
+++#, fuzzy, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr ""
+++"%u paketti kustutati vastuvõtu järjekorrast sokli puhvri ületäitumise tõttu"
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr ""
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr ""
+++
+++#: ../statistics.c:215
+++#, fuzzy, c-format
+++msgid "%u DSACKs received"
+++msgstr "%u paketti võeti vastu"
+++
+++#: ../statistics.c:216
+++#, fuzzy, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr "kokku võeti vastu %u paketti"
+++
+++#: ../statistics.c:217
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr "%u ühenduse katkestust saabus"
+++
+++#: ../statistics.c:218
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr "%u ühenduse katkestust saabus"
+++
+++#: ../statistics.c:219
+++#, fuzzy, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr "%u ühenduse katkestust saabus"
+++
+++#: ../statistics.c:220
+++#, c-format
+++msgid "%u connections aborted due to memory pressure"
+++msgstr ""
+++
+++#: ../statistics.c:221
+++#, fuzzy, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr "%u aktiivsest ühendusest keelduti ajatempli tõttu"
+++
+++#: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr ""
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr ""
+++
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr ""
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr ""
+++
+++#: ../statistics.c:292
++ msgid "enabled"
++ msgstr "lubatud"
++ 
++-#: ../statistics.c:253
+++#: ../statistics.c:292
++ msgid "disabled"
++ msgstr "keelatud"
++ 
++-#: ../statistics.c:336
+++#: ../statistics.c:375
++ msgid "error parsing /proc/net/snmp"
++ msgstr "Viga /proc/net/snmp analüüsimisel"
++ 
++-#: ../statistics.c:349
+++#: ../statistics.c:388
++ msgid "cannot open /proc/net/snmp"
++ msgstr "Ei saa avada faili /proc/net/snmp"
++ 
++@@ -1713,7 +2107,7 @@ msgstr "Riistvara tüüpi `%s' ei toetata\
++ msgid "Cannot change line discipline to `%s'.\n"
++ msgstr "Ei suuda seada `%s' liiniprotokolliks\n"
++ 
++-#: ../lib/af.c:153 ../lib/hw.c:156
+++#: ../lib/af.c:153 ../lib/hw.c:161
++ msgid "UNSPEC"
++ msgstr "UNSPEC"
++ 
++@@ -1729,11 +2123,11 @@ msgstr "DARPA Internet"
++ msgid "IPv6"
++ msgstr "IPv6"
++ 
++-#: ../lib/af.c:164 ../lib/hw.c:177
+++#: ../lib/af.c:164 ../lib/hw.c:182
++ msgid "AMPR AX.25"
++ msgstr "AMPR AX.25"
++ 
++-#: ../lib/af.c:167 ../lib/hw.c:183
+++#: ../lib/af.c:167 ../lib/hw.c:188
++ msgid "AMPR NET/ROM"
++ msgstr "AMPR NET/ROM"
++ 
++@@ -1745,7 +2139,7 @@ msgstr "Novell IPX"
++ msgid "Appletalk DDP"
++ msgstr "Appletalk DDP"
++ 
++-#: ../lib/af.c:176 ../lib/hw.c:218
+++#: ../lib/af.c:176 ../lib/hw.c:223
++ msgid "Econet"
++ msgstr "Econet"
++ 
++@@ -1753,19 +2147,21 @@ msgstr "Econet"
++ msgid "CCITT X.25"
++ msgstr "CCITT X.25"
++ 
++-#: ../lib/af.c:182 ../lib/hw.c:180
+++#: ../lib/af.c:182 ../lib/hw.c:185
++ msgid "AMPR ROSE"
++ msgstr "AMPR ROSE"
++ 
++-#: ../lib/af.c:185 ../lib/hw.c:168
+++#: ../lib/af.c:185 ../lib/hw.c:173
++ msgid "Ash"
++ msgstr "Ash"
++ 
++ #: ../lib/af.c:243
+++#, c-format
++ msgid "Please don't supply more than one address family.\n"
++ msgstr "Meil on kombeks üks aadressiperekond korraga\n"
++ 
++ #: ../lib/af.c:304
+++#, c-format
++ msgid "Too much address family arguments.\n"
++ msgstr "Liiga palju aadressiperekonna argumente\n"
++ 
++@@ -1790,6 +2186,7 @@ msgid "in_arcnet(%s): trailing junk!\n"
++ msgstr "in_arcnet(%s): sodi lõpus\n"
++ 
++ #: ../lib/ash.c:81
+++#, c-format
++ msgid "Malformed Ash address"
++ msgstr "Vigane Ash aadress"
++ 
++@@ -1808,22 +2205,21 @@ msgid "Callsign too long"
++ msgstr "Liiga pikk kutsung"
++ 
++ #: ../lib/ax25_gr.c:47
+++#, c-format
++ msgid "AX.25 not configured in this system.\n"
++ msgstr "AX.25 pole antud süsteemis konfigureeritud\n"
++ 
++ #: ../lib/ax25_gr.c:50
+++#, c-format
++ msgid "Kernel AX.25 routing table\n"
++ msgstr "Tuuma AX.25 ruutingutabel\n"
++ 
++ #. xxx
++ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
++ msgid "Destination  Iface    Use\n"
++ msgstr "Sihtpunkt    Liides   Kasutus\n"
++ 
++-#: ../lib/ddp_gr.c:21
++-msgid "Routing table for `ddp' not yet supported.\n"
++-msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n"
++-
++ #: ../lib/ether.c:74 ../lib/ether.c:91
++ #, c-format
++ msgid "in_ether(%s): invalid ether address!\n"
++@@ -1879,90 +2275,94 @@ msgstr "in_hippi(%s): ignoreerin lõpetav
++ msgid "in_hippi(%s): trailing junk!\n"
++ msgstr "in_hippi(%s): sodi lõpus\n"
++ 
++-#: ../lib/hw.c:155
+++#: ../lib/hw.c:160
++ msgid "Local Loopback"
++ msgstr "Kohalik loopback"
++ 
++-#: ../lib/hw.c:158
+++#: ../lib/hw.c:163
++ msgid "Serial Line IP"
++ msgstr "Serial Line IP"
++ 
++-#: ../lib/hw.c:159
+++#: ../lib/hw.c:164
++ msgid "VJ Serial Line IP"
++ msgstr "VJ Serial Line IP"
++ 
++-#: ../lib/hw.c:160
+++#: ../lib/hw.c:165
++ msgid "6-bit Serial Line IP"
++ msgstr "6-bitine Serial Line IP"
++ 
++-#: ../lib/hw.c:161
+++#: ../lib/hw.c:166
++ msgid "VJ 6-bit Serial Line IP"
++ msgstr "VJ 6-bitine Serial Line IP"
++ 
++-#: ../lib/hw.c:162
+++#: ../lib/hw.c:167
++ msgid "Adaptive Serial Line IP"
++ msgstr "Adaptiivne Serial Line IP"
++ 
++-#: ../lib/hw.c:165
+++#: ../lib/hw.c:170
++ msgid "Ethernet"
++ msgstr "Ethernet"
++ 
++-#: ../lib/hw.c:171
+++#: ../lib/hw.c:176
++ msgid "Fiber Distributed Data Interface"
++ msgstr "Fiber Distributed Data Interface"
++ 
++-#: ../lib/hw.c:174
+++#: ../lib/hw.c:179
++ msgid "HIPPI"
++ msgstr "HIPPI"
++ 
++-#: ../lib/hw.c:186
+++#: ../lib/hw.c:191
++ msgid "generic X.25"
++ msgstr "üldine X.25"
++ 
++-#: ../lib/hw.c:189
+++#: ../lib/hw.c:194
++ msgid "IPIP Tunnel"
++ msgstr "IPIP tunnel"
++ 
++-#: ../lib/hw.c:192
+++#: ../lib/hw.c:197
++ msgid "Point-to-Point Protocol"
++ msgstr "Kakspunktprotokoll"
++ 
++-#: ../lib/hw.c:195
+++#: ../lib/hw.c:200
++ msgid "(Cisco)-HDLC"
++ msgstr "(Cisco-)HDLC"
++ 
++-#: ../lib/hw.c:196
+++#: ../lib/hw.c:201
++ msgid "LAPB"
++ msgstr "LAPB"
++ 
++-#: ../lib/hw.c:199
+++#: ../lib/hw.c:204
++ msgid "ARCnet"
++ msgstr "ARCnet"
++ 
++-#: ../lib/hw.c:202
+++#: ../lib/hw.c:207
++ msgid "Frame Relay DLCI"
++ msgstr "Frame Relay DLCI"
++ 
++-#: ../lib/hw.c:203
+++#: ../lib/hw.c:208
++ msgid "Frame Relay Access Device"
++ msgstr "Frame Relay Access Device"
++ 
++-#: ../lib/hw.c:206
+++#: ../lib/hw.c:211
++ msgid "IPv6-in-IPv4"
++ msgstr "IPv6-in-IPv4"
++ 
++-#: ../lib/hw.c:209
+++#: ../lib/hw.c:214
++ msgid "IrLAP"
++ msgstr "IrLAP"
++ 
++-#: ../lib/hw.c:212
+++#: ../lib/hw.c:217
++ msgid "16/4 Mbps Token Ring"
++ msgstr "16/4 Mbps Token Ring"
++ 
++-#: ../lib/hw.c:214
+++#: ../lib/hw.c:219
++ msgid "16/4 Mbps Token Ring (New)"
++ msgstr "16/4 Mbps Token Ring (New)"
++ 
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr ""
+++
++ #: ../lib/inet.c:153 ../lib/inet6.c:79
++ #, c-format
++ msgid "rresolve: unsupport address family %d !\n"
++@@ -1972,27 +2372,32 @@ msgstr "rresolve: toetuseta aadressipere
++ msgid "[UNKNOWN]"
++ msgstr "[TUNDMATU]"
++ 
++-#: ../lib/inet6_gr.c:79
+++#: ../lib/inet6_gr.c:71
+++#, c-format
++ msgid "INET6 (IPv6) not configured in this system.\n"
++ msgstr "INET6 (IPv6) pole antud süsteemis konfigureeritud\n"
++ 
++-#: ../lib/inet6_gr.c:82
+++#: ../lib/inet6_gr.c:74
+++#, c-format
++ msgid "Kernel IPv6 routing table\n"
++ msgstr "Tuuma IPv6 ruutingutabel\n"
++ 
++-#: ../lib/inet6_gr.c:84
+++#: ../lib/inet6_gr.c:76
+++#, c-format
++ msgid ""
++-"Destination                                 Next Hop                         "
++-"       Flags Metric Ref    Use Iface\n"
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
++ msgstr ""
++-"Sihtpunkt                                   Järgmine samm                    "
++-"       Lipud Meetr  Mitu Kasut Liides\n"
+++"Sihtpunkt                                   Järgmine "
+++"samm                           Lipud Meetr  Mitu Kasut Liides\n"
++ 
++-#: ../lib/inet6_gr.c:158
+++#: ../lib/inet6_gr.c:150
+++#, c-format
++ msgid "Kernel IPv6 Neighbour Cache\n"
++ msgstr "Tuuma IPv6 naabrite puhver\n"
++ 
++-#: ../lib/inet6_gr.c:161
+++#: ../lib/inet6_gr.c:153
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State\n"
++@@ -2000,7 +2405,8 @@ msgstr ""
++ "Naaber                                      HW Aadress        Liides   Lipud "
++ "Mitu Olek\n"
++ 
++-#: ../lib/inet6_gr.c:165
+++#: ../lib/inet6_gr.c:157
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State            Stale(sec) Delete(sec)\n"
++@@ -2009,31 +2415,38 @@ msgstr ""
++ "Mitu Olek            Stale(sec) Delete(sec)\n"
++ 
++ #: ../lib/inet6_sr.c:46
+++#, c-format
++ msgid "Usage: inet6_route [-vF] del Target\n"
++ msgstr "Kasutamine: route [-vF] del AADRESS\n"
++ 
++ #: ../lib/inet6_sr.c:47
+++#, c-format
++ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
++ msgstr ""
++ "            route [-vF] add AADRESS [gw GW] [metric M] [[dev] LIIDES]\n"
++ 
++ #: ../lib/inet6_sr.c:48
+++#, c-format
++ msgid "       inet6_route [-FC] flush      NOT supported\n"
++ msgstr "            route [-FC] flush      Seda EI toetata\n"
++ 
++ #: ../lib/inet6_sr.c:188
+++#, c-format
++ msgid "Flushing `inet6' routing table not supported\n"
++ msgstr "`inet6' ruutingutabeli tühjendamist ei toetata\n"
++ 
++ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
++ msgid "INET (IPv4) not configured in this system.\n"
++ msgstr "INET (IPv4) pole antud süsteemis konfigureeritud\n"
++ 
++ #: ../lib/inet_gr.c:53
+++#, c-format
++ msgid "Kernel IP routing table\n"
++ msgstr "Tuuma IP ruutingutabel\n"
++ 
++ #: ../lib/inet_gr.c:56
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2042,6 +2455,7 @@ msgstr ""
++ "Liides\n"
++ 
++ #: ../lib/inet_gr.c:59
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
++ "Iface\n"
++@@ -2050,6 +2464,7 @@ msgstr ""
++ "Liides\n"
++ 
++ #: ../lib/inet_gr.c:62
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt\n"
++@@ -2058,10 +2473,12 @@ msgstr ""
++ "Liides   MSS   Aken   irtt\n"
++ 
++ #: ../lib/inet_gr.c:237
+++#, c-format
++ msgid "Kernel IP routing cache\n"
++ msgstr "Tuuma IP ruutingu puhver\n"
++ 
++ #: ../lib/inet_gr.c:258
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2070,6 +2487,7 @@ msgstr ""
++ "Liides\n"
++ 
++ #: ../lib/inet_gr.c:261
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags   MSS Window  irtt "
++ "Iface\n"
++@@ -2078,6 +2496,7 @@ msgstr ""
++ "Liides\n"
++ 
++ #: ../lib/inet_gr.c:266
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  HH  Arp\n"
++@@ -2086,6 +2505,7 @@ msgstr ""
++ "Liides   MSS    Aken  irtt  HH  Arp\n"
++ 
++ #: ../lib/inet_gr.c:290
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++@@ -2093,7 +2513,8 @@ msgstr ""
++ "Lähtepunkt      Sihtpunkt       Ruuter          Lipud Meetr  Mitu Kasut "
++ "Liides   MSS   Aken   irtt  TOS HHRef HHUptod     SpecDst\n"
++ 
++-#: ../lib/inet_sr.c:50
+++#: ../lib/inet_sr.c:51
+++#, c-format
++ msgid ""
++ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++@@ -2101,31 +2522,36 @@ msgstr ""
++ "Kasutamine: route [-vF] del {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric "
++ "M] [[dev] LIIDES]\n"
++ 
++-#: ../lib/inet_sr.c:51
+++#: ../lib/inet_sr.c:52
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
++ msgstr ""
++ "            route [-vF] add {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric "
++ "M]\n"
++ 
++-#: ../lib/inet_sr.c:52
+++#: ../lib/inet_sr.c:53
+++#, c-format
++ msgid ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ msgstr ""
++ "                              [netmask N] [mss MSS] [window W] [irtt I]\n"
++ 
++-#: ../lib/inet_sr.c:53
+++#: ../lib/inet_sr.c:54
+++#, c-format
++ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ msgstr "                              [mod] [dyn] [reinstate] [[dev] LIIDES]\n"
++ 
++-#: ../lib/inet_sr.c:54
+++#: ../lib/inet_sr.c:55
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
++ msgstr ""
++ "            route [-vF] add {-host|-net} AADRESS[/PREFIKS] [metric M] "
++ "reject\n"
++ 
++-#: ../lib/inet_sr.c:55
+++#: ../lib/inet_sr.c:56
+++#, c-format
++ msgid "       inet_route [-FC] flush      NOT supported\n"
++ msgstr "            route [-FC] flush      Seda EI toetata\n"
++ 
++@@ -2135,14 +2561,17 @@ msgid "route: %s: cannot use a NETWORK a
++ msgstr "route: %s: võrku ei saa kasutada ruuterina\n"
++ 
++ #: ../lib/inet_sr.c:174
+++#, c-format
++ msgid "route: Invalid MSS/MTU.\n"
++ msgstr "route: vigane MSS/MTU\n"
++ 
++ #: ../lib/inet_sr.c:187
+++#, c-format
++ msgid "route: Invalid window.\n"
++ msgstr "route: Vigane akna suurus\n"
++ 
++ #: ../lib/inet_sr.c:203
+++#, c-format
++ msgid "route: Invalid initial rtt.\n"
++ msgstr "route: vigane algne rtt\n"
++ 
++@@ -2157,75 +2586,92 @@ msgid "route: bogus netmask %s\n"
++ msgstr "route: vale võrgumask %s\n"
++ 
++ #: ../lib/inet_sr.c:270
+++#, c-format
++ msgid "route: netmask doesn't match route address\n"
++ msgstr "route: võrgumask ei sobi ruutingu aadressiga\n"
++ 
++ #: ../lib/inet_sr.c:306
+++#, c-format
++ msgid "Flushing `inet' routing table not supported\n"
++ msgstr "`inet' ruutingutabeli tühjendamist ei toetata\n"
++ 
++ #: ../lib/inet_sr.c:310
+++#, c-format
++ msgid "Modifying `inet' routing cache not supported\n"
++ msgstr "`inet' ruutingu puhvri muutmist ei toetata\n"
++ 
++ #: ../lib/ipx_gr.c:52
+++#, c-format
++ msgid "IPX not configured in this system.\n"
++ msgstr "IPX pole antud süsteemis konfigureeritud\n"
++ 
++ #: ../lib/ipx_gr.c:56
+++#, c-format
++ msgid "Kernel IPX routing table\n"
++ msgstr "Tuuma IPX ruutingutabel\n"
++ 
++ #. xxx
++ #: ../lib/ipx_gr.c:57
+++#, c-format
++ msgid "Destination               Router Net                Router Node\n"
++ msgstr "Sihtpunkt                 Ruuteri võrk              Ruuter ise\n"
++ 
++ #: ../lib/ipx_sr.c:33
+++#, c-format
++ msgid "IPX: this needs to be written\n"
++ msgstr "IPX osa vajab ümbertegemist\n"
++ 
++ #: ../lib/masq_info.c:198
+++#, c-format
++ msgid "IP masquerading entries\n"
++ msgstr "IP maskeerimise kirjed\n"
++ 
++ #: ../lib/masq_info.c:201
+++#, c-format
++ msgid "prot   expire source               destination          ports\n"
++ msgstr "Proto  Aegub  Lähtepunkt           Sihtpunkt            Pordid\n"
++ 
++ #: ../lib/masq_info.c:204
+++#, c-format
++ msgid ""
++-"prot   expire    initseq delta prevd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
++ msgstr ""
++-"Proto  Aegub     Initseq Delta Prevd Lähtepunkt           Sihtpunkt          "
++-"  Pordid\n"
+++"Proto  Aegub     Initseq Delta Prevd Lähtepunkt           "
+++"Sihtpunkt            Pordid\n"
++ 
++ #: ../lib/netrom_gr.c:48
+++#, c-format
++ msgid "NET/ROM not configured in this system.\n"
++ msgstr "NET/ROM pole antud süsteemis konfigureeritud\n"
++ 
++ #: ../lib/netrom_gr.c:51
+++#, c-format
++ msgid "Kernel NET/ROM routing table\n"
++ msgstr "Tuuma NET/ROM ruutingutabel\n"
++ 
++ #: ../lib/netrom_gr.c:52
+++#, c-format
++ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
++ msgstr "Sihtpunkt   Mnemoonika Kvaliteet Naaber    Liides\n"
++ 
++ #: ../lib/netrom_sr.c:34
+++#, c-format
++ msgid "netrom usage\n"
++ msgstr "netrom kasutus\n"
++ 
++ #: ../lib/netrom_sr.c:44
+++#, c-format
++ msgid "NET/ROM: this needs to be written\n"
++ msgstr "NET/ROM osa vajab ümbertegemist\n"
++ 
++ #: ../lib/ppp.c:44
+++#, c-format
++ msgid "You cannot start PPP with this program.\n"
++ msgstr "Sellest programmist ei saa PPP-d käivitada\n"
++ 
++ #: ../lib/ppp_ac.c:38
+++#, c-format
++ msgid "Sorry, use pppd!\n"
++ msgstr "Palun kasutage pppd'd\n"
++ 
++@@ -2234,287 +2680,314 @@ msgid "Node address must be ten digits"
++ msgstr "Sõlme aadress peab olema kümnekohaline"
++ 
++ #: ../lib/rose_gr.c:51
+++#, c-format
++ msgid "ROSE not configured in this system.\n"
++ msgstr "ROSE pole antud süsteemis konfigureeritud\n"
++ 
++ #: ../lib/rose_gr.c:54
+++#, c-format
++ msgid "Kernel ROSE routing table\n"
++ msgstr "Tuuma ROSE ruutingutabel\n"
++ 
++-#: ../lib/tr.c:70 ../lib/tr.c:85
+++#: ../lib/tr.c:86 ../lib/tr.c:101
++ #, c-format
++ msgid "in_tr(%s): invalid token ring address!\n"
++ msgstr "in_tr(%s): vigane token ring-aadress\n"
++ 
++-#: ../lib/tr.c:97
+++#: ../lib/tr.c:113
++ #, c-format
++ msgid "in_tr(%s): trailing : ignored!\n"
++ msgstr "in_tr(%s): ignoreerin lõpetavat koolonit\n"
++ 
++-#: ../lib/tr.c:109
+++#: ../lib/tr.c:125
++ #, c-format
++ msgid "in_tr(%s): trailing junk!\n"
++ msgstr "in_tr(%s): sodi lõpus\n"
++ 
++-#: ../lib/interface.c:164
+++#: ../lib/interface.c:176
++ #, c-format
++ msgid "warning: no inet socket available: %s\n"
++ msgstr "Hoiatus: `inet' sokleid ei ole: %s\n"
++ 
++-#: ../lib/interface.c:316
+++#: ../lib/interface.c:325
++ #, c-format
++ msgid "Warning: cannot open %s (%s). Limited output.\n"
++ msgstr "Hoiatus: ei saa avada faili %s (%s). Väljund on piiratud.\n"
++ 
++ #. Give better error message for this case.
++-#: ../lib/interface.c:556
+++#: ../lib/interface.c:571
++ msgid "Device not found"
++ msgstr "Liidest ei leitud"
++ 
++-#: ../lib/interface.c:560
+++#: ../lib/interface.c:575
++ #, c-format
++ msgid "%s: error fetching interface information: %s\n"
++ msgstr "%s: viga liidese info küsimisel: %s\n"
++ 
++-#: ../lib/interface.c:593
+++#: ../lib/interface.c:608
++ msgid "     - no statistics available -"
++ msgstr "     - statistikat ei ole      -"
++ 
++-#: ../lib/interface.c:597
+++#: ../lib/interface.c:612
+++#, c-format
++ msgid "[NO FLAGS]"
++ msgstr "[LIPPE POLE]"
++ 
++-#: ../lib/interface.c:673
+++#: ../lib/interface.c:688
++ #, c-format
++ msgid "%-9.9s Link encap:%s  "
++ msgstr "%-9.9s kapseldus:%s  "
++ 
++-#: ../lib/interface.c:678
+++#: ../lib/interface.c:693
++ #, c-format
++ msgid "HWaddr %s  "
++ msgstr "HWaddr %s  "
++ 
++-#: ../lib/interface.c:681
+++#: ../lib/interface.c:696
++ #, c-format
++ msgid "Media:%s"
++ msgstr "meedia:%s"
++ 
++-#: ../lib/interface.c:683
+++#: ../lib/interface.c:698
+++#, c-format
++ msgid "(auto)"
++ msgstr "(auto)"
++ 
++-#: ../lib/interface.c:690
+++#: ../lib/interface.c:705
++ #, c-format
++ msgid "          %s addr:%s "
++ msgstr "          %s aadress:%s "
++ 
++-#: ../lib/interface.c:693
+++#: ../lib/interface.c:708
++ #, c-format
++ msgid " P-t-P:%s "
++ msgstr " P-t-P:%s "
++ 
++-#: ../lib/interface.c:696
+++#: ../lib/interface.c:711
++ #, c-format
++ msgid " Bcast:%s "
++ msgstr " bcast:%s "
++ 
++-#: ../lib/interface.c:698
+++#: ../lib/interface.c:713
++ #, c-format
++ msgid " Mask:%s\n"
++ msgstr " mask:%s\n"
++ 
++-#: ../lib/interface.c:715
+++#: ../lib/interface.c:730
++ #, c-format
++ msgid "          inet6 addr: %s/%d"
++ msgstr "          inet6 aadr: %s/%d"
++ 
++-#: ../lib/interface.c:717
+++#: ../lib/interface.c:732
+++#, c-format
++ msgid " Scope:"
++ msgstr " skoop:"
++ 
++-#: ../lib/interface.c:720
+++#: ../lib/interface.c:735
+++#, c-format
++ msgid "Global"
++ msgstr "globaalne"
++ 
++-#: ../lib/interface.c:723
+++#: ../lib/interface.c:738
+++#, c-format
++ msgid "Link"
++ msgstr "ühendus"
++ 
++-#: ../lib/interface.c:726
+++#: ../lib/interface.c:741
+++#, c-format
++ msgid "Site"
++ msgstr "site"
++ 
++-#: ../lib/interface.c:729
+++#: ../lib/interface.c:744
+++#, c-format
++ msgid "Compat"
++ msgstr "ühilduvus"
++ 
++-#: ../lib/interface.c:732
+++#: ../lib/interface.c:747
+++#, c-format
++ msgid "Host"
++ msgstr "host"
++ 
++-#: ../lib/interface.c:735
+++#: ../lib/interface.c:750
+++#, c-format
++ msgid "Unknown"
++ msgstr "tundmatu"
++ 
++-#: ../lib/interface.c:750
+++#: ../lib/interface.c:765
++ #, c-format
++ msgid "          IPX/Ethernet II addr:%s\n"
++ msgstr "          IPX/Ethernet II aadr:%s\n"
++ 
++-#: ../lib/interface.c:753
+++#: ../lib/interface.c:768
++ #, c-format
++ msgid "          IPX/Ethernet SNAP addr:%s\n"
++ msgstr "          IPX/Ethernet SNAP aadr:%s\n"
++ 
++-#: ../lib/interface.c:756
+++#: ../lib/interface.c:771
++ #, c-format
++ msgid "          IPX/Ethernet 802.2 addr:%s\n"
++ msgstr "          IPX/Ethernet 802.2 aadr:%s\n"
++ 
++-#: ../lib/interface.c:759
+++#: ../lib/interface.c:774
++ #, c-format
++ msgid "          IPX/Ethernet 802.3 addr:%s\n"
++ msgstr "          IPX/Ethernet 802.3 aadr:%s\n"
++ 
++-#: ../lib/interface.c:769
+++#: ../lib/interface.c:784
++ #, c-format
++ msgid "          EtherTalk Phase 2 addr:%s\n"
++ msgstr "          EtherTalk Phase 2 aadr:%s\n"
++ 
++-#: ../lib/interface.c:778
+++#: ../lib/interface.c:793
++ #, c-format
++ msgid "          econet addr:%s\n"
++ msgstr "          econeti aadr:%s\n"
++ 
++-#: ../lib/interface.c:785
+++#: ../lib/interface.c:800
+++#, c-format
++ msgid "[NO FLAGS] "
++ msgstr "[LIPPE POLE]"
++ 
++-#: ../lib/interface.c:787
+++#: ../lib/interface.c:802
+++#, c-format
++ msgid "UP "
++ msgstr "UP "
++ 
++-#: ../lib/interface.c:789
+++#: ../lib/interface.c:804
+++#, c-format
++ msgid "BROADCAST "
++ msgstr "BROADCAST "
++ 
++-#: ../lib/interface.c:791
+++#: ../lib/interface.c:806
+++#, c-format
++ msgid "DEBUG "
++ msgstr "DEBUG "
++ 
++-#: ../lib/interface.c:793
+++#: ../lib/interface.c:808
+++#, c-format
++ msgid "LOOPBACK "
++ msgstr "LOOPBACK "
++ 
++-#: ../lib/interface.c:795
+++#: ../lib/interface.c:810
+++#, c-format
++ msgid "POINTOPOINT "
++ msgstr "POINTOPOINT "
++ 
++-#: ../lib/interface.c:797
+++#: ../lib/interface.c:812
+++#, c-format
++ msgid "NOTRAILERS "
++ msgstr "NOTRAILERS "
++ 
++-#: ../lib/interface.c:799
+++#: ../lib/interface.c:814
+++#, c-format
++ msgid "RUNNING "
++ msgstr "RUNNING "
++ 
++-#: ../lib/interface.c:801
+++#: ../lib/interface.c:816
+++#, c-format
++ msgid "NOARP "
++ msgstr "NOARP "
++ 
++-#: ../lib/interface.c:803
+++#: ../lib/interface.c:818
+++#, c-format
++ msgid "PROMISC "
++ msgstr "PROMISC "
++ 
++-#: ../lib/interface.c:805
+++#: ../lib/interface.c:820
+++#, c-format
++ msgid "ALLMULTI "
++ msgstr "ALLMULTI "
++ 
++-#: ../lib/interface.c:807
+++#: ../lib/interface.c:822
+++#, c-format
++ msgid "SLAVE "
++ msgstr "SLAVE "
++ 
++-#: ../lib/interface.c:809
+++#: ../lib/interface.c:824
+++#, c-format
++ msgid "MASTER "
++ msgstr "MASTER "
++ 
++-#: ../lib/interface.c:811
+++#: ../lib/interface.c:826
+++#, c-format
++ msgid "MULTICAST "
++ msgstr "MULTICAST "
++ 
++-#: ../lib/interface.c:814
+++#: ../lib/interface.c:829
+++#, c-format
++ msgid "DYNAMIC "
++ msgstr "DYNAMIC "
++ 
++ #. DONT FORGET TO ADD THE FLAGS IN ife_print_short
++-#: ../lib/interface.c:817
+++#: ../lib/interface.c:832
++ #, c-format
++ msgid " MTU:%d  Metric:%d"
++ msgstr " MTU:%d meetrika:%d"
++ 
++-#: ../lib/interface.c:821
+++#: ../lib/interface.c:836
++ #, c-format
++ msgid "  Outfill:%d  Keepalive:%d"
++ msgstr "  ülalhoidepakettide intervall:%d  ülalhoidetaimaut:%d"
++ 
++-#: ../lib/interface.c:835
+++#: ../lib/interface.c:850
++ #, c-format
++ msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
++ msgstr "RX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu kaadri vigu:%lu\n"
++ 
++-#: ../lib/interface.c:840
+++#: ../lib/interface.c:855
++ #, c-format
++ msgid "             compressed:%lu\n"
++ msgstr "             pakitud:%lu\n"
++ 
++-#: ../lib/interface.c:852
+++#: ../lib/interface.c:895
++ #, c-format
++ msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
++ msgstr "TX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu carrier:%lu\n"
++ 
++-#: ../lib/interface.c:856
+++#: ../lib/interface.c:899
++ #, c-format
++ msgid "          collisions:%lu "
++ msgstr "          kollisioone:%lu "
++ 
++-#: ../lib/interface.c:858
+++#: ../lib/interface.c:901
++ #, c-format
++ msgid "compressed:%lu "
++ msgstr "pakitud:%lu "
++ 
++-#: ../lib/interface.c:860
+++#: ../lib/interface.c:903
++ #, c-format
++ msgid "txqueuelen:%d "
++ msgstr "txqueuelen:%d "
++ 
++-#: ../lib/interface.c:862
+++#: ../lib/interface.c:905
++ #, c-format
++ msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
++ msgstr "RX baite:%llu (%lu.%lu %s)  TX baite:%llu (%lu.%lu %s)\n"
++ 
++-#: ../lib/interface.c:873
+++#: ../lib/interface.c:916
++ #, c-format
++ msgid "Interrupt:%d "
++ msgstr "katkestus:%d "
++ 
++ #. Only print devices using it for
++ #. I/O maps
++-#: ../lib/interface.c:876
+++#: ../lib/interface.c:919
++ #, c-format
++ msgid "Base address:0x%x "
++ msgstr "baasaadress:0x%x "
++ 
++-#: ../lib/interface.c:878
+++#: ../lib/interface.c:921
++ #, c-format
++ msgid "Memory:%lx-%lx "
++ msgstr "mälu:%lx-%lx "
++ 
++-#: ../lib/interface.c:881
+++#: ../lib/interface.c:924
++ #, c-format
++ msgid "DMA chan:%x "
++ msgstr "DMA kanal:%x "
++ 
++ #: ../lib/sockets.c:63
+++#, c-format
++ msgid "No usable address families found.\n"
++ msgstr "Ei leidnud ühtegi kasutatavat aadressiperekonda\n"
++ 
++@@ -2538,29 +3011,32 @@ msgstr "iptunnel: %s on vigane IPv4 aadr
++ msgid "ip: argument is wrong: %s\n"
++ msgstr "iptunnel: vale argument %s\n"
++ 
++-#: ../ipmaddr.c:58
+++#: ../ipmaddr.c:61
+++#, c-format
++ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
++ msgstr "Kasutamine: ipmaddr [ add | del ] MULTIAADR dev STRING\n"
++ 
++-#: ../ipmaddr.c:59
+++#: ../ipmaddr.c:62
+++#, c-format
++ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ msgstr "            ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ 
++-#: ../ipmaddr.c:60
+++#: ../ipmaddr.c:63
+++#, c-format
++ msgid "       ipmaddr -V | -version\n"
++ msgstr "            ipmaddr -V | -version\n"
++ 
++-#: ../ipmaddr.c:260
+++#: ../ipmaddr.c:263
++ #, c-format
++ msgid "family %d "
++ msgstr "perekond %d "
++ 
++-#: ../ipmaddr.c:269
+++#: ../ipmaddr.c:272
++ #, c-format
++ msgid " users %d"
++ msgstr " kasutajaid %d"
++ 
++-#: ../ipmaddr.c:355
+++#: ../ipmaddr.c:358
++ msgid "Cannot create socket"
++ msgstr "Ei saa avada soklit"
++ 
++@@ -2575,6 +3051,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
++ msgstr "slattach: tty_lock: (%s): %s\n"
++ 
++ #: ../slattach.c:192
+++#, c-format
++ msgid "slattach: cannot write PID file\n"
++ msgstr "slattach: ei saa PID faili kirjutada\n"
++ 
++@@ -2594,18 +3071,22 @@ msgid "slattach: tty_hangup(RAISE): %s\n
++ msgstr "slattach: tty_hangup(RAISE): %s\n"
++ 
++ #: ../slattach.c:468
+++#, c-format
++ msgid "slattach: tty name too long\n"
++ msgstr "slattach: terminali nimi on liiga pikk\n"
++ 
++ #: ../slattach.c:498
+++#, c-format
++ msgid "slattach: tty_open: cannot get current state!\n"
++ msgstr "slattach: tty_open: ei saa lugeda jooksvat olekut\n"
++ 
++ #: ../slattach.c:505
+++#, c-format
++ msgid "slattach: tty_open: cannot get current line disc!\n"
++ msgstr "slattach: tty_open: liiniprotokolli küsimine ebaõnnestus\n"
++ 
++ #: ../slattach.c:513
+++#, c-format
++ msgid "slattach: tty_open: cannot set RAW mode!\n"
++ msgstr "slattach: tty_open: ei saa seada RAW moodi\n"
++ 
++@@ -2615,6 +3096,7 @@ msgid "slattach: tty_open: cannot set %s
++ msgstr "slattach: tty_open: ei saa seada kiiruseks %s bps\n"
++ 
++ #: ../slattach.c:530
+++#, c-format
++ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
++ msgstr "slattach: tty_open: ei saa seada 8N1 moodi\n"
++ 
++@@ -2637,3 +3119,20 @@ msgstr " pordil %s"
++ #, c-format
++ msgid " interface %s\n"
++ msgstr " liides %s\n"
+++
+++#~ msgid ""
+++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
+++#~ "<-''-\n"
+++#~ msgstr ""
+++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [netmask <nm>] "
+++#~ "pub\n"
+++
+++#~ msgid "%s: unknown interface: %s\n"
+++#~ msgstr "ifconfig: tundmatu liides %s: %s\n"
+++
+++#~ msgid "        -n, --numeric            dont resolve names\n"
+++#~ msgstr ""
+++#~ "        -n, --numeric            mitte lahendada numbreid nimedeks\n"
+++
+++#~ msgid "Routing table for `ddp' not yet supported.\n"
+++#~ msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n"
++Index: net-tools/po/cs.po
++===================================================================
++--- net-tools.orig/po/cs.po
+++++ net-tools/po/cs.po
++@@ -5,7 +5,8 @@
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: net-tools-1.51\n"
++-"POT-Creation-Date: 2000-02-14 02:31+0100\n"
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
++ "PO-Revision-Date: 1999-08-29 23:20+0200\n"
++ "Last-Translator: Jiøí Pavlovský <pavlovsk@ff.cuni.cz>\n"
++ "Language-Team: Czech <cs@li.org>\n"
++@@ -13,96 +14,110 @@ msgstr ""
++ "Content-Type: text/plain; charset=iso-8859-2\n"
++ "Content-Transfer-Encoding: 8bit\n"
++ 
++-#: ../arp.c:110 ../arp.c:269
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
++ msgid "arp: need host name\n"
++ msgstr "arp: je tøeba jméno poèítaèe\n"
++ 
++-#: ../arp.c:207 ../arp.c:221
+++#: ../arp.c:215 ../arp.c:230
++ #, c-format
++ msgid "No ARP entry for %s\n"
++ msgstr "Pro %s neexistuje ARP polo¾ka\n"
++ 
++-#: ../arp.c:239
+++#: ../arp.c:248
++ #, c-format
++ msgid "arp: cant get HW-Address for `%s': %s.\n"
++ msgstr "arp: HW adresu `%s' nelze zjistit: %s\n"
++ 
++-#: ../arp.c:243
+++#: ../arp.c:252
+++#, c-format
++ msgid "arp: protocol type mismatch.\n"
++ msgstr "arp: chybnì zadaný typ protokolu\n"
++ 
++-#: ../arp.c:252
+++#: ../arp.c:261
++ #, c-format
++ msgid "arp: device `%s' has HW address %s `%s'.\n"
++ msgstr "arp: zaøízení `%s' má Hw adresu %s `%s'.\n"
++ 
++-#: ../arp.c:282
+++#: ../arp.c:293
+++#, c-format
++ msgid "arp: need hardware address\n"
++ msgstr "arp: je tøeba hardwarová adresa\n"
++ 
++-#: ../arp.c:290
+++#: ../arp.c:301
+++#, c-format
++ msgid "arp: invalid hardware address\n"
++ msgstr "arp: nesprávná hardwarová adresa\n"
++ 
++-#: ../arp.c:387
+++#: ../arp.c:398
++ #, c-format
++ msgid "arp: cannot open etherfile %s !\n"
++ msgstr "arp: databázi ethernetových adres %s nelze otevøít!\n"
++ 
++-#: ../arp.c:403
+++#: ../arp.c:414
++ #, c-format
++ msgid "arp: format error on line %u of etherfile %s !\n"
++ msgstr "arp: syntaktická chyba na øádku %u databáze ethernetových adres %s!\n"
++ 
++-#: ../arp.c:416
+++#: ../arp.c:427
++ #, c-format
++ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
++ msgstr ""
++ "arp: polo¾ku na øádku %u databáze ethernetových adres %s nelze nastavit!\n"
++ 
++-#: ../arp.c:437
++-msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
+++#: ../arp.c:448
+++#, fuzzy, c-format
+++msgid ""
+++"Address                  HWtype  HWaddress           Flags Mask            "
+++"Iface\n"
++ msgstr "Adresa\t\t\t HWtyp\t HWadresa\t     Pøíz  Maska\t\t   Rozhraní\n"
++ 
++-#: ../arp.c:467
+++#: ../arp.c:476
+++#, fuzzy
+++msgid "<from_interface>"
+++msgstr " rozhraní %s\n"
+++
+++#: ../arp.c:478
++ msgid "(incomplete)"
++ msgstr "(nekompletní)"
++ 
++-#: ../arp.c:484
+++#: ../arp.c:495
++ #, c-format
++ msgid "%s (%s) at "
++ msgstr "%s (%s) na "
++ 
++-#: ../arp.c:490
+++#: ../arp.c:501
+++#, c-format
++ msgid "<incomplete> "
++ msgstr "<nekompletní>"
++ 
++-#: ../arp.c:496
+++#: ../arp.c:507
++ #, c-format
++ msgid "netmask %s "
++ msgstr "sí»ová maska %s "
++ 
++-#: ../arp.c:513
+++#: ../arp.c:524
++ #, c-format
++ msgid "on %s\n"
++ msgstr "na %s\n"
++ 
++-#: ../arp.c:592
+++#: ../arp.c:605
++ #, c-format
++ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
++ msgstr "Polo¾ky: %d\tVynecháno: %d\tNalezeno: %d\n"
++ 
++-#: ../arp.c:596
+++#: ../arp.c:609
++ #, c-format
++ msgid "%s (%s) -- no entry\n"
++ msgstr "%s (%s) -- ¾ádná polo¾ka\n"
++ 
++-#: ../arp.c:598
+++#: ../arp.c:611
++ #, c-format
++ msgid "arp: in %d entries no match found.\n"
++ msgstr "arp: ¾ádná z polo¾ek (%d) nevyhovuje.\n"
++ 
++-#: ../arp.c:613
+++#: ../arp.c:626
+++#, c-format
++ msgid ""
++ "Usage:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
++@@ -112,49 +127,46 @@ msgstr ""
++ "  arp [-vn]  [<HW>] [-i <if> [-a] [<poèítaè>]             <-Zobrazí ARP "
++ "cache\n"
++ 
++-#: ../arp.c:614
+++#: ../arp.c:627
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
++ "entry\n"
++ msgstr ""
++ "  arp [-v]          [-i <if>] -d <poèítaè> [pub][nopub]   <-Sma¾e polo¾ku "
++ "ARP\n"
++ 
++-#: ../arp.c:615
++-#, fuzzy
+++#: ../arp.c:628
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
++ "file\n"
++ msgstr ""
++ "  arp [-vnD] [<HW>] [-i <if>] -f <soubor>                 <-Pøidá polo¾ku "
++ "ze\n"
++ "                                                          souboru\n"
++ 
++-#: ../arp.c:616
+++#: ../arp.c:629
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
++ "entry\n"
++ msgstr ""
++ "  arp [-v]   [<HW> [-i <if> -s   <poèítaè> <hwadr> [temp][nopub] <-Pøidá "
++ "polo¾ku\n"
++ 
++-#: ../arp.c:617
++-msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
++-"<-''-\n"
++-msgstr ""
++-"  arp [-v]   [<HW>] [-i <if>] -s <soubor> <hwadr> [sí»mask <èís>]  <-''-\n"
++-
++-#: ../arp.c:618
+++#: ../arp.c:630
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
++ "<-''-\n"
++ "\n"
++ msgstr ""
++ "  arp [-v]   [<HW> [-i <if> -Ds  <poèítaè> <if> [sí»mask <èís>] pub      "
++ "<-''-\n"
++ 
++-#: ../arp.c:620
+++#: ../arp.c:632
+++#, c-format
++ msgid ""
++ "        -a                       display (all) hosts in alternative (BSD) "
++ "style\n"
++@@ -162,126 +174,134 @@ msgstr ""
++ "        -a                       zobrazí jmna v¹ech poèítaèù alternativním\n"
++ "                                 (BSD) zpùsobem\n"
++ 
++-#: ../arp.c:621
+++#: ../arp.c:633
+++#, c-format
++ msgid "        -s, --set                set a new ARP entry\n"
++ msgstr "        -s, --set                nastaví novou ARP polo¾ku\n"
++ 
++-#: ../arp.c:622
+++#: ../arp.c:634
+++#, c-format
++ msgid "        -d, --delete             delete a specified entry\n"
++ msgstr "        -d, --delete             sma¾e zadanou ARP polo¾ku\n"
++ 
++-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
++ msgid "        -v, --verbose            be verbose\n"
++ msgstr ""
++ "        -v, --verbose            bude vypisovat podrobné zprávy\n"
++ "                                 o èinnosti\n"
++ 
++-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
++-msgid "        -n, --numeric            dont resolve names\n"
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, fuzzy, c-format
+++msgid "        -n, --numeric            don't resolve names\n"
++ msgstr ""
++ "        -n, --numeric            nebude pøevádìt èíselné adresy\n"
++ "                                 na kanonická jména\n"
++ 
++-#: ../arp.c:625
+++#: ../arp.c:637
+++#, c-format
++ msgid ""
++ "        -i, --device             specify network interface (e.g. eth0)\n"
++ msgstr "        -i, --device             zadává sí»ové rozhraní (napø. eth0)\n"
++ 
++-#: ../arp.c:626
+++#: ../arp.c:638
+++#, c-format
++ msgid "        -D, --use-device         read <hwaddr> from given device\n"
++ msgstr "        -D, --use-device         ète <hwadr> ze zadaného zaøízení\n"
++ 
++-#: ../arp.c:627
++-#, fuzzy
+++#: ../arp.c:639
+++#, fuzzy, c-format
++ msgid "        -A, -p, --protocol       specify protocol family\n"
++ msgstr "         -r, --route              vypí¹e smìrovací tabulku\n"
++ 
++-#: ../arp.c:628
++-#, fuzzy
+++#: ../arp.c:640
+++#, fuzzy, c-format
++ msgid ""
++-"        -f, --file               read new entries from file or from "
++-"/etc/ethers\n"
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
++ "\n"
++ msgstr ""
++ "        -f, --file               ète nové polo¾ky ze souboru\n"
++ "\n"
++ 
++-#: ../arp.c:630 ../rarp.c:181
+++#: ../arp.c:642 ../rarp.c:182
++ #, c-format
++ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
++ msgstr ""
++ "  <HW>=Pou¾ijte '-H <hw> pro zadání hardwarového typu adresy.\n"
++ "  Implicitnì: %s\n"
++ 
++-#: ../arp.c:631 ../rarp.c:182
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
++ msgid "  List of possible hardware types (which support ARP):\n"
++ msgstr "  Seznam mo¾ných hardwarových typù (podporujících ARP):\n"
++ 
++-#: ../arp.c:664
+++#: ../arp.c:677 ../arp.c:762
++ #, c-format
++ msgid "%s: hardware type not supported!\n"
++ msgstr "hardwarový typ %s není podporován!\n"
++ 
++-#: ../arp.c:668
+++#: ../arp.c:681
++ #, c-format
++ msgid "%s: address family not supported!\n"
++ msgstr "tøída adres %s není podporována!\n"
++ 
++-#: ../arp.c:703
+++#: ../arp.c:716
+++#, c-format
++ msgid "arp: -N not yet supported.\n"
++ msgstr "arp: pøepínaè -N není zatím podporován\n"
++ 
++-#: ../arp.c:713
+++#: ../arp.c:726
++ #, c-format
++ msgid "arp: %s: unknown address family.\n"
++ msgstr "arp: neznámá tøída adres %s.\n"
++ 
++-#: ../arp.c:722
+++#: ../arp.c:735
++ #, c-format
++ msgid "arp: %s: unknown hardware type.\n"
++ msgstr "arp: neznámý hardwarový typ %s.\n"
++ 
++-#: ../arp.c:741
+++#: ../arp.c:754
++ #, c-format
++ msgid "arp: %s: kernel only supports 'inet'.\n"
++ msgstr "arp: %s: jádro podporuje pouze 'inet'.\n"
++ 
++-#: ../arp.c:746
+++#: ../arp.c:767
++ #, c-format
++ msgid "arp: %s: hardware type without ARP support.\n"
++ msgstr "arp: hardwarový typ %s nepodporuje ARP.\n"
++ 
++-#: ../hostname.c:69
+++#: ../hostname.c:71
++ #, c-format
++ msgid "Setting nodename to `%s'\n"
++ msgstr "Nastavuji jméno uzlu na `%s'\n"
++ 
++-#: ../hostname.c:74
+++#: ../hostname.c:76
++ #, c-format
++ msgid "%s: you must be root to change the node name\n"
++ msgstr "%s: jméno uzlu mù¾e zmìnit pouze superu¾ivatel\n"
++ 
++-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
++ #, c-format
++ msgid "%s: name too long\n"
++ msgstr "jméno %s je pøíli¹ dlouhé\n"
++ 
++-#: ../hostname.c:89
+++#: ../hostname.c:91
++ #, c-format
++ msgid "Setting hostname to `%s'\n"
++ msgstr "Nastavuji jméno poèítaèe na `%s'\n"
++ 
++-#: ../hostname.c:94
+++#: ../hostname.c:96
++ #, c-format
++ msgid "%s: you must be root to change the host name\n"
++ msgstr "%s: jméno poèítaèe mù¾e zmìnit pouze superu¾ivatel\n"
++ 
++-#: ../hostname.c:108
+++#: ../hostname.c:109
++ #, c-format
++ msgid "Setting domainname to `%s'\n"
++ msgstr "Nastavuji jméno domény na `%s'\n"
++ 
++-#: ../hostname.c:113
+++#: ../hostname.c:114
++ #, c-format
++ msgid "%s: you must be root to change the domain name\n"
++ msgstr "%s: jméno domény mù¾e zmìnit pouze superu¾ivatel\n"
++@@ -306,26 +326,29 @@ msgstr "Výsledek: h_aliases=`%s'\n"
++ msgid "Result: h_addr_list=`%s'\n"
++ msgstr "Výsledek: h_addr_list=`%s'\n"
++ 
++-#: ../hostname.c:209
+++#: ../hostname.c:208
++ #, c-format
++ msgid "%s: can't open `%s'\n"
++ msgstr "%s: `%s' nelze otevøít\n"
++ 
++-#: ../hostname.c:223
+++#: ../hostname.c:222
+++#, c-format
++ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
++ msgstr ""
++ "Pou¾ití:\n"
++ "    hostname [-v] {jméno|-F soubor}       nastaví jméno poèítaèe (ze "
++ "souboru)\n"
++ 
++-#: ../hostname.c:224
+++#: ../hostname.c:223
+++#, c-format
++ msgid ""
++ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
++ msgstr ""
++ "    domainname [-v] {jméno|-F soubor}     nastaví jméno NIS domény (ze\n"
++ "                                          souboru)\n"
++ 
++-#: ../hostname.c:226
+++#: ../hostname.c:225
+++#, c-format
++ msgid ""
++ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
++ "file)\n"
++@@ -333,11 +356,13 @@ msgstr ""
++ "    nodename [-v] {jméno|-F soubor}       nastaví jméno DECnet uzlu (ze\n"
++ "                                          souboru)\n"
++ 
++-#: ../hostname.c:228
+++#: ../hostname.c:227
+++#, c-format
++ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
++ msgstr "    hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  vypí¹e formátované jméno\n"
++ 
++-#: ../hostname.c:229
+++#: ../hostname.c:228
+++#, c-format
++ msgid ""
++ "       hostname [-v]                         display hostname\n"
++ "\n"
++@@ -345,7 +370,8 @@ msgstr ""
++ "    hostname [-v]                         vypí¹e jméno poèítaèe\n"
++ "\n"
++ 
++-#: ../hostname.c:230
+++#: ../hostname.c:229
+++#, c-format
++ msgid ""
++ "       hostname -V|--version|-h|--help       print info and exit\n"
++ "\n"
++@@ -353,7 +379,8 @@ msgstr ""
++ "    hostname -V|--version|-h|--help       vypí¹e informace a skonèí\n"
++ "\n"
++ 
++-#: ../hostname.c:231
+++#: ../hostname.c:230
+++#, c-format
++ msgid ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++@@ -361,35 +388,43 @@ msgstr ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++ 
++-#: ../hostname.c:232
+++#: ../hostname.c:231
+++#, c-format
++ msgid "    -s, --short           short host name\n"
++ msgstr "    -s, --short           krátké jméno poèítaèe\n"
++ 
++-#: ../hostname.c:233
+++#: ../hostname.c:232
+++#, c-format
++ msgid "    -a, --alias           alias names\n"
++ msgstr "    -a, --alias           pøezdívky\n"
++ 
++-#: ../hostname.c:234
+++#: ../hostname.c:233
+++#, c-format
++ msgid "    -i, --ip-address      addresses for the hostname\n"
++ msgstr "    -i, --ip-address      adresy odpovídající jménu poèítaèe\n"
++ 
++-#: ../hostname.c:235
+++#: ../hostname.c:234
+++#, c-format
++ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
++ msgstr "    -f, --fqdn, --long    dlouhé jméno poèítaèe (kanonické)\n"
++ 
++-#: ../hostname.c:236
+++#: ../hostname.c:235
+++#, c-format
++ msgid "    -d, --domain          DNS domain name\n"
++ msgstr "    -d, --domain          jméno DNS domény\n"
++ 
++-#: ../hostname.c:237
+++#: ../hostname.c:236
+++#, c-format
++ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
++ msgstr "    -y, --yp, --nis       jméno NIS/YP domény\n"
++ 
++-#: ../hostname.c:239
+++#: ../hostname.c:238
+++#, c-format
++ msgid "    -n, --node            DECnet node name\n"
++ msgstr "    -n, --node            jméno DECnet uzlu\n"
++ 
++-#: ../hostname.c:241
+++#: ../hostname.c:240
+++#, c-format
++ msgid ""
++ "    -F, --file            read hostname or NIS domainname from given file\n"
++ "\n"
++@@ -397,7 +432,8 @@ msgstr ""
++ "    -F, --file            ète jméno poèítaèe èi nis domény ze souboru\n"
++ "\n"
++ 
++-#: ../hostname.c:243
+++#: ../hostname.c:242
+++#, c-format
++ msgid ""
++ "   This command can read or set the hostname or the NIS domainname. You can\n"
++ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
++@@ -412,6 +448,7 @@ msgid "%s: You can't change the DNS doma
++ msgstr "%s: Tímto pøíkazem nelze DNS jméno domény zmìnit\n"
++ 
++ #: ../hostname.c:339
+++#, c-format
++ msgid ""
++ "\n"
++ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
++@@ -421,6 +458,7 @@ msgstr ""
++ "zmìnit\n"
++ 
++ #: ../hostname.c:340
+++#, c-format
++ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
++ msgstr ""
++ "DNS jméno domény (je souèástí kanonického jména poèítaèe) v souboru\n"
++@@ -441,349 +479,223 @@ msgstr "getdomainname()=`%s'\n"
++ msgid "getnodename()=`%s'\n"
++ msgstr "getnodename()=`%s'\n"
++ 
++-#: ../ifconfig.c:159
++-#, c-format
++-msgid "%-9.9s Link encap:%s  "
++-msgstr "%-9.9s Zapouzdøení:%s  "
+++#: ../ifconfig.c:107
+++#, fuzzy, c-format
+++msgid ""
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Flg\n"
+++msgstr ""
+++"Rozhr   MTU Met    PØ-OK PØ-CHYB PØ-ZAH PØ-PØT   OD-OK OD-CHYB OD-ZAH OD-PØT "
+++"PØZ\n"
++ 
++-#: ../ifconfig.c:164
++-#, c-format
++-msgid "HWaddr %s  "
++-msgstr "HWadr %s  "
+++#: ../ifconfig.c:129 ../ifconfig.c:161
+++#, fuzzy, c-format
+++msgid "%s: ERROR while getting interface flags: %s\n"
+++msgstr "%s: chyba pøi získávání informací o rozhraní %s\n"
++ 
++-#: ../ifconfig.c:167
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
++ #, c-format
++-msgid "Media:%s"
++-msgstr "Médium:%s"
+++msgid "No support for INET on this system.\n"
+++msgstr "Tento systém nepodporuje INET.\n"
++ 
++-#: ../ifconfig.c:169
++-msgid "(auto)"
++-msgstr "(auto)"
+++#: ../ifconfig.c:193
+++#, fuzzy, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr "%s: chyba pøi získávání informací o rozhraní %s\n"
++ 
++-#: ../ifconfig.c:176
++-#, c-format
++-msgid "          %s addr:%s "
++-msgstr "          %s adr:%s "
+++#: ../ifconfig.c:202
+++#, fuzzy, c-format
+++msgid ""
+++"Usage:\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++msgstr ""
+++"Pou¾ití:\n"
+++"  ifconfig [-a] [-i] [-v] <rozhraní> [[<AF>] <adresa>]\n"
++ 
++-#: ../ifconfig.c:179
+++#: ../ifconfig.c:204
++ #, c-format
++-msgid " P-t-P:%s "
++-msgstr " P-t-P:%s "
+++msgid "  [add <address>[/<prefixlen>]]\n"
+++msgstr "  [add <adresa>[/<délka prefixu>]]\n"
++ 
++-# V ostatních katalozích se pøekládá Broadcast -> v¹esmìrové vysílání.
++-# Tudi¾ bcast -> V¹esmìr :)
++-#: ../ifconfig.c:182
+++#: ../ifconfig.c:205
++ #, c-format
++-msgid " Bcast:%s "
++-msgstr " V¹esmìr:%s "
+++msgid "  [del <address>[/<prefixlen>]]\n"
+++msgstr "  [del <adresa>[/<délka prefixu>]]\n"
++ 
++-#: ../ifconfig.c:184
+++#: ../ifconfig.c:206
++ #, c-format
++-msgid " Mask:%s\n"
++-msgstr "Maska:%s\n"
+++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
+++msgstr "  [[-]broadcast [<adresa>]]  [[-]pointopoint [<adresa>]]\n"
++ 
++-#: ../ifconfig.c:201
+++#: ../ifconfig.c:207
++ #, c-format
++-msgid "          inet6 addr: %s/%d"
++-msgstr "          inet6-adr: %s/%d"
+++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
+++msgstr "  [netmask <adresa>]  [dstaddr <adresa>]  [tunnel <adresa>]\n"
++ 
++-#: ../ifconfig.c:203
++-msgid " Scope:"
++-msgstr " Rozsah:"
+++#: ../ifconfig.c:210
+++#, c-format
+++msgid "  [outfill <NN>] [keepalive <NN>]\n"
+++msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++ 
++-#: ../ifconfig.c:206
++-msgid "Global"
++-msgstr "Globál"
+++#: ../ifconfig.c:212
+++#, c-format
+++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
+++msgstr "  [hw <HW> <adresa>]  [metric <NN>]  [mtu <NN>]\n"
++ 
++-#: ../ifconfig.c:209
++-msgid "Link"
++-msgstr "Linka"
+++#: ../ifconfig.c:213
+++#, c-format
+++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ 
++-#: ../ifconfig.c:212
++-msgid "Site"
++-msgstr "Stanovi¹tì"
+++#: ../ifconfig.c:214
+++#, c-format
+++msgid "  [multicast]  [[-]promisc]\n"
+++msgstr "  [multicast]  [[-]promisc]\n"
++ 
++ #: ../ifconfig.c:215
++-msgid "Compat"
++-msgstr "Kompatibilita"
+++#, c-format
+++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
+++msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <typ>]\n"
++ 
++-#: ../ifconfig.c:218
++-msgid "Host"
++-msgstr "Poèítaè"
+++#: ../ifconfig.c:217
+++#, c-format
+++msgid "  [txqueuelen <NN>]\n"
+++msgstr "  [txqueuelen délka]\n"
++ 
++-#: ../ifconfig.c:221
++-msgid "Unknown"
++-msgstr "Neznám."
+++#: ../ifconfig.c:220
+++#, c-format
+++msgid "  [[-]dynamic]\n"
+++msgstr "  [[-]dynamic]\n"
++ 
++-#: ../ifconfig.c:236
+++#: ../ifconfig.c:222
++ #, c-format
++-msgid "          IPX/Ethernet II addr:%s\n"
++-msgstr "          IPX/Ethernet II adr: %s\n"
+++msgid ""
+++"  [up|down] ...\n"
+++"\n"
+++msgstr ""
+++"  [up|down] ...\n"
+++"\n"
++ 
++-#: ../ifconfig.c:239
+++#: ../ifconfig.c:224
++ #, c-format
++-msgid "          IPX/Ethernet SNAP addr:%s\n"
++-msgstr "          IPX/Ethernet SNAP adr:%s\n"
+++msgid "  <HW>=Hardware Type.\n"
+++msgstr "   <HW>=Hardwarový Typ.\n"
++ 
++-#: ../ifconfig.c:242
+++#: ../ifconfig.c:225
++ #, c-format
++-msgid "          IPX/Ethernet 802.2 addr:%s\n"
++-msgstr "          IPX/Ethernet 802.2 adr:%s\n"
+++msgid "  List of possible hardware types:\n"
+++msgstr "  Seznam mo¾ných hardwarových typù:\n"
++ 
++-#: ../ifconfig.c:245
+++#. 1 = ARPable
+++#: ../ifconfig.c:227
++ #, c-format
++-msgid "          IPX/Ethernet 802.3 addr:%s\n"
++-msgstr "          IPX/Ethernet 802.3 adr:%s\n"
+++msgid "  <AF>=Address family. Default: %s\n"
+++msgstr "   <AF>=tøída adres. Implicitní: %s\n"
++ 
++-#: ../ifconfig.c:255
+++#: ../ifconfig.c:228
++ #, c-format
++-msgid "          EtherTalk Phase 2 addr:%s\n"
++-msgstr "          EtherTalk Phase 2 adr:%s\n"
+++msgid "  List of possible address families:\n"
+++msgstr "  Seznam mo¾ných tøíd adres:\n"
++ 
++-#: ../ifconfig.c:264
+++#: ../ifconfig.c:303
++ #, c-format
++-msgid "          econet addr:%s\n"
++-msgstr "          econet adr:%s\n"
+++msgid "ifconfig: option `%s' not recognised.\n"
+++msgstr ""
++ 
++-# Hic sunt leones ...
++-#: ../ifconfig.c:270
++-msgid "[NO FLAGS] "
++-msgstr "[®ÁDNÉ PØÍZNAKY]"
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
+++msgid "ifconfig: `--help' gives usage information.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:272
++-msgid "UP "
++-msgstr "AKTIVOVÁNO "
+++#: ../ifconfig.c:380
+++#, c-format
+++msgid "Unknown media type.\n"
+++msgstr "Neznámý typ média.\n"
++ 
++-#: ../ifconfig.c:274
++-msgid "BROADCAST "
++-msgstr "V©ESMÌROVÉ_VYSÍLÁNÍ "
+++#: ../ifconfig.c:417
+++#, c-format
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:276
++-msgid "DEBUG "
++-msgstr "DEBUG "
+++#: ../ifconfig.c:429
+++#, c-format
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:278
++-msgid "LOOPBACK "
++-msgstr "SMYÈKA "
+++#: ../ifconfig.c:441
+++#, c-format
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:280
++-msgid "POINTOPOINT "
++-msgstr "POINTOPOINT "
+++#: ../ifconfig.c:465
+++#, c-format
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
+++msgstr ""
++ 
++-# ??
++-#: ../ifconfig.c:282
++-msgid "NOTRAILERS "
++-msgstr "NOTRAILERS "
+++#: ../ifconfig.c:523
+++#, c-format
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:284
++-msgid "RUNNING "
++-msgstr "BÌ®Í "
+++#: ../ifconfig.c:652
+++#, c-format
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:286
++-msgid "NOARP "
++-msgstr "NEARP "
+++#: ../ifconfig.c:684
+++#, c-format
+++msgid "hw address type `%s' has no handler to set address. failed.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:288
++-msgid "PROMISC "
++-msgstr "PROMISK "
+++#: ../ifconfig.c:693
+++#, c-format
+++msgid "%s: invalid %s address.\n"
+++msgstr "%s: adresa %s je nesprávná.\n"
++ 
++-#: ../ifconfig.c:290
++-msgid "ALLMULTI "
++-msgstr "ALLMULTI "
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
+++#, c-format
+++msgid "No support for INET6 on this system.\n"
+++msgstr "Tento systém nepodporuje INET6.\n"
++ 
++-#: ../ifconfig.c:292
++-msgid "SLAVE "
++-msgstr "SLAVE "
+++#: ../ifconfig.c:780 ../ifconfig.c:871
+++#, c-format
+++msgid "Interface %s not initialized\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:294
++-msgid "MASTER "
++-msgstr "MASTER "
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, fuzzy, c-format
+++msgid "Bad address.\n"
+++msgstr "%s: adresa %s je nesprávná.\n"
++ 
++-#: ../ifconfig.c:296
++-msgid "MULTICAST "
++-msgstr "MULTICAST "
++-
++-#: ../ifconfig.c:299
++-msgid "DYNAMIC "
++-msgstr "DYNAMIC "
++-
++-#: ../ifconfig.c:302
++-#, c-format
++-msgid " MTU:%d  Metric:%d"
++-msgstr " MTU:%d  Metrika:%d"
++-
++-#: ../ifconfig.c:306
++-#, c-format
++-msgid "  Outfill:%d  Keepalive:%d"
++-msgstr "  Outfill:%d  Keepalive:%d"
++-
++-#: ../ifconfig.c:320
++-#, c-format
++-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
++-msgstr "pøijmutých paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu rámcù:%lu\n"
++-
++-#: ../ifconfig.c:325
++-#, c-format
++-msgid "             compressed:%lu\n"
++-msgstr "             komprimováno:%lu\n"
++-
++-# carrier?
++-#: ../ifconfig.c:329
++-#, c-format
++-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
++-msgstr "odeslaných paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu pøenos:%lu\n"
++-
++-#: ../ifconfig.c:333
++-#, c-format
++-msgid "          collisions:%lu "
++-msgstr "          kolizí:%lu "
++-
++-#: ../ifconfig.c:335
++-#, c-format
++-msgid "compressed:%lu "
++-msgstr "komprimováno:%lu "
++-
++-#: ../ifconfig.c:337
++-#, c-format
++-msgid "txqueuelen:%d "
++-msgstr "délka odchozí fronty:%d "
++-
++-#: ../ifconfig.c:345
++-#, c-format
++-msgid "Interrupt:%d "
++-msgstr "Pøeru¹ení:%d "
++-
++-#. Only print devices using it for
++-#. I/O maps
++-#: ../ifconfig.c:348
++-#, c-format
++-msgid "Base address:0x%x "
++-msgstr "Vstupnì/Výstupní port:0x%x "
++-
++-#: ../ifconfig.c:350
++-#, c-format
++-msgid "Memory:%lx-%lx "
++-msgstr "Pamì»:%lx-%lx "
++-
++-#: ../ifconfig.c:353
++-#, c-format
++-msgid "DMA chan:%x "
++-msgstr "Kanál DMA:%x "
++-
++-#: ../ifconfig.c:384 ../ifconfig.c:405
++-#, c-format
++-msgid "%s: unknown interface: %s\n"
++-msgstr "%s: rozhraní %s není známo\n"
++-
++-#: ../ifconfig.c:421
++-msgid ""
++-"Usage:\n"
++-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
++-msgstr ""
++-"Pou¾ití:\n"
++-"  ifconfig [-a] [-i] [-v] <rozhraní> [[<AF>] <adresa>]\n"
++-
++-#: ../ifconfig.c:425
++-msgid "  [add <address>[/<prefixlen>]]\n"
++-msgstr "  [add <adresa>[/<délka prefixu>]]\n"
++-
++-#: ../ifconfig.c:427
++-msgid "  [del <address>[/<prefixlen>]]\n"
++-msgstr "  [del <adresa>[/<délka prefixu>]]\n"
++-
++-#: ../ifconfig.c:432
++-msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
++-msgstr "  [[-]broadcast [<adresa>]]  [[-]pointopoint [<adresa>]]\n"
++-
++-#: ../ifconfig.c:433
++-msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++-msgstr "  [netmask <adresa>]  [dstaddr <adresa>]  [tunnel <adresa>]\n"
++-
++-#: ../ifconfig.c:436
++-msgid "  [outfill <NN>] [keepalive <NN>]\n"
++-msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++-
++-#: ../ifconfig.c:438
++-msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
++-msgstr "  [hw <HW> <adresa>]  [metric <NN>]  [mtu <NN>]\n"
++-
++-#: ../ifconfig.c:439
++-msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-
++-#: ../ifconfig.c:440
++-msgid "  [multicast]  [[-]promisc]\n"
++-msgstr "  [multicast]  [[-]promisc]\n"
++-
++-#: ../ifconfig.c:441
++-msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++-msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <typ>]\n"
++-
++-#: ../ifconfig.c:443
++-msgid "  [txqueuelen <NN>]\n"
++-msgstr "  [txqueuelen délka]\n"
++-
++-#: ../ifconfig.c:446
++-msgid "  [[-]dynamic]\n"
++-msgstr "  [[-]dynamic]\n"
++-
++-#: ../ifconfig.c:448
++-msgid ""
++-"  [up|down] ...\n"
++-"\n"
++-msgstr ""
++-"  [up|down] ...\n"
++-"\n"
++-
++-#: ../ifconfig.c:450
++-msgid "  <HW>=Hardware Type.\n"
++-msgstr "   <HW>=Hardwarový Typ.\n"
++-
++-#: ../ifconfig.c:451
++-msgid "  List of possible hardware types:\n"
++-msgstr "  Seznam mo¾ných hardwarových typù:\n"
++-
++-#. 1 = ARPable
++-#: ../ifconfig.c:453
++-#, c-format
++-msgid "  <AF>=Address family. Default: %s\n"
++-msgstr "   <AF>=tøída adres. Implicitní: %s\n"
++-
++-#: ../ifconfig.c:454
++-msgid "  List of possible address families:\n"
++-msgstr "  Seznam mo¾ných tøíd adres:\n"
++-
++-#: ../ifconfig.c:593
++-msgid "Unknown media type.\n"
++-msgstr "Neznámý typ média.\n"
++-
++-#: ../ifconfig.c:881
+++#: ../ifconfig.c:885
++ #, c-format
++-msgid "%s: invalid %s address.\n"
++-msgstr "%s: adresa %s je nesprávná.\n"
++-
++-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
++-msgid "No support for INET6 on this system.\n"
++-msgstr "Tento systém nepodporuje INET6.\n"
++-
++-#: ../ifconfig.c:983
++ msgid "Address deletion not supported on this system.\n"
++ msgstr "Tento systém nepodporuje mazání adres.\n"
++ 
++-#: ../ifconfig.c:1066
++-msgid "No support for INET on this system.\n"
++-msgstr "Tento systém nepodporuje INET.\n"
+++#: ../ifconfig.c:957
+++#, fuzzy, c-format
+++msgid "ifconfig: Cannot set address for this protocol family.\n"
+++msgstr "Nevím, jak nastavit adresu tøídy %d.\n"
++ 
++-#: ../ifconfig.c:1076
+++#: ../ifconfig.c:983
+++#, c-format
++ msgid "No support for ECONET on this system.\n"
++ msgstr "Tento systém nepodporuje ECONET.\n"
++ 
++-#: ../ifconfig.c:1084
+++#: ../ifconfig.c:991
++ #, c-format
++ msgid "Don't know how to set addresses for family %d.\n"
++ msgstr "Nevím, jak nastavit adresu tøídy %d.\n"
++ 
++-#: ../netstat.c:383
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr ""
+++
+++#: ../netstat.c:434
++ #, c-format
++ msgid ""
++ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
++@@ -792,7 +704,8 @@ msgstr ""
++ "jste\n"
++ "byl superu¾ivatelem)\n"
++ 
++-#: ../netstat.c:387
+++#: ../netstat.c:438
+++#, c-format
++ msgid ""
++ "(Not all processes could be identified, non-owned process info\n"
++ " will not be shown, you would have to be root to see it all.)\n"
++@@ -801,199 +714,223 @@ msgstr ""
++ "pouze o procesech, jich¾ jste vlastníkem. Aby jste mohl vidìt v¹e, musel\n"
++ "byste být superu¾ivatelem.)\n"
++ 
++-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
++ msgid "LISTENING"
++ msgstr "NASLOUCHÁ"
++ 
++-#: ../netstat.c:395
+++#: ../netstat.c:446
++ msgid "CONN SENT"
++ msgstr "CONN ODESLÁN"
++ 
++-#: ../netstat.c:396 ../netstat.c:1168
+++#: ../netstat.c:447 ../netstat.c:1268
++ msgid "DISC SENT"
++ msgstr "DISC ODESLÁN"
++ 
++-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
++ msgid "ESTABLISHED"
++ msgstr "SPOJENO"
++ 
++-#: ../netstat.c:419
+++#: ../netstat.c:470
+++#, c-format
++ msgid "Active NET/ROM sockets\n"
++ msgstr "Aktivní NET/ROM sokety\n"
++ 
++-#: ../netstat.c:420
+++#: ../netstat.c:471
+++#, c-format
++ msgid ""
++-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
++-"Recv-Q\n"
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
++ msgstr ""
++-"U¾ivatel   Cíl        Zdroj      Zaøízení Stav        Vr/Vs    Odch-F "
++-"Pøích-F\n"
+++"U¾ivatel   Cíl        Zdroj      Zaøízení Stav        Vr/Vs    Odch-F Pøích-"
+++"F\n"
++ 
++-#: ../netstat.c:430 ../netstat.c:1208
+++#: ../netstat.c:481 ../netstat.c:1308
++ #, c-format
++ msgid "Problem reading data from %s\n"
++ msgstr "Chyba pøi ètení dat z %s\n"
++ 
++ # následující radìji ponechat v originále ?!
++-#: ../netstat.c:465
+++#: ../netstat.c:516
++ msgid "SYN_SENT"
++ msgstr "SYN_SENT"
++ 
++-#: ../netstat.c:466
+++#: ../netstat.c:517
++ msgid "SYN_RECV"
++ msgstr "SYN_RECV"
++ 
++-#: ../netstat.c:467
+++#: ../netstat.c:518
++ msgid "FIN_WAIT1"
++ msgstr "FIN_WAIT1"
++ 
++-#: ../netstat.c:468
+++#: ../netstat.c:519
++ msgid "FIN_WAIT2"
++ msgstr "FIN_WAIT2"
++ 
++-#: ../netstat.c:469
+++#: ../netstat.c:520
++ msgid "TIME_WAIT"
++ msgstr "TIME_WAIT"
++ 
++-#: ../netstat.c:470
+++#: ../netstat.c:521
++ msgid "CLOSE"
++ msgstr "ZAVØEN"
++ 
++-#: ../netstat.c:471
+++#: ../netstat.c:522
++ msgid "CLOSE_WAIT"
++ msgstr "CLOSE_WAIT"
++ 
++-#: ../netstat.c:472
+++#: ../netstat.c:523
++ msgid "LAST_ACK"
++ msgstr "POSLEDNÍ ACK"
++ 
++-#: ../netstat.c:473
+++#: ../netstat.c:524
++ msgid "LISTEN"
++ msgstr "LISTEN"
++ 
++-#: ../netstat.c:474
+++#: ../netstat.c:525
++ msgid "CLOSING"
++ msgstr "ZAVíRÁ"
++ 
++-#: ../netstat.c:544
+++#: ../netstat.c:596
++ #, c-format
++ msgid "warning, got bogus igmp6 line %d.\n"
++ msgstr "varování, nesmyslný igmp6 øádek %d.\n"
++ 
++-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
++-#: ../netstat.c:935 ../netstat.c:940
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
++ #, c-format
++ msgid "netstat: unsupported address family %d !\n"
++ msgstr "netstat: tøída adres %d není podporována !\n"
++ 
++-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
++ #, c-format
++ msgid "warning, got bogus igmp line %d.\n"
++ msgstr "varování, nesmyslný igmp øádek %d.\n"
++ 
++-#: ../netstat.c:666
+++#: ../netstat.c:677
+++#, fuzzy, c-format
+++msgid "Active X.25 sockets\n"
+++msgstr "Aktivní AX.25 sokety\n"
+++
+++#. IMHO, Vr/Vs is not very usefull --SF
+++#: ../netstat.c:679
+++#, fuzzy, c-format
+++msgid ""
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
+++msgstr "Cíl        Zdroj      Zaøíz   Stav         Vr/Vs    Odhod-F Pøích-F\n"
+++
+++#: ../netstat.c:759
+++#, c-format
++ msgid "warning, got bogus tcp line.\n"
++ msgstr "varování, nesmyslný tcp øádek.\n"
++ 
++-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
++ #, c-format
++ msgid "off (0.00/%ld/%d)"
++ msgstr "vyp (0.00/%ld/%d)"
++ 
++-#: ../netstat.c:708
+++#: ../netstat.c:804
++ #, fuzzy, c-format
++ msgid "on (%2.2f/%ld/%d)"
++ msgstr "zap%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:713
+++#: ../netstat.c:809
++ #, fuzzy, c-format
++ msgid "keepalive (%2.2f/%ld/%d)"
++ msgstr "zap%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:718
+++#: ../netstat.c:814
++ #, fuzzy, c-format
++ msgid "timewait (%2.2f/%ld/%d)"
++ msgstr "zap%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
++ #, c-format
++ msgid "unkn-%d (%2.2f/%ld/%d)"
++ msgstr "nezn-%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:799
+++#: ../netstat.c:894
+++#, c-format
++ msgid "warning, got bogus udp line.\n"
++ msgstr "varování, nesmyslný udp øádek.\n"
++ 
++-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
++ msgid "UNKNOWN"
++ msgstr "NEZNÁM"
++ 
++-#: ../netstat.c:860 ../netstat.c:980
+++#: ../netstat.c:958 ../netstat.c:1080
++ #, c-format
++ msgid "on%d (%2.2f/%ld/%d)"
++ msgstr "zap%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:949
+++#: ../netstat.c:1046
+++#, c-format
++ msgid "warning, got bogus raw line.\n"
++ msgstr "varování, nesmyslný 'raw' øádek.\n"
++ 
++-#: ../netstat.c:1028
+++#: ../netstat.c:1128
+++#, c-format
++ msgid "warning, got bogus unix line.\n"
++ msgstr "varování, netstat 'unix' øádek.\n"
++ 
++-#: ../netstat.c:1055
+++#: ../netstat.c:1155
++ msgid "STREAM"
++ msgstr "STREAM"
++ 
++-#: ../netstat.c:1059
+++#: ../netstat.c:1159
++ msgid "DGRAM"
++ msgstr "DGRAM"
++ 
++-#: ../netstat.c:1063
+++#: ../netstat.c:1163
++ msgid "RAW"
++ msgstr "RAW"
++ 
++-#: ../netstat.c:1067
+++#: ../netstat.c:1167
++ msgid "RDM"
++ msgstr "RDM"
++ 
++-#: ../netstat.c:1071
+++#: ../netstat.c:1171
++ msgid "SEQPACKET"
++ msgstr "SEQPACKET"
++ 
++-#: ../netstat.c:1080
+++#: ../netstat.c:1180
++ msgid "FREE"
++ msgstr "NEALOKOVÁN"
++ 
++-#: ../netstat.c:1096
+++#: ../netstat.c:1196
++ msgid "CONNECTING"
++ msgstr "SPOJUJE"
++ 
++-#: ../netstat.c:1100
+++#: ../netstat.c:1200
++ msgid "CONNECTED"
++ msgstr "SPOJEN"
++ 
++-#: ../netstat.c:1104
+++#: ../netstat.c:1204
++ msgid "DISCONNECTING"
++ msgstr "ODPOJUJE"
++ 
++-#: ../netstat.c:1135
+++#: ../netstat.c:1235
+++#, c-format
++ msgid "Active UNIX domain sockets "
++ msgstr "Aktivní sokety domény UNIX "
++ 
++-#: ../netstat.c:1137 ../netstat.c:1666
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
++ msgid "(servers and established)"
++ msgstr "(servery a navázaná spojení)"
++ 
++-#: ../netstat.c:1140 ../netstat.c:1669
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
++ msgid "(only servers)"
++ msgstr "(pouze servery)"
++ 
++-#: ../netstat.c:1142 ../netstat.c:1671
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
++ msgid "(w/o servers)"
++ msgstr "(w/o servery)"
++ 
++-#: ../netstat.c:1145
+++#: ../netstat.c:1245
+++#, c-format
++ msgid ""
++ "\n"
++ "Proto RefCnt Flags       Type       State         I-Node"
++@@ -1001,90 +938,92 @@ msgstr ""
++ "\n"
++ "Proto Èítaè  Pøíznaky    Typ        Stav          I-Uzel"
++ 
++-#: ../netstat.c:1147
+++#: ../netstat.c:1247
+++#, c-format
++ msgid " Path\n"
++ msgstr " Cesta\n"
++ 
++-#: ../netstat.c:1167
+++#: ../netstat.c:1267
++ msgid "SABM SENT"
++ msgstr "SABM ODESLÁN"
++ 
++-#: ../netstat.c:1170
+++#: ../netstat.c:1270
++ msgid "RECOVERY"
++ msgstr "OBNOVA"
++ 
++-#: ../netstat.c:1184
+++#: ../netstat.c:1284
+++#, c-format
++ msgid "Active AX.25 sockets\n"
++ msgstr "Aktivní AX.25 sokety\n"
++ 
++-#: ../netstat.c:1185
+++#: ../netstat.c:1285
+++#, c-format
++ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
++ msgstr "Cíl        Zdroj      Zaøíz   Stav         Vr/Vs    Odhod-F Pøích-F\n"
++ 
++-#: ../netstat.c:1228
+++#: ../netstat.c:1328
++ #, c-format
++ msgid "problem reading data from %s\n"
++ msgstr "chyba pøi ètení dat z %s\n"
++ 
++-#: ../netstat.c:1279
+++#: ../netstat.c:1379
+++#, c-format
++ msgid ""
++ "Active IPX sockets\n"
++ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
++ "State"
++ msgstr ""
++ "Aktivní IPX sokety\n"
++-"Proto Pøích-F Odch-F Lokál adresa              Vzdálená adresa               "
++-" Stav"
+++"Proto Pøích-F Odch-F Lokál adresa              Vzdálená "
+++"adresa                Stav"
++ 
++-#: ../netstat.c:1281
+++#: ../netstat.c:1381
+++#, c-format
++ msgid " User"
++ msgstr " U¾ivatel"
++ 
++-#: ../netstat.c:1315
+++#: ../netstat.c:1415
++ msgid "ESTAB"
++ msgstr "SPOJEN"
++ 
++-#: ../netstat.c:1323
+++#: ../netstat.c:1423
++ msgid "UNK."
++ msgstr "NEZ."
++ 
++-#: ../netstat.c:1367
++-msgid "     - no statistics available -"
++-msgstr "     - statistická data nejsou dostupná -"
++-
++-#: ../netstat.c:1370
++-msgid "[NO FLAGS]"
++-msgstr "[®ÁDNÉ PØÍZNAKY]"
++-
++-#: ../netstat.c:1400
+++#: ../netstat.c:1461
+++#, c-format
++ msgid "Kernel Interface table\n"
++ msgstr "Tabulka rozhraní v jádru\n"
++ 
++-#: ../netstat.c:1401
+++#: ../netstat.c:1465
+++#, fuzzy, c-format
++ msgid ""
++-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++ msgstr ""
++ "Rozhr   MTU Met    PØ-OK PØ-CHYB PØ-ZAH PØ-PØT   OD-OK OD-CHYB OD-ZAH OD-PØT "
++ "PØZ\n"
++ 
++-#: ../netstat.c:1404
+++#: ../netstat.c:1469
++ msgid "missing interface information"
++ msgstr "chybí informace o rozhraní"
++ 
++-#: ../netstat.c:1425
+++#: ../netstat.c:1492
+++#, c-format
++ msgid ""
++-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ msgstr ""
++-"Pou¾ití: netstat [--veenNcCF] [<TA>] -r       netstat "
++-"{-V|--version|-h|--help}\n"
+++"Pou¾ití: netstat [--veenNcCF] [<TA>] -r       netstat {-V|--version|-h|--"
+++"help}\n"
++ 
++-#: ../netstat.c:1426
+++#: ../netstat.c:1493
+++#, c-format
++ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ msgstr "         netstat [-vnNcaeol] [<Soket> ...]\n"
++ 
++-#: ../netstat.c:1427
+++#: ../netstat.c:1494
+++#, c-format
++ msgid ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++@@ -1092,27 +1031,32 @@ msgstr ""
++ "         netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++ 
++-#: ../netstat.c:1429
+++#: ../netstat.c:1496
+++#, c-format
++ msgid "        -r, --route              display routing table\n"
++ msgstr "         -r, --route              vypí¹e smìrovací tabulku\n"
++ 
++-#: ../netstat.c:1430
+++#: ../netstat.c:1497
+++#, c-format
++ msgid "        -i, --interfaces         display interface table\n"
++ msgstr "         -i, --interfaces         vypí¹e tabulku rozhraní\n"
++ 
++-#: ../netstat.c:1431
+++#: ../netstat.c:1498
+++#, c-format
++ msgid "        -g, --groups             display multicast group memberships\n"
++ msgstr ""
++ "         -g, --groups             vypí¹e èlenství v multicast skupinách\n"
++ 
++-#: ../netstat.c:1432
+++#: ../netstat.c:1499
+++#, c-format
++ msgid ""
++ "        -s, --statistics         display networking statistics (like SNMP)\n"
++ msgstr ""
++ "         -s, --statistics         vypí¹e statistiku sí»ové aktivity (jako "
++ "SNMP)\n"
++ 
++-#: ../netstat.c:1434
+++#: ../netstat.c:1501
+++#, c-format
++ msgid ""
++ "        -M, --masquerade         display masqueraded connections\n"
++ "\n"
++@@ -1120,20 +1064,45 @@ msgstr ""
++ "         -M, --masquerade         vypí¹e maskovaná spojení\n"
++ "\n"
++ 
++-#: ../netstat.c:1438 ../route.c:87
+++#: ../netstat.c:1505
+++#, fuzzy, c-format
+++msgid "        --numeric-hosts          don't resolve host names\n"
+++msgstr ""
+++"        -n, --numeric            nebude pøevádìt èíselné adresy\n"
+++"                                 na kanonická jména\n"
+++
+++#: ../netstat.c:1506
+++#, fuzzy, c-format
+++msgid "        --numeric-ports          don't resolve port names\n"
+++msgstr ""
+++"        -n, --numeric            nebude pøevádìt èíselné adresy\n"
+++"                                 na kanonická jména\n"
+++
+++#: ../netstat.c:1507
+++#, fuzzy, c-format
+++msgid "        --numeric-users          don't resolve user names\n"
+++msgstr ""
+++"        -n, --numeric            nebude pøevádìt èíselné adresy\n"
+++"                                 na kanonická jména\n"
+++
+++#: ../netstat.c:1508
+++#, c-format
++ msgid "        -N, --symbolic           resolve hardware names\n"
++ msgstr "         -N, --symbolic           pøevede hw jména\n"
++ 
++-#: ../netstat.c:1439 ../route.c:88
+++#: ../netstat.c:1509 ../route.c:88
+++#, c-format
++ msgid "        -e, --extend             display other/more information\n"
++ msgstr "         -e, --extend             vypí¹e podrobnìj¹í informace\n"
++ 
++-#: ../netstat.c:1440
+++#: ../netstat.c:1510
+++#, c-format
++ msgid "        -p, --programs           display PID/Program name for sockets\n"
++ msgstr ""
++ "         -p, --programs           vypí¹e PID/jméno programu pro sokety\n"
++ 
++-#: ../netstat.c:1441
+++#: ../netstat.c:1511
+++#, c-format
++ msgid ""
++ "        -c, --continuous         continuous listing\n"
++ "\n"
++@@ -1141,23 +1110,27 @@ msgstr ""
++ "         -c, --continuous         nepøeru¹ovaný výpis\n"
++ "\n"
++ 
++-#: ../netstat.c:1442
+++#: ../netstat.c:1512
+++#, c-format
++ msgid "        -l, --listening          display listening server sockets\n"
++ msgstr ""
++ "         -l, --listening          vypí¹e sokety, na nich¾ je nasloucháno\n"
++ 
++-#: ../netstat.c:1443
+++#: ../netstat.c:1513
+++#, c-format
++ msgid ""
++ "        -a, --all, --listening   display all sockets (default: connected)\n"
++ msgstr ""
++ "         -a, --all, --listening   vypí¹e v¹echny sokety (implicitnì: "
++ "spojené)\n"
++ 
++-#: ../netstat.c:1444
+++#: ../netstat.c:1514
+++#, c-format
++ msgid "        -o, --timers             display timers\n"
++ msgstr "         -o, --timers             zobrazí èasovaèe\n"
++ 
++-#: ../netstat.c:1445 ../route.c:89
+++#: ../netstat.c:1515 ../route.c:89
+++#, c-format
++ msgid ""
++ "        -F, --fib                display Forwarding Information Base "
++ "(default)\n"
++@@ -1165,112 +1138,126 @@ msgstr ""
++ "         -F, --fib                zobrazí Forwarding Infomation Base\n"
++ "                                  (implicitní)\n"
++ 
++-#: ../netstat.c:1446 ../route.c:90
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
++ msgid ""
++ "        -C, --cache              display routing cache instead of FIB\n"
++ "\n"
++ msgstr "         -C, --cache              místo FIB zobrazí smìrovací cache\n"
++ 
++-#: ../netstat.c:1448
+++#: ../netstat.c:1518
+++#, c-format
++ msgid ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ msgstr ""
++-"  <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ 
++-#: ../netstat.c:1449 ../route.c:92
++-#, c-format
++-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
+++#: ../netstat.c:1519
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
++ msgstr "   <AF>=Pou¾ijte '-A <af>' or '--<af>' Implicitní: %s\n"
++ 
++-#: ../netstat.c:1450 ../route.c:93
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
++ msgid "  List of possible address families (which support routing):\n"
++ msgstr "  Seznam mo¾ných tøíd adres (podporujících smìrování):\n"
++ 
++-#: ../netstat.c:1663
+++#: ../netstat.c:1753
+++#, c-format
++ msgid "Active Internet connections "
++ msgstr "Aktivní Internetová spojení "
++ 
++-#: ../netstat.c:1673
+++#: ../netstat.c:1763
+++#, c-format
++ msgid ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ msgstr ""
++ "\n"
++ "Proto Pøích-F Odch-F Místní Adresa          Vzdálená Adresa         Stav     "
++ 
++-#: ../netstat.c:1675
+++#: ../netstat.c:1765
+++#, c-format
++ msgid " User       Inode     "
++ msgstr " U¾ivatel   I-uzel    "
++ 
++-#: ../netstat.c:1678
+++#: ../netstat.c:1768
+++#, c-format
++ msgid " Timer"
++ msgstr " Èasovaè"
++ 
++-#: ../netstat.c:1708
+++#: ../netstat.c:1798
+++#, c-format
++ msgid "IPv4 Group Memberships\n"
++ msgstr "Èlenství v IPv4 skupinách\n"
++ 
++-#: ../netstat.c:1709
+++#: ../netstat.c:1799
+++#, c-format
++ msgid "Interface       RefCnt Group\n"
++ msgstr "Rozhraní        Èítaè  Skupina\n"
++ 
++-#: ../rarp.c:43
+++#: ../rarp.c:44
++ msgid "This kernel does not support RARP.\n"
++ msgstr "Toto jádro nepodporuje RARP.\n"
++ 
++-#: ../rarp.c:82
+++#: ../rarp.c:83
++ #, c-format
++ msgid "no RARP entry for %s.\n"
++ msgstr "pro %s neexistuje RARP polo¾ka.\n"
++ 
++-#: ../rarp.c:95
+++#: ../rarp.c:96
++ #, c-format
++ msgid "%s: bad hardware address\n"
++ msgstr "hardwarová adresa %s je nesprávná\n"
++ 
++-#: ../rarp.c:127
+++#: ../rarp.c:128
++ #, c-format
++ msgid "rarp: cannot open file %s:%s.\n"
++ msgstr "rarp: soubor %s:%s nelze otevøít.\n"
++ 
++-#: ../rarp.c:139
+++#: ../rarp.c:140
++ #, c-format
++ msgid "rarp: format error at %s:%u\n"
++ msgstr "rarp: syntaktická chyba na øádku %2$u souboru %1$s\n"
++ 
++-#: ../rarp.c:143 ../rarp.c:287
+++#: ../rarp.c:144 ../rarp.c:289
++ #, c-format
++ msgid "rarp: %s: unknown host\n"
++ msgstr "rarp: poèítaè %s není znám\n"
++ 
++-#: ../rarp.c:146
+++#: ../rarp.c:147
++ #, c-format
++ msgid "rarp: cannot set entry from %s:%u\n"
++ msgstr "rarp: nelze nastavit polo¾ku z øádku %2$u souboru %1$s\n"
++ 
++-#: ../rarp.c:175
+++#: ../rarp.c:176
+++#, c-format
++ msgid "Usage: rarp -a                               list entries in cache.\n"
++ msgstr "Pou¾ití: rarp -a                            vypí¹e polo¾ky z cache.\n"
++ 
++-#: ../rarp.c:176
+++#: ../rarp.c:177
+++#, c-format
++ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
++ msgstr "         rarp -d <jméno>                    sma¾e polo¾ku z cache.\n"
++ 
++-#: ../rarp.c:177
+++#: ../rarp.c:178
+++#, c-format
++ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
++ msgstr ""
++ "         rarp [<HW>] -s <jméno> <hwadr>       pøidá polo¾ku do cache.\n"
++ 
++-#: ../rarp.c:178
+++#: ../rarp.c:179
+++#, c-format
++ msgid ""
++ "       rarp -f                               add entries from /etc/ethers.\n"
++ msgstr ""
++ "         rarp -f                               pøidá polo¾ky z /etc/ethers.\n"
++ 
++-#: ../rarp.c:179
+++#: ../rarp.c:180
+++#, c-format
++ msgid ""
++ "       rarp -V                               display program version.\n"
++ "\n"
++@@ -1279,24 +1266,26 @@ msgstr ""
++ "programu.\n"
++ "\n"
++ 
++-#: ../rarp.c:236
+++#: ../rarp.c:238
++ #, c-format
++ msgid "%s: illegal option mix.\n"
++ msgstr "Kombinace pøepínaèù %s je nesprávná.\n"
++ 
++-#: ../rarp.c:267
+++#: ../rarp.c:269
++ #, c-format
++ msgid "rarp: %s: unknown hardware type.\n"
++ msgstr "rarp: hardwarový typ %s není znám.\n"
++ 
++-#: ../route.c:79
+++#: ../route.c:80
+++#, c-format
++ msgid ""
++ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
++ msgstr ""
++ "Pou¾ití: route [-nNvee] [-FC] [<AF>]         Zobrazí smìrovací tabulky v "
++ "jádru\n"
++ 
++-#: ../route.c:80
+++#: ../route.c:81
+++#, c-format
++ msgid ""
++ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
++ "\n"
++@@ -1305,14 +1294,16 @@ msgstr ""
++ "AF.\n"
++ "\n"
++ 
++-#: ../route.c:82
+++#: ../route.c:83
+++#, c-format
++ msgid ""
++ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
++ "specified AF.\n"
++ msgstr ""
++ "       route {-h|--help [<AF>]               Nápovìda pro pou¾ití s AF.\n"
++ 
++-#: ../route.c:83
+++#: ../route.c:84
+++#, c-format
++ msgid ""
++ "       route {-V|--version}                  Display version/author and "
++ "exit.\n"
++@@ -1321,15 +1312,23 @@ msgstr ""
++ "       route {-V|--version}                  Vypí¹e oznaèení verze a autora\n"
++ "                                             programu.\n"
++ 
+++#: ../route.c:92
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "   <AF>=Pou¾ijte '-A <af>' or '--<af>' Implicitní: %s\n"
+++
++ #: ../plipconfig.c:66
+++#, c-format
++ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
++ msgstr "Pou¾ití: plipconfig [-a] [-i] [-v] rozhraní\n"
++ 
++ #: ../plipconfig.c:67
+++#, c-format
++ msgid "                  [nibble NN] [trigger NN]\n"
++ msgstr "                  [nibble NN] [trigger NN]\n"
++ 
++ #: ../plipconfig.c:68
+++#, c-format
++ msgid "       plipconfig -V | --version\n"
++ msgstr "       plipconfig -V | --version\n"
++ 
++@@ -1338,25 +1337,30 @@ msgstr "       plipconfig -V | --version
++ msgid "%s\tnibble %lu  trigger %lu\n"
++ msgstr "%s\tnibble %lu  trigger %lu\n"
++ 
++-#: ../iptunnel.c:79
+++#: ../iptunnel.c:85
+++#, c-format
++ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
++ msgstr "Pou¾ití: iptunnel { add | change | del | show } [ JMÉNO ]\n"
++ 
++-#: ../iptunnel.c:80
+++#: ../iptunnel.c:86
+++#, c-format
++ msgid ""
++ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
++ msgstr ""
++ "          [ mode { ipip | gre | sit } ] [ vzdálená ADR ] [ místní ADR ]\n"
++ 
++-#: ../iptunnel.c:81
+++#: ../iptunnel.c:87
+++#, c-format
++ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ msgstr "          [ [i|o]seq ] [ [i|o]key KLÍÈ ] [ [i|o]csum ]\n"
++ 
++-#: ../iptunnel.c:82
+++#: ../iptunnel.c:88
+++#, c-format
++ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
++ msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev ZAØÍZENÍ ]\n"
++ 
++-#: ../iptunnel.c:83
+++#: ../iptunnel.c:89
+++#, c-format
++ msgid ""
++ "       iptunnel -V | --version\n"
++ "\n"
++@@ -1364,450 +1368,737 @@ msgstr ""
++ "       iptunnel -V | --version\n"
++ "\n"
++ 
++-#: ../iptunnel.c:84
+++#: ../iptunnel.c:90
+++#, c-format
++ msgid "Where: NAME := STRING\n"
++ msgstr "Kde: JMÉNO := ØETÌZEC\n"
++ 
++-#: ../iptunnel.c:85
+++#: ../iptunnel.c:91
+++#, c-format
++ msgid "       ADDR := { IP_ADDRESS | any }\n"
++ msgstr "       ADR := { IP-ADRESA | any }\n"
++ 
++-#: ../iptunnel.c:86
+++#: ../iptunnel.c:92
+++#, c-format
++ msgid "       TOS  := { NUMBER | inherit }\n"
++ msgstr "       TOS  := { ÈÍSLO | inherit }\n"
++ 
++-#: ../iptunnel.c:87
+++#: ../iptunnel.c:93
+++#, c-format
++ msgid "       TTL  := { 1..255 | inherit }\n"
++ msgstr "       TTL  := { 1..255 | inherit }\n"
++ 
++-#: ../iptunnel.c:88
+++#: ../iptunnel.c:94
+++#, c-format
++ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
++ msgstr "       KLÍÈ  := { DOTTED_QUAD | ÈÍSLO }\n"
++ 
++-#: ../iptunnel.c:326
+++#: ../iptunnel.c:332
+++#, c-format
++ msgid "Keys are not allowed with ipip and sit.\n"
++ msgstr "S ipip a sit nejsou klíèe povoleny.\n"
++ 
++-#: ../iptunnel.c:346
+++#: ../iptunnel.c:352
+++#, c-format
++ msgid "Broadcast tunnel requires a source address.\n"
++ msgstr "Tunel se v¹esmìrovým vysíláním vy¾aduje zdrojovou adresu.\n"
++ 
++-#: ../iptunnel.c:361
+++#: ../iptunnel.c:367
+++#, c-format
++ msgid "ttl != 0 and noptmudisc are incompatible\n"
++ msgstr "ttl != 0 a noptmudisc se navzájem vyluèují\n"
++ 
++-#: ../iptunnel.c:373
+++#: ../iptunnel.c:379
+++#, c-format
++ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
++ msgstr "re¾im tunelu (ipip, gre èi sit) nelze zjistit\n"
++ 
++-#: ../iptunnel.c:411
+++#: ../iptunnel.c:417
++ #, c-format
++ msgid "%s: %s/ip  remote %s  local %s "
++ msgstr "%s: %s/ip  vzdálený %s  místní %s "
++ 
++-#: ../iptunnel.c:415
+++#: ../iptunnel.c:421
++ msgid "unknown"
++ msgstr "Neznám."
++ 
++-#: ../iptunnel.c:447
+++#: ../iptunnel.c:453
+++#, c-format
++ msgid "  Drop packets out of sequence.\n"
++ msgstr "  Zahazuje pakety mimo poøadí.\n"
++ 
++-#: ../iptunnel.c:449
+++#: ../iptunnel.c:455
+++#, c-format
++ msgid "  Checksum in received packet is required.\n"
++ msgstr "  Pøijímané pakety musí mít kontrolní souèet.\n"
++ 
++ # ???
++-#: ../iptunnel.c:451
+++#: ../iptunnel.c:457
+++#, c-format
++ msgid "  Sequence packets on output.\n"
++ msgstr "  Øadí odchozí pakety.\n"
++ 
++-#: ../iptunnel.c:453
+++#: ../iptunnel.c:459
+++#, c-format
++ msgid "  Checksum output packets.\n"
++ msgstr "  Odchozí pakety budou mít kontrolní souèet.\n"
++ 
++-#: ../iptunnel.c:481
+++#: ../iptunnel.c:487
+++#, c-format
++ msgid "Wrong format of /proc/net/dev. Sorry.\n"
++ msgstr "Lituji, formát /proc/net/dev je chybný.\n"
++ 
++-#: ../iptunnel.c:494
+++#: ../iptunnel.c:500
++ #, c-format
++ msgid "Failed to get type of [%s]\n"
++ msgstr "Typ [%s] se nepodaøilo zjistit.\n"
++ 
++-#: ../iptunnel.c:510
+++#: ../iptunnel.c:516
+++#, c-format
++ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
++ msgstr "RX: Pakety     Bajty        Chyby  CsumChyb MimoPoø  Mcasts\n"
++ 
++-#: ../iptunnel.c:513
+++#: ../iptunnel.c:519
+++#, c-format
++ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
++ msgstr "TX: Pakety     Bajty        Chyby  DeadLoop NoRoute  NoBufs\n"
++ 
++-#: ../statistics.c:45
+++#: ../statistics.c:47
++ msgid "ICMP input histogram:"
++ msgstr "histogram ICMP vstupu:"
++ 
++-#: ../statistics.c:46
+++#: ../statistics.c:48
++ msgid "ICMP output histogram:"
++ msgstr "histogram ICMP výstupu:"
++ 
++-#: ../statistics.c:63
+++#: ../statistics.c:65
++ #, c-format
++ msgid "Forwarding is %s"
++ msgstr "Pøedávání je %s"
++ 
++-#: ../statistics.c:64
++-#, c-format
++-msgid "Default TTL is %d"
+++#: ../statistics.c:66
+++#, fuzzy, c-format
+++msgid "Default TTL is %u"
++ msgstr "Implicitní TTL je %d"
++ 
++-#: ../statistics.c:65
++-#, c-format
++-msgid "%d total packets received"
+++#: ../statistics.c:67
+++#, fuzzy, c-format
+++msgid "%u total packets received"
++ msgstr "celkem pøijmutých paketù: %d"
++ 
++-#: ../statistics.c:66
++-#, c-format
++-msgid "%d with invalid headers"
+++#: ../statistics.c:68
+++#, fuzzy, c-format
+++msgid "%u with invalid headers"
++ msgstr "s nesprávnými hlavièkami: %d"
++ 
++-#: ../statistics.c:67
++-#, c-format
++-msgid "%d with invalid addresses"
+++#: ../statistics.c:69
+++#, fuzzy, c-format
+++msgid "%u with invalid addresses"
++ msgstr "s nesprávnými adresami: %d"
++ 
++-#: ../statistics.c:68
++-#, c-format
++-msgid "%d forwarded"
+++#: ../statistics.c:70
+++#, fuzzy, c-format
+++msgid "%u forwarded"
++ msgstr "pøedáno: %d"
++ 
++-#: ../statistics.c:69
++-#, c-format
++-msgid "%d with unknown protocol"
+++#: ../statistics.c:71
+++#, fuzzy, c-format
+++msgid "%u with unknown protocol"
++ msgstr "s neznámým protokolem: %d"
++ 
++-#: ../statistics.c:70
++-#, c-format
++-msgid "%d incoming packets discarded"
+++#: ../statistics.c:72
+++#, fuzzy, c-format
+++msgid "%u incoming packets discarded"
++ msgstr "poèet zahozených pøíchozích paketù: %d"
++ 
++-#: ../statistics.c:71
++-#, c-format
++-msgid "%d incoming packets delivered"
+++#: ../statistics.c:73
+++#, fuzzy, c-format
+++msgid "%u incoming packets delivered"
++ msgstr "poèet doruèených pøíchozích paketù: %d"
++ 
++-#: ../statistics.c:72
++-#, c-format
++-msgid "%d requests sent out"
+++#: ../statistics.c:74
+++#, fuzzy, c-format
+++msgid "%u requests sent out"
++ msgstr "poèet odeslaných po¾adavkù: %d"
++ 
++ #. ?
++-#: ../statistics.c:73
++-#, c-format
++-msgid "%d outgoing packets dropped"
+++#: ../statistics.c:75
+++#, fuzzy, c-format
+++msgid "%u outgoing packets dropped"
++ msgstr "poèet zahozených odchozích paketù: %d"
++ 
++-#: ../statistics.c:74
++-#, c-format
++-msgid "%d dropped because of missing route"
+++#: ../statistics.c:76
+++#, fuzzy, c-format
+++msgid "%u dropped because of missing route"
++ msgstr "zahozeno kvùli chybìjící cestì: %d"
++ 
++-#: ../statistics.c:75
++-#, c-format
++-msgid "%d fragments dropped after timeout"
+++#: ../statistics.c:77
+++#, fuzzy, c-format
+++msgid "%u fragments dropped after timeout"
++ msgstr "poèet fragmentù zahozených po vypr¹ení èasu: %d"
++ 
++-#: ../statistics.c:76
++-#, c-format
++-msgid "%d reassemblies required"
+++#: ../statistics.c:78
+++#, fuzzy, c-format
+++msgid "%u reassemblies required"
++ msgstr "poèet nutných znovusestavení: %d"
++ 
++ #. ?
++-#: ../statistics.c:77
++-#, c-format
++-msgid "%d packets reassembled ok"
+++#: ../statistics.c:79
+++#, fuzzy, c-format
+++msgid "%u packets reassembled ok"
++ msgstr "poèet v poøádku znovu sestavených paketù: %d"
++ 
++-#: ../statistics.c:78
++-#, c-format
++-msgid "%d packet reassembles failed"
+++#: ../statistics.c:80
+++#, fuzzy, c-format
+++msgid "%u packet reassembles failed"
++ msgstr "poèet paketù, je¾ se nepodaøilo znovu sestavit: %d"
++ 
++-#: ../statistics.c:79
++-#, c-format
++-msgid "%d fragments received ok"
+++#: ../statistics.c:81
+++#, fuzzy, c-format
+++msgid "%u fragments received ok"
++ msgstr "poèet v poøádku pøijmutých fragmentù: %d"
++ 
++-#: ../statistics.c:80
++-#, c-format
++-msgid "%d fragments failed"
+++#: ../statistics.c:82
+++#, fuzzy, c-format
+++msgid "%u fragments failed"
++ msgstr "poèet chybných fragmentù: %d"
++ 
++-#: ../statistics.c:81
++-#, c-format
++-msgid "%d fragments created"
+++#: ../statistics.c:83
+++#, fuzzy, c-format
+++msgid "%u fragments created"
++ msgstr "poèet vytvoøených fragmentù: %d"
++ 
++-#: ../statistics.c:86
++-#, c-format
++-msgid "%d ICMP messages received"
+++#: ../statistics.c:88
+++#, fuzzy, c-format
+++msgid "%u ICMP messages received"
++ msgstr "poèet pøijmutých ICMP zpráv: %d"
++ 
++-#: ../statistics.c:87
++-#, c-format
++-msgid "%d input ICMP message failed."
+++#: ../statistics.c:89
+++#, fuzzy, c-format
+++msgid "%u input ICMP message failed."
++ msgstr "poèet chybných pøíchozích ICMP zpráv: %d"
++ 
++-#: ../statistics.c:88 ../statistics.c:101
++-#, c-format
++-msgid "destination unreachable: %d"
+++#: ../statistics.c:90 ../statistics.c:103
+++#, fuzzy, c-format
+++msgid "destination unreachable: %u"
++ msgstr "adresát nedostupný: %d"
++ 
++-#: ../statistics.c:89
++-#, c-format
++-msgid "timeout in transit: %d"
+++#: ../statistics.c:91
+++#, fuzzy, c-format
+++msgid "timeout in transit: %u"
++ msgstr "vypr¹el èas pøi pøenosu: %d"
++ 
++-#: ../statistics.c:90 ../statistics.c:103
++-#, c-format
++-msgid "wrong parameters: %d"
+++#: ../statistics.c:92 ../statistics.c:105
+++#, fuzzy, c-format
+++msgid "wrong parameters: %u"
++ msgstr "chybné parametry: %d"
++ 
++ #. ?
++-#: ../statistics.c:91
++-#, c-format
++-msgid "source quenchs: %d"
+++#: ../statistics.c:93
+++#, fuzzy, c-format
+++msgid "source quenches: %u"
++ msgstr "øízení toku dat: %d"
++ 
++-#: ../statistics.c:92
++-#, c-format
++-msgid "redirects: %d"
+++#: ../statistics.c:94
+++#, fuzzy, c-format
+++msgid "redirects: %u"
++ msgstr "zmìna cesty: %d"
++ 
++-#: ../statistics.c:93
++-#, c-format
++-msgid "echo requests: %d"
+++#: ../statistics.c:95
+++#, fuzzy, c-format
+++msgid "echo requests: %u"
++ msgstr "¾ádost o echo: %d"
++ 
++-#: ../statistics.c:94 ../statistics.c:107
++-#, c-format
++-msgid "echo replies: %d"
+++#: ../statistics.c:96 ../statistics.c:109
+++#, fuzzy, c-format
+++msgid "echo replies: %u"
++ msgstr "odpovìï na ¾ádost o echo: %d"
++ 
++-#: ../statistics.c:95
++-#, c-format
++-msgid "timestamp request: %d"
+++#: ../statistics.c:97
+++#, fuzzy, c-format
+++msgid "timestamp request: %u"
++ msgstr "¾ádost o èas: %d"
++ 
++-#: ../statistics.c:96
++-#, c-format
++-msgid "timestamp reply: %d"
+++#: ../statistics.c:98
+++#, fuzzy, c-format
+++msgid "timestamp reply: %u"
++ msgstr "odpovìï na ¾ádost o èas: %d"
++ 
++-#: ../statistics.c:97
++-#, c-format
++-msgid "address mask request: %d"
+++#: ../statistics.c:99
+++#, fuzzy, c-format
+++msgid "address mask request: %u"
++ msgstr "¾ádost o masku podsítì: %d"
++ 
++ #. ?
++-#: ../statistics.c:98
++-msgid "address mask replies"
++-msgstr "odpovìdi na ¾ádost o masku podsítì"
+++#: ../statistics.c:100 ../statistics.c:113
+++#, fuzzy, c-format
+++msgid "address mask replies: %u"
+++msgstr "odpovìï na ¾ádost o masku podsítì: %d"
++ 
++ #. ?
++-#: ../statistics.c:99
++-#, c-format
++-msgid "%d ICMP messages sent"
+++#: ../statistics.c:101
+++#, fuzzy, c-format
+++msgid "%u ICMP messages sent"
++ msgstr "poèet odeslaných ICMP zpráv: %d"
++ 
++-#: ../statistics.c:100
++-#, c-format
++-msgid "%d ICMP messages failed"
+++#: ../statistics.c:102
+++#, fuzzy, c-format
+++msgid "%u ICMP messages failed"
++ msgstr "poèet chybných ICMP zpráv: %d"
++ 
++-#: ../statistics.c:102
++-#, c-format
++-msgid "time exceeded: %d"
+++#: ../statistics.c:104
+++#, fuzzy, c-format
+++msgid "time exceeded: %u"
++ msgstr "vypr¹ení ¾ivotnosti: %d"
++ 
++ #. ?
++-#: ../statistics.c:104
++-#, c-format
++-msgid "source quench: %d"
+++#: ../statistics.c:106
+++#, fuzzy, c-format
+++msgid "source quench: %u"
++ msgstr "øízení toku dat: %d"
++ 
++-#: ../statistics.c:105
++-#, c-format
++-msgid "redirect: %d"
+++#: ../statistics.c:107
+++#, fuzzy, c-format
+++msgid "redirect: %u"
++ msgstr "zmìna cesty: %d"
++ 
++-#: ../statistics.c:106
++-#, c-format
++-msgid "echo request: %d"
+++#: ../statistics.c:108
+++#, fuzzy, c-format
+++msgid "echo request: %u"
++ msgstr "¾ádost o echo: %d"
++ 
++-#: ../statistics.c:108
++-#, c-format
++-msgid "timestamp requests: %d"
+++#: ../statistics.c:110
+++#, fuzzy, c-format
+++msgid "timestamp requests: %u"
++ msgstr "¾ádost o èas: %d"
++ 
++-#: ../statistics.c:109
++-#, c-format
++-msgid "timestamp replies: %d"
+++#: ../statistics.c:111
+++#, fuzzy, c-format
+++msgid "timestamp replies: %u"
++ msgstr "odpovìï na ¾ádost o èas: %d"
++ 
++-#: ../statistics.c:110
++-#, c-format
++-msgid "address mask requests: %d"
+++#: ../statistics.c:112
+++#, fuzzy, c-format
+++msgid "address mask requests: %u"
++ msgstr "¾ádost o masku podsítì: %d"
++ 
++-#: ../statistics.c:111
++-#, c-format
++-msgid "address mask replies: %d"
++-msgstr "odpovìï na ¾ádost o masku podsítì: %d"
++-
++-#: ../statistics.c:116
+++#: ../statistics.c:118
++ #, c-format
++ msgid "RTO algorithm is %s"
++ msgstr "RTO algoritmus je %s"
++ 
++-#: ../statistics.c:120
++-#, c-format
++-msgid "%d active connections openings"
+++#: ../statistics.c:122
+++#, fuzzy, c-format
+++msgid "%u active connections openings"
++ msgstr "poèet aktivnì navázaných spojení: %d"
++ 
++-#: ../statistics.c:121
++-#, c-format
++-msgid "%d passive connection openings"
+++#: ../statistics.c:123
+++#, fuzzy, c-format
+++msgid "%u passive connection openings"
++ msgstr "poèet pasivnì navázaných spojení: %d"
++ 
++-#: ../statistics.c:122
++-#, c-format
++-msgid "%d failed connection attempts"
+++#: ../statistics.c:124
+++#, fuzzy, c-format
+++msgid "%u failed connection attempts"
++ msgstr "poèet neúspì¹ných pokusù o spojení: %d"
++ 
++-#: ../statistics.c:123
++-#, c-format
++-msgid "%d connection resets received"
+++#: ../statistics.c:125
+++#, fuzzy, c-format
+++msgid "%u connection resets received"
++ msgstr "poèet pøijmutých resetù: %d"
++ 
++-#: ../statistics.c:124
++-#, c-format
++-msgid "%d connections established"
+++#: ../statistics.c:126
+++#, fuzzy, c-format
+++msgid "%u connections established"
++ msgstr "poèet navázaných spojení: %d"
++ 
++-#: ../statistics.c:125
++-#, c-format
++-msgid "%d segments received"
+++#: ../statistics.c:127
+++#, fuzzy, c-format
+++msgid "%u segments received"
++ msgstr "poèet pøijmutých segmentù: %d"
++ 
++-#: ../statistics.c:126
++-#, c-format
++-msgid "%d segments send out"
+++#: ../statistics.c:128
+++#, fuzzy, c-format
+++msgid "%u segments send out"
++ msgstr "poèet odeslaných segmentù: %d"
++ 
++-#: ../statistics.c:127
++-#, c-format
++-msgid "%d segments retransmited"
+++#: ../statistics.c:129
+++#, fuzzy, c-format
+++msgid "%u segments retransmited"
++ msgstr "poèet pøenesených segmentù: %d"
++ 
++-#: ../statistics.c:128
++-#, c-format
++-msgid "%d bad segments received."
+++#: ../statistics.c:130
+++#, fuzzy, c-format
+++msgid "%u bad segments received."
++ msgstr "poèet chybných pøíchozích segmentù: %d."
++ 
++-#: ../statistics.c:129
++-#, c-format
++-msgid "%d resets sent"
+++#: ../statistics.c:131
+++#, fuzzy, c-format
+++msgid "%u resets sent"
++ msgstr "poèet odeslaných resetù: %d"
++ 
++-#: ../statistics.c:134
++-#, c-format
++-msgid "%d packets received"
+++#: ../statistics.c:136
+++#, fuzzy, c-format
+++msgid "%u packets received"
++ msgstr "poèet pøijmutých paketù: %d"
++ 
++-#: ../statistics.c:135
++-#, c-format
++-msgid "%d packets to unknown port received."
+++#: ../statistics.c:137
+++#, fuzzy, c-format
+++msgid "%u packets to unknown port received."
++ msgstr "poèet paketù pøijmutých pro neznámý port: %d."
++ 
++-#: ../statistics.c:136
++-#, c-format
++-msgid "%d packet receive errors"
+++#: ../statistics.c:138
+++#, fuzzy, c-format
+++msgid "%u packet receive errors"
++ msgstr "poèet chyb pøi pøíjmu paketù: %d"
++ 
++-#: ../statistics.c:137
++-#, c-format
++-msgid "%d packets sent"
+++#: ../statistics.c:139
+++#, fuzzy, c-format
+++msgid "%u packets sent"
++ msgstr "poèet odeslaných paketù: %d"
++ 
++-#: ../statistics.c:142
++-#, c-format
++-msgid "%d SYN cookies sent"
+++#: ../statistics.c:144
+++#, fuzzy, c-format
+++msgid "%u SYN cookies sent"
++ msgstr "poèet odeslaných SYN cookies: %d"
++ 
++-#: ../statistics.c:143
++-#, c-format
++-msgid "%d SYN cookies received"
+++#: ../statistics.c:145
+++#, fuzzy, c-format
+++msgid "%u SYN cookies received"
++ msgstr "poèet pøijmutých SYN cookies: %d"
++ 
++-#: ../statistics.c:144
++-#, c-format
++-msgid "%d invalid SYN cookies received"
+++#: ../statistics.c:146
+++#, fuzzy, c-format
+++msgid "%u invalid SYN cookies received"
++ msgstr "poèet chybných pøíchozích SYN cookies: %d"
++ 
++-#: ../statistics.c:146
++-#, c-format
++-msgid "%d resets received for embryonic SYN_RECV sockets"
+++#: ../statistics.c:148
+++#, fuzzy, c-format
+++msgid "%u resets received for embryonic SYN_RECV sockets"
++ msgstr "poèet resetù pøijmutých pro sokety ve stavu SYN_PØÍCH: %d"
++ 
++-#: ../statistics.c:148
++-#, c-format
++-msgid "%d packets pruned from receive queue because of socket buffer overrun"
+++#: ../statistics.c:150
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue because of socket buffer overrun"
++ msgstr "poèet paketù odstranìných z fronty kvùli pøeteèení bufferu soketu: %d"
++ 
++ #. obsolete: 2.2.0 doesn't do that anymore
++-#: ../statistics.c:151
++-#, c-format
++-msgid "%d packets pruned from out-of-order queue"
+++#: ../statistics.c:153
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue"
++ msgstr "poèet paketù odstranìných z fronty mimo-poøadí: %d"
++ 
++-#: ../statistics.c:152
++-#, c-format
+++#: ../statistics.c:154
+++#, fuzzy, c-format
++ msgid ""
++-"%d packets dropped from out-of-order queue because of socket buffer overrun"
+++"%u packets dropped from out-of-order queue because of socket buffer overrun"
++ msgstr ""
++ "poèet paketù zahozených z fronty mimo-poøadí kvùli pøeteèení bufferu soketu: "
++ "%d"
++ 
++-#: ../statistics.c:154
++-#, c-format
++-msgid "%d ICMP packets dropped because they were out-of-window"
+++#: ../statistics.c:156
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because they were out-of-window"
++ msgstr "poèet ICMP paketù zahozených, proto¾e byly mimo-okno: %d"
++ 
++-#: ../statistics.c:156
++-#, c-format
++-msgid "%d ICMP packets dropped because socket was locked"
+++#: ../statistics.c:158
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because socket was locked"
++ msgstr "poèet ICMP paketù zahozených kvùli zamèenému soketu: %d"
++ 
+++#: ../statistics.c:160
+++#, c-format
+++msgid "%u TCP sockets finished time wait in fast timer"
+++msgstr ""
+++
+++#: ../statistics.c:161
+++#, c-format
+++msgid "%u time wait sockets recycled by time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:162
+++#, c-format
+++msgid "%u TCP sockets finished time wait in slow timer"
+++msgstr ""
+++
+++#: ../statistics.c:163
+++#, c-format
+++msgid "%u passive connections rejected because of time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:165
+++#, c-format
+++msgid "%u active connections rejected because of time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:167
+++#, c-format
+++msgid "%u packets rejects in established connections because of timestamp"
+++msgstr ""
+++
+++#: ../statistics.c:169
+++#, fuzzy, c-format
+++msgid "%u delayed acks sent"
+++msgstr "poèet odeslaných paketù: %d"
+++
+++#: ../statistics.c:170
+++#, c-format
+++msgid "%u delayed acks further delayed because of locked socket"
+++msgstr ""
+++
+++#: ../statistics.c:172
+++#, c-format
+++msgid "Quick ack mode was activated %u times"
+++msgstr ""
+++
+++#: ../statistics.c:173
+++#, c-format
+++msgid "%u times the listen queue of a socket overflowed"
+++msgstr ""
+++
+++#: ../statistics.c:175
+++#, c-format
+++msgid "%u SYNs to LISTEN sockets ignored"
+++msgstr ""
+++
+++#: ../statistics.c:176
+++#, c-format
+++msgid "%u packets directly queued to recvmsg prequeue."
+++msgstr ""
+++
+++#: ../statistics.c:178
+++#, c-format
+++msgid "%u of bytes directly received from backlog"
+++msgstr ""
+++
+++#: ../statistics.c:180
+++#, c-format
+++msgid "%u of bytes directly received from prequeue"
+++msgstr ""
+++
+++#: ../statistics.c:182
+++#, fuzzy, c-format
+++msgid "%u packets dropped from prequeue"
+++msgstr "poèet paketù odstranìných z fronty mimo-poøadí: %d"
+++
+++#: ../statistics.c:183
+++#, fuzzy, c-format
+++msgid "%u packet headers predicted"
+++msgstr "poèet pøijmutých paketù: %d"
+++
+++#: ../statistics.c:184
+++#, c-format
+++msgid "%u packets header predicted and directly queued to user"
+++msgstr ""
+++
+++#: ../statistics.c:186
+++#, c-format
+++msgid "Ran %u times out of system memory during packet sending"
+++msgstr ""
+++
+++#: ../statistics.c:188
+++#, fuzzy, c-format
+++msgid "%u acknowledgments not containing data received"
+++msgstr "poèet paketù pøijmutých pro neznámý port: %d."
+++
+++#: ../statistics.c:189
+++#, c-format
+++msgid "%u predicted acknowledgments"
+++msgstr ""
+++
+++#: ../statistics.c:190
+++#, c-format
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:191
+++#, c-format
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr ""
+++
+++#: ../statistics.c:192
+++#, fuzzy, c-format
+++msgid "%u bad SACKs received"
+++msgstr "poèet chybných pøíchozích segmentù: %d."
+++
+++#: ../statistics.c:193
+++#, c-format
+++msgid "Detected reordering %u times using FACK"
+++msgstr ""
+++
+++#: ../statistics.c:194
+++#, c-format
+++msgid "Detected reordering %u times using SACK"
+++msgstr ""
+++
+++#: ../statistics.c:195
+++#, c-format
+++msgid "Detected reordering %u times using time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:196
+++#, c-format
+++msgid "Detected reordering %u times using reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:197
+++#, c-format
+++msgid "%u congestion windows fully recovered"
+++msgstr ""
+++
+++#: ../statistics.c:198
+++#, c-format
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
+++msgstr ""
+++
+++#: ../statistics.c:199
+++#, c-format
+++msgid "%u congestion window recovered using DSACK"
+++msgstr ""
+++
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr ""
+++
+++#: ../statistics.c:201
+++#, fuzzy, c-format
+++msgid "%u retransmits lost"
+++msgstr "poèet odeslaných resetù: %d"
+++
+++#: ../statistics.c:202
+++#, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr ""
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr ""
+++
+++#: ../statistics.c:205
+++#, fuzzy, c-format
+++msgid "%u fast retransmits"
+++msgstr "poèet pøenesených segmentù: %d"
+++
+++#: ../statistics.c:206
+++#, c-format
+++msgid "%u forward retransmits"
+++msgstr ""
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr ""
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr ""
+++
+++#: ../statistics.c:209
+++#, fuzzy, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr "poèet pøenesených segmentù: %d"
+++
+++#: ../statistics.c:210
+++#, fuzzy, c-format
+++msgid "%u sack retransmits failed"
+++msgstr "poèet paketù, je¾ se nepodaøilo znovu sestavit: %d"
+++
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr ""
+++
+++#: ../statistics.c:212
+++#, fuzzy, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr "poèet paketù odstranìných z fronty kvùli pøeteèení bufferu soketu: %d"
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr ""
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr ""
+++
+++#: ../statistics.c:215
+++#, fuzzy, c-format
+++msgid "%u DSACKs received"
+++msgstr "poèet pøijmutých paketù: %d"
+++
+++#: ../statistics.c:216
+++#, fuzzy, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr "celkem pøijmutých paketù: %d"
+++
+++#: ../statistics.c:217
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr "poèet pøijmutých resetù: %d"
+++
+++#: ../statistics.c:218
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr "poèet pøijmutých resetù: %d"
+++
+++#: ../statistics.c:219
+++#, fuzzy, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr "poèet pøijmutých resetù: %d"
+++
+++#: ../statistics.c:220
+++#, c-format
+++msgid "%u connections aborted due to memory pressure"
+++msgstr ""
+++
+++#: ../statistics.c:221
+++#, fuzzy, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr "poèet pøijmutých resetù: %d"
+++
++ #: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr ""
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr ""
+++
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr ""
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr ""
+++
+++#: ../statistics.c:292
++ msgid "enabled"
++ msgstr "zapnuto"
++ 
++-#: ../statistics.c:222
+++#: ../statistics.c:292
++ msgid "disabled"
++ msgstr "vypnuto"
++ 
++-#: ../statistics.c:272
++-#, c-format
++-msgid "unknown title %s\n"
++-msgstr "titulek %s je neznámý\n"
++-
++-#: ../statistics.c:298
+++#: ../statistics.c:375
++ msgid "error parsing /proc/net/snmp"
++ msgstr "chyba pøi zpracování /proc/net/snmp"
++ 
++-#: ../statistics.c:311
+++#: ../statistics.c:388
++ msgid "cannot open /proc/net/snmp"
++ msgstr "/proc/net/snmp nelze otevøít"
++ 
++@@ -1821,89 +2112,95 @@ msgstr "Hardwarový typ `%s' není podporo
++ msgid "Cannot change line discipline to `%s'.\n"
++ msgstr "Linkovou disciplínu nelze na `%s' zmìnit.\n"
++ 
++-#: ../lib/af.c:145 ../lib/hw.c:148
+++#: ../lib/af.c:153 ../lib/hw.c:161
++ msgid "UNSPEC"
++ msgstr "NEZNÁM"
++ 
++-#: ../lib/af.c:147
+++#: ../lib/af.c:155
++ msgid "UNIX Domain"
++ msgstr "Doména UNIX"
++ 
++-#: ../lib/af.c:150
+++#: ../lib/af.c:158
++ msgid "DARPA Internet"
++ msgstr "DARPA Internet"
++ 
++-#: ../lib/af.c:153
+++#: ../lib/af.c:161
++ msgid "IPv6"
++ msgstr "IPv6"
++ 
++-#: ../lib/af.c:156 ../lib/hw.c:169
+++#: ../lib/af.c:164 ../lib/hw.c:182
++ msgid "AMPR AX.25"
++ msgstr "AMPR AX.25"
++ 
++-#: ../lib/af.c:159 ../lib/hw.c:175
+++#: ../lib/af.c:167 ../lib/hw.c:188
++ msgid "AMPR NET/ROM"
++ msgstr "AMPR NET/ROM"
++ 
++-#: ../lib/af.c:162
+++#: ../lib/af.c:170
++ msgid "Novell IPX"
++ msgstr "Novell IPX"
++ 
++-#: ../lib/af.c:165
+++#: ../lib/af.c:173
++ msgid "Appletalk DDP"
++ msgstr "Appletalk DDP"
++ 
++-#: ../lib/af.c:168 ../lib/hw.c:207
+++#: ../lib/af.c:176 ../lib/hw.c:223
++ msgid "Econet"
++ msgstr "Econet"
++ 
++-#: ../lib/af.c:171 ../lib/hw.c:172
+++#: ../lib/af.c:179
+++msgid "CCITT X.25"
+++msgstr ""
+++
+++#: ../lib/af.c:182 ../lib/hw.c:185
++ msgid "AMPR ROSE"
++ msgstr "AMPR ROSE"
++ 
++-#: ../lib/af.c:174 ../lib/hw.c:160
+++#: ../lib/af.c:185 ../lib/hw.c:173
++ msgid "Ash"
++ msgstr "Ash"
++ 
++-#: ../lib/af.c:232
+++#: ../lib/af.c:243
+++#, c-format
++ msgid "Please don't supply more than one address family.\n"
++ msgstr "Nezadávejte více ne¾ jednu tøídu adres.\n"
++ 
++-#: ../lib/af.c:293
+++#: ../lib/af.c:304
+++#, c-format
++ msgid "Too much address family arguments.\n"
++ msgstr "Bylo zadáno pøíli¹ mnoho tøíd adres.\n"
++ 
++-#: ../lib/af.c:304
+++#: ../lib/af.c:315
++ #, c-format
++ msgid "Unknown address family `%s'.\n"
++ msgstr "Tøída adres `%s' není známa.\n"
++ 
++-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
++-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
++-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
++-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
++-msgid "[NONE SET]"
++-msgstr "[NENASTAVENO]"
++-
++-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
+++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
++ #, c-format
++ msgid "in_arcnet(%s): invalid arcnet address!\n"
++ msgstr "in_arcnet(%s): chybná arcnet adresa!\n"
++ 
++-#: ../lib/arcnet.c:108
+++#: ../lib/arcnet.c:97
++ #, c-format
++ msgid "in_arcnet(%s): trailing : ignored!\n"
++ msgstr "in_arcnet(%s): nadbyteèné : ignorováno!\n"
++ 
++-#: ../lib/arcnet.c:120
+++#: ../lib/arcnet.c:109
++ #, c-format
++ msgid "in_arcnet(%s): trailing junk!\n"
++ msgstr "in_arcnet(%s): nadbyteèné znaky!\n"
++ 
++ #: ../lib/ash.c:81
+++#, c-format
++ msgid "Malformed Ash address"
++ msgstr "Chybná Ash adresa"
++ 
+++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
+++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
+++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
+++msgid "[NONE SET]"
+++msgstr "[NENASTAVENO]"
+++
++ #: ../lib/ax25.c:97 ../lib/netrom.c:100
++ msgid "Invalid callsign"
++ msgstr "Nesprávný volací znak"
++@@ -1913,22 +2210,21 @@ msgid "Callsign too long"
++ msgstr "Volací znak je pøíli¹ dlouhý."
++ 
++ #: ../lib/ax25_gr.c:47
+++#, c-format
++ msgid "AX.25 not configured in this system.\n"
++ msgstr "AX.25 není na tomto systému nakonfigurováno.\n"
++ 
++ #: ../lib/ax25_gr.c:50
+++#, c-format
++ msgid "Kernel AX.25 routing table\n"
++ msgstr "Smìrovací tabulka v jádru pro AX.25\n"
++ 
++ #. xxx
++ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
++ msgid "Destination  Iface    Use\n"
++ msgstr "Adresát      Rozhraní U¾ití\n"
++ 
++-#: ../lib/ddp_gr.c:21
++-msgid "Routing table for `ddp' not yet supported.\n"
++-msgstr "Smìrovací tabulka pro `ddp' není zatím podporována.\n"
++-
++ #: ../lib/ether.c:74 ../lib/ether.c:91
++ #, c-format
++ msgid "in_ether(%s): invalid ether address!\n"
++@@ -1944,153 +2240,171 @@ msgstr "in_ether(%s): nadbyteèné : ignor
++ msgid "in_ether(%s): trailing junk!\n"
++ msgstr "in_ether(%s): nadbyteèné znaky!\n"
++ 
++-#: ../lib/fddi.c:95 ../lib/fddi.c:110
+++#: ../lib/fddi.c:84 ../lib/fddi.c:99
++ #, c-format
++ msgid "in_fddi(%s): invalid fddi address!\n"
++ msgstr "in_fddi(%s): chybná fddi adresa!\n"
++ 
++-#: ../lib/fddi.c:122
+++#: ../lib/fddi.c:111
++ #, c-format
++ msgid "in_fddi(%s): trailing : ignored!\n"
++ msgstr "in_fddi(%s): nadbyteèné : ignorováno!\n"
++ 
++-#: ../lib/fddi.c:134
+++#: ../lib/fddi.c:123
++ #, c-format
++ msgid "in_fddi(%s): trailing junk!\n"
++ msgstr "in_fddi(%s): nadbyteèné znaky!\n"
++ 
++-#: ../lib/getroute.c:97 ../lib/setroute.c:76
+++#: ../lib/getroute.c:101 ../lib/setroute.c:80
++ #, c-format
++ msgid "Address family `%s' not supported.\n"
++ msgstr "Tøída adres `%s' není podporována.\n"
++ 
++-#: ../lib/getroute.c:103 ../lib/setroute.c:80
+++#: ../lib/getroute.c:107 ../lib/setroute.c:84
++ #, c-format
++ msgid "No routing for address family `%s'.\n"
++ msgstr "Pro tøídu adres `%s' není ¾ádné smìrování.\n"
++ 
++-#: ../lib/hippi.c:96 ../lib/hippi.c:111
+++#: ../lib/hippi.c:84 ../lib/hippi.c:99
++ #, c-format
++ msgid "in_hippi(%s): invalid hippi address!\n"
++ msgstr "in_hippi(%s): chybná hippi adresa!\n"
++ 
++-#: ../lib/hippi.c:123
+++#: ../lib/hippi.c:111
++ #, c-format
++ msgid "in_hippi(%s): trailing : ignored!\n"
++ msgstr "in_hippi(%s): nadbyteèné : ignorováno!\n"
++ 
++-#: ../lib/hippi.c:134
+++#: ../lib/hippi.c:122
++ #, c-format
++ msgid "in_hippi(%s): trailing junk!\n"
++ msgstr "in_hippi(%s): nadbyteèné znaky!\n"
++ 
++-#: ../lib/hw.c:147
+++#: ../lib/hw.c:160
++ msgid "Local Loopback"
++ msgstr "Místní smyèka"
++ 
++-#: ../lib/hw.c:150
+++#: ../lib/hw.c:163
++ msgid "Serial Line IP"
++ msgstr "IP po sériové lince"
++ 
++-#: ../lib/hw.c:151
+++#: ../lib/hw.c:164
++ msgid "VJ Serial Line IP"
++ msgstr "Vj IP po sériové lince"
++ 
++-#: ../lib/hw.c:152
+++#: ../lib/hw.c:165
++ msgid "6-bit Serial Line IP"
++ msgstr "6bitový IP po sériové lince"
++ 
++-#: ../lib/hw.c:153
+++#: ../lib/hw.c:166
++ msgid "VJ 6-bit Serial Line IP"
++ msgstr "6bitový VJ IP po sériové lince"
++ 
++-#: ../lib/hw.c:154
+++#: ../lib/hw.c:167
++ msgid "Adaptive Serial Line IP"
++ msgstr "Adaptivní IP po sériové lince"
++ 
++-#: ../lib/hw.c:157
+++#: ../lib/hw.c:170
++ msgid "Ethernet"
++ msgstr "Ethernet"
++ 
++-#: ../lib/hw.c:163
+++#: ../lib/hw.c:176
++ msgid "Fiber Distributed Data Interface"
++ msgstr "Fiber Distributed Data Interface"
++ 
++-#: ../lib/hw.c:166
+++#: ../lib/hw.c:179
++ msgid "HIPPI"
++ msgstr "HIPPI"
++ 
++-#: ../lib/hw.c:178
+++#: ../lib/hw.c:191
+++msgid "generic X.25"
+++msgstr ""
+++
+++#: ../lib/hw.c:194
++ msgid "IPIP Tunnel"
++ msgstr "IPIP Tunnel"
++ 
++-#: ../lib/hw.c:181
+++#: ../lib/hw.c:197
++ msgid "Point-to-Point Protocol"
++ msgstr "Point-to-Point Protokol"
++ 
++-#: ../lib/hw.c:184
+++#: ../lib/hw.c:200
++ msgid "(Cisco)-HDLC"
++ msgstr "(Cisco)-HDLC"
++ 
++-#: ../lib/hw.c:185
+++#: ../lib/hw.c:201
++ msgid "LAPB"
++ msgstr "LAPB"
++ 
++-#: ../lib/hw.c:188
+++#: ../lib/hw.c:204
++ msgid "ARCnet"
++ msgstr "ARCnet"
++ 
++-#: ../lib/hw.c:191
+++#: ../lib/hw.c:207
++ msgid "Frame Relay DLCI"
++ msgstr "Frame Relay DLCI"
++ 
++-#: ../lib/hw.c:192
+++#: ../lib/hw.c:208
++ msgid "Frame Relay Access Device"
++ msgstr "Pøístupové zaøízení Frame Relay"
++ 
++-#: ../lib/hw.c:195
+++#: ../lib/hw.c:211
++ msgid "IPv6-in-IPv4"
++ msgstr "IPv6-in-IPv4"
++ 
++-#: ../lib/hw.c:198
+++#: ../lib/hw.c:214
++ msgid "IrLAP"
++ msgstr "IrLAP"
++ 
++-#: ../lib/hw.c:201
+++#: ../lib/hw.c:217
++ msgid "16/4 Mbps Token Ring"
++ msgstr "Token Ring 16/4 Mb/s"
++ 
++-#: ../lib/hw.c:203
+++#: ../lib/hw.c:219
++ #, fuzzy
++ msgid "16/4 Mbps Token Ring (New)"
++ msgstr "Token Ring 16/4 Mb/s"
++ 
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr ""
+++
++ #: ../lib/inet.c:153 ../lib/inet6.c:79
++ #, c-format
++ msgid "rresolve: unsupport address family %d !\n"
++ msgstr "rresolve: tøída adres %d není podporována!\n"
++ 
++-#: ../lib/inet6_gr.c:79
+++#: ../lib/inet6.c:131
+++#, fuzzy
+++msgid "[UNKNOWN]"
+++msgstr "NEZNÁM"
+++
+++#: ../lib/inet6_gr.c:71
+++#, c-format
++ msgid "INET6 (IPv6) not configured in this system.\n"
++ msgstr "INET6 (IPv6) není na tomto systému nakonfigurováno.\n"
++ 
++-#: ../lib/inet6_gr.c:82
+++#: ../lib/inet6_gr.c:74
+++#, c-format
++ msgid "Kernel IPv6 routing table\n"
++ msgstr "Smìrovací tabulka v jádru pro IPv6\n"
++ 
++-#: ../lib/inet6_gr.c:84
+++#: ../lib/inet6_gr.c:76
+++#, c-format
++ msgid ""
++-"Destination                                 Next Hop                         "
++-"       Flags Metric Ref    Use Iface\n"
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
++ msgstr ""
++-"Adresát                                     Dal¹í Smìrovaè                   "
++-"       Pøízn Metrika Odkaz U¾it Rozhraní\n"
+++"Adresát                                     Dal¹í "
+++"Smìrovaè                          Pøízn Metrika Odkaz U¾it Rozhraní\n"
++ 
++-#: ../lib/inet6_gr.c:158
+++#: ../lib/inet6_gr.c:150
+++#, c-format
++ msgid "Kernel IPv6 Neighbour Cache\n"
++ msgstr "Cache sousedù v jádru pro IPv6\n"
++ 
++-#: ../lib/inet6_gr.c:161
+++#: ../lib/inet6_gr.c:153
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State\n"
++@@ -2098,7 +2412,8 @@ msgstr ""
++ "Soused                                      HW Adresa         Rozhraní Pøízn "
++ "Odkazy Stav\n"
++ 
++-#: ../lib/inet6_gr.c:165
+++#: ../lib/inet6_gr.c:157
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State            Stale(sec) Delete(sec)\n"
++@@ -2107,30 +2422,37 @@ msgstr ""
++ "Pøíznaky Odkazy Stav          Pro¹lý(sec) Smazat(sec)\n"
++ 
++ #: ../lib/inet6_sr.c:46
+++#, c-format
++ msgid "Usage: inet6_route [-vF] del Target\n"
++ msgstr "Pou¾ití: inet6_route [-vF] del Cíl\n"
++ 
++ #: ../lib/inet6_sr.c:47
+++#, c-format
++ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
++ msgstr "       inet6_route [-vF] add Cíl [gw Gw] [metrika M] [[dev] If]\n"
++ 
++ #: ../lib/inet6_sr.c:48
+++#, c-format
++ msgid "       inet6_route [-FC] flush      NOT supported\n"
++ msgstr "       inet6_route [-FC] flush      NENÍ podporováno\n"
++ 
++-#: ../lib/inet6_sr.c:182
+++#: ../lib/inet6_sr.c:188
+++#, c-format
++ msgid "Flushing `inet6' routing table not supported\n"
++ msgstr "Smìrovací tabulku `inet6' nelze vyprazdòovat\n"
++ 
++ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
++ msgid "INET (IPv4) not configured in this system.\n"
++ msgstr "INET (IPv4) není na tomto systému nakonfigurováno.\n"
++ 
++ #: ../lib/inet_gr.c:53
+++#, c-format
++ msgid "Kernel IP routing table\n"
++ msgstr "Smìrovací tabulka v jádru pro IP\n"
++ 
++ #: ../lib/inet_gr.c:56
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2139,6 +2461,7 @@ msgstr ""
++ "Rozhraní\n"
++ 
++ #: ../lib/inet_gr.c:59
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
++ "Iface\n"
++@@ -2147,6 +2470,7 @@ msgstr ""
++ "Rozhraní\n"
++ 
++ #: ../lib/inet_gr.c:62
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt\n"
++@@ -2155,10 +2479,12 @@ msgstr ""
++ "Rozhraní MSS   Okno   irtt\n"
++ 
++ #: ../lib/inet_gr.c:237
+++#, c-format
++ msgid "Kernel IP routing cache\n"
++ msgstr "Smìrovací cache v jádru pro IP\n"
++ 
++ #: ../lib/inet_gr.c:258
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2167,6 +2493,7 @@ msgstr ""
++ "Rozhraní\n"
++ 
++ #: ../lib/inet_gr.c:261
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags   MSS Window  irtt "
++ "Iface\n"
++@@ -2175,6 +2502,7 @@ msgstr ""
++ "Rozhraní\n"
++ 
++ #: ../lib/inet_gr.c:266
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  HH  Arp\n"
++@@ -2183,6 +2511,7 @@ msgstr ""
++ "Rozhraní MSS   Okno   irtt HH   Arp\n"
++ 
++ #: ../lib/inet_gr.c:290
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++@@ -2190,7 +2519,8 @@ msgstr ""
++ "Odesílatel      Adresát         Maska           Pøízn Metrik Odkazy U¾t "
++ "Rozhraní MSS    Okno irtt   TOS HHOdk HHAktuál    Zvlá¹tCíl\n"
++ 
++-#: ../lib/inet_sr.c:50
+++#: ../lib/inet_sr.c:51
+++#, c-format
++ msgid ""
++ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++@@ -2198,29 +2528,34 @@ msgstr ""
++ "Pou¾ití: inet_route [-vF] del {-host|-net} Cíl[/prefix] [gw Gw] [metrika M] "
++ "[[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:51
+++#: ../lib/inet_sr.c:52
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
++ msgstr ""
++ "       inet_route [-vF] add {-host|-net} Cíl[/prefix] [gw Gw] [metrika M]\n"
++ 
++-#: ../lib/inet_sr.c:52
+++#: ../lib/inet_sr.c:53
+++#, c-format
++ msgid ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ msgstr ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ 
++-#: ../lib/inet_sr.c:53
+++#: ../lib/inet_sr.c:54
+++#, c-format
++ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:54
+++#: ../lib/inet_sr.c:55
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
++ msgstr ""
++ "       inet_route [-vF] add {-host|-net} Cíl/[prefix] [metrika M] reject\n"
++ 
++-#: ../lib/inet_sr.c:55
+++#: ../lib/inet_sr.c:56
+++#, c-format
++ msgid "       inet_route [-FC] flush      NOT supported\n"
++ msgstr "       inet_route [-FC] flush      NENÍ podporováno\n"
++ 
++@@ -2230,15 +2565,17 @@ msgid "route: %s: cannot use a NETWORK a
++ msgstr "route: %s: sí» nelze pou¾ít jako bránu!\n"
++ 
++ #: ../lib/inet_sr.c:174
++-#, fuzzy
+++#, fuzzy, c-format
++ msgid "route: Invalid MSS/MTU.\n"
++ msgstr "route: Nesprávné NSS.\n"
++ 
++ #: ../lib/inet_sr.c:187
+++#, c-format
++ msgid "route: Invalid window.\n"
++ msgstr "route: Nesprávné okno.\n"
++ 
++ #: ../lib/inet_sr.c:203
+++#, c-format
++ msgid "route: Invalid initial rtt.\n"
++ msgstr "route: Nesprávné zahajovací rtt.\n"
++ 
++@@ -2253,75 +2590,92 @@ msgid "route: bogus netmask %s\n"
++ msgstr "route: sí»ová maska %s je nesprávná\n"
++ 
++ #: ../lib/inet_sr.c:270
+++#, c-format
++ msgid "route: netmask doesn't match route address\n"
++ msgstr "route: sí»ová maska nevyhovuje adrese cesty\n"
++ 
++ #: ../lib/inet_sr.c:306
+++#, c-format
++ msgid "Flushing `inet' routing table not supported\n"
++ msgstr "Smìrovací cache `inet' nelze vyprazdòovat\n"
++ 
++ #: ../lib/inet_sr.c:310
+++#, c-format
++ msgid "Modifying `inet' routing cache not supported\n"
++ msgstr "Smìrovací cache `inet' nelze mìnit\n"
++ 
++ #: ../lib/ipx_gr.c:52
+++#, c-format
++ msgid "IPX not configured in this system.\n"
++ msgstr "IPX není na tomto systému nakonfigurováno.\n"
++ 
++ #: ../lib/ipx_gr.c:56
+++#, c-format
++ msgid "Kernel IPX routing table\n"
++ msgstr "Smìrovací tabulka v jádru pro IPX\n"
++ 
++ #. xxx
++ #: ../lib/ipx_gr.c:57
+++#, c-format
++ msgid "Destination               Router Net                Router Node\n"
++ msgstr "Cíl                       Smìrovaè Sí»              Smìrovaè Uzel\n"
++ 
++ #: ../lib/ipx_sr.c:33
+++#, c-format
++ msgid "IPX: this needs to be written\n"
++ msgstr "IPX: toto je tøeba ulo¾it\n"
++ 
++-#: ../lib/masq_info.c:197
+++#: ../lib/masq_info.c:198
+++#, c-format
++ msgid "IP masquerading entries\n"
++ msgstr "IP maskovací polo¾ky\n"
++ 
++-#: ../lib/masq_info.c:200
+++#: ../lib/masq_info.c:201
+++#, c-format
++ msgid "prot   expire source               destination          ports\n"
++ msgstr "prot   ¾ivot  zdroj                cíl                  porty\n"
++ 
++-#: ../lib/masq_info.c:203
+++#: ../lib/masq_info.c:204
+++#, c-format
++ msgid ""
++-"prot   expire    initseq delta prevd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
++ msgstr ""
++-"prot   ¾ivot     zahajsek delta pøedchd zdroj             cíl                "
++-"   porty\n"
+++"prot   ¾ivot     zahajsek delta pøedchd zdroj             "
+++"cíl                   porty\n"
++ 
++ #: ../lib/netrom_gr.c:48
+++#, c-format
++ msgid "NET/ROM not configured in this system.\n"
++ msgstr "NET/ROM není na tomto systému nakonfigurováno.\n"
++ 
++ #: ../lib/netrom_gr.c:51
+++#, c-format
++ msgid "Kernel NET/ROM routing table\n"
++ msgstr "Smìrovací tabulka v jádru pro NET/ROM\n"
++ 
++ #: ../lib/netrom_gr.c:52
+++#, c-format
++ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
++ msgstr "Cíl          Mnemonika Kvalita  Soused     Rozhraní\n"
++ 
++ #: ../lib/netrom_sr.c:34
+++#, c-format
++ msgid "netrom usage\n"
++ msgstr "pou¾ití netrom\n"
++ 
++ #: ../lib/netrom_sr.c:44
+++#, c-format
++ msgid "NET/ROM: this needs to be written\n"
++ msgstr "NET/ROM: toto je potøeba ulo¾it\n"
++ 
++ #: ../lib/ppp.c:44
+++#, c-format
++ msgid "You cannot start PPP with this program.\n"
++ msgstr "Tímto programem nelze PPP spustit.\n"
++ 
++ #: ../lib/ppp_ac.c:38
+++#, c-format
++ msgid "Sorry, use pppd!\n"
++ msgstr "Lituji, pou¾ijte pppd!\n"
++ 
++@@ -2330,49 +2684,319 @@ msgid "Node address must be ten digits"
++ msgstr "Adresa uzlu musí mít 10 èíslic"
++ 
++ #: ../lib/rose_gr.c:51
+++#, c-format
++ msgid "ROSE not configured in this system.\n"
++ msgstr "ROSE není na tomto systému nakonfigurováno.\n"
++ 
++ #: ../lib/rose_gr.c:54
+++#, c-format
++ msgid "Kernel ROSE routing table\n"
++ msgstr "Smìrovací tabulka v jádru pro ROSE\n"
++ 
++-#: ../lib/tr.c:70 ../lib/tr.c:85
+++#: ../lib/tr.c:86 ../lib/tr.c:101
++ #, c-format
++ msgid "in_tr(%s): invalid token ring address!\n"
++ msgstr "in_tr(%s): nesprávná token ring adresa!\n"
++ 
++-#: ../lib/tr.c:97
+++#: ../lib/tr.c:113
++ #, c-format
++ msgid "in_tr(%s): trailing : ignored!\n"
++ msgstr "in_tr(%s): nadbyteèné: ignorováno!\n"
++ 
++-#: ../lib/tr.c:109
+++#: ../lib/tr.c:125
++ #, c-format
++ msgid "in_tr(%s): trailing junk!\n"
++ msgstr "in_tr(%s): nadbyteèné znaky!\n"
++ 
++-#: ../lib/interface.c:124
+++#: ../lib/interface.c:176
++ #, c-format
++ msgid "warning: no inet socket available: %s\n"
++ msgstr "varování: není dostupný ¾ádný inet soket: %s\n"
++ 
++-#: ../lib/interface.c:270
+++#: ../lib/interface.c:325
++ #, c-format
++ msgid "Warning: cannot open %s (%s). Limited output.\n"
++ msgstr ""
++ 
++ #. Give better error message for this case.
++-#: ../lib/interface.c:504
+++#: ../lib/interface.c:571
++ msgid "Device not found"
++ msgstr "Zaøízení nebylo nalezeno"
++ 
++-#: ../lib/interface.c:508
+++#: ../lib/interface.c:575
++ #, c-format
++ msgid "%s: error fetching interface information: %s\n"
++ msgstr "%s: chyba pøi získávání informací o rozhraní %s\n"
++ 
++-#: ../lib/sockets.c:59
+++#: ../lib/interface.c:608
+++msgid "     - no statistics available -"
+++msgstr "     - statistická data nejsou dostupná -"
+++
+++#: ../lib/interface.c:612
+++#, c-format
+++msgid "[NO FLAGS]"
+++msgstr "[®ÁDNÉ PØÍZNAKY]"
+++
+++#: ../lib/interface.c:688
+++#, c-format
+++msgid "%-9.9s Link encap:%s  "
+++msgstr "%-9.9s Zapouzdøení:%s  "
+++
+++#: ../lib/interface.c:693
+++#, c-format
+++msgid "HWaddr %s  "
+++msgstr "HWadr %s  "
+++
+++#: ../lib/interface.c:696
+++#, c-format
+++msgid "Media:%s"
+++msgstr "Médium:%s"
+++
+++#: ../lib/interface.c:698
+++#, c-format
+++msgid "(auto)"
+++msgstr "(auto)"
+++
+++#: ../lib/interface.c:705
+++#, c-format
+++msgid "          %s addr:%s "
+++msgstr "          %s adr:%s "
+++
+++#: ../lib/interface.c:708
+++#, c-format
+++msgid " P-t-P:%s "
+++msgstr " P-t-P:%s "
+++
+++# V ostatních katalozích se pøekládá Broadcast -> v¹esmìrové vysílání.
+++# Tudi¾ bcast -> V¹esmìr :)
+++#: ../lib/interface.c:711
+++#, c-format
+++msgid " Bcast:%s "
+++msgstr " V¹esmìr:%s "
+++
+++#: ../lib/interface.c:713
+++#, c-format
+++msgid " Mask:%s\n"
+++msgstr "Maska:%s\n"
+++
+++#: ../lib/interface.c:730
+++#, c-format
+++msgid "          inet6 addr: %s/%d"
+++msgstr "          inet6-adr: %s/%d"
+++
+++#: ../lib/interface.c:732
+++#, c-format
+++msgid " Scope:"
+++msgstr " Rozsah:"
+++
+++#: ../lib/interface.c:735
+++#, c-format
+++msgid "Global"
+++msgstr "Globál"
+++
+++#: ../lib/interface.c:738
+++#, c-format
+++msgid "Link"
+++msgstr "Linka"
+++
+++#: ../lib/interface.c:741
+++#, c-format
+++msgid "Site"
+++msgstr "Stanovi¹tì"
+++
+++#: ../lib/interface.c:744
+++#, c-format
+++msgid "Compat"
+++msgstr "Kompatibilita"
+++
+++#: ../lib/interface.c:747
+++#, c-format
+++msgid "Host"
+++msgstr "Poèítaè"
+++
+++#: ../lib/interface.c:750
+++#, c-format
+++msgid "Unknown"
+++msgstr "Neznám."
+++
+++#: ../lib/interface.c:765
+++#, c-format
+++msgid "          IPX/Ethernet II addr:%s\n"
+++msgstr "          IPX/Ethernet II adr: %s\n"
+++
+++#: ../lib/interface.c:768
+++#, c-format
+++msgid "          IPX/Ethernet SNAP addr:%s\n"
+++msgstr "          IPX/Ethernet SNAP adr:%s\n"
+++
+++#: ../lib/interface.c:771
+++#, c-format
+++msgid "          IPX/Ethernet 802.2 addr:%s\n"
+++msgstr "          IPX/Ethernet 802.2 adr:%s\n"
+++
+++#: ../lib/interface.c:774
+++#, c-format
+++msgid "          IPX/Ethernet 802.3 addr:%s\n"
+++msgstr "          IPX/Ethernet 802.3 adr:%s\n"
+++
+++#: ../lib/interface.c:784
+++#, c-format
+++msgid "          EtherTalk Phase 2 addr:%s\n"
+++msgstr "          EtherTalk Phase 2 adr:%s\n"
+++
+++#: ../lib/interface.c:793
+++#, c-format
+++msgid "          econet addr:%s\n"
+++msgstr "          econet adr:%s\n"
+++
+++# Hic sunt leones ...
+++#: ../lib/interface.c:800
+++#, c-format
+++msgid "[NO FLAGS] "
+++msgstr "[®ÁDNÉ PØÍZNAKY]"
+++
+++#: ../lib/interface.c:802
+++#, c-format
+++msgid "UP "
+++msgstr "AKTIVOVÁNO "
+++
+++#: ../lib/interface.c:804
+++#, c-format
+++msgid "BROADCAST "
+++msgstr "V©ESMÌROVÉ_VYSÍLÁNÍ "
+++
+++#: ../lib/interface.c:806
+++#, c-format
+++msgid "DEBUG "
+++msgstr "DEBUG "
+++
+++#: ../lib/interface.c:808
+++#, c-format
+++msgid "LOOPBACK "
+++msgstr "SMYÈKA "
+++
+++#: ../lib/interface.c:810
+++#, c-format
+++msgid "POINTOPOINT "
+++msgstr "POINTOPOINT "
+++
+++# ??
+++#: ../lib/interface.c:812
+++#, c-format
+++msgid "NOTRAILERS "
+++msgstr "NOTRAILERS "
+++
+++#: ../lib/interface.c:814
+++#, c-format
+++msgid "RUNNING "
+++msgstr "BÌ®Í "
+++
+++#: ../lib/interface.c:816
+++#, c-format
+++msgid "NOARP "
+++msgstr "NEARP "
+++
+++#: ../lib/interface.c:818
+++#, c-format
+++msgid "PROMISC "
+++msgstr "PROMISK "
+++
+++#: ../lib/interface.c:820
+++#, c-format
+++msgid "ALLMULTI "
+++msgstr "ALLMULTI "
+++
+++#: ../lib/interface.c:822
+++#, c-format
+++msgid "SLAVE "
+++msgstr "SLAVE "
+++
+++#: ../lib/interface.c:824
+++#, c-format
+++msgid "MASTER "
+++msgstr "MASTER "
+++
+++#: ../lib/interface.c:826
+++#, c-format
+++msgid "MULTICAST "
+++msgstr "MULTICAST "
+++
+++#: ../lib/interface.c:829
+++#, c-format
+++msgid "DYNAMIC "
+++msgstr "DYNAMIC "
+++
+++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
+++#: ../lib/interface.c:832
+++#, c-format
+++msgid " MTU:%d  Metric:%d"
+++msgstr " MTU:%d  Metrika:%d"
+++
+++#: ../lib/interface.c:836
+++#, c-format
+++msgid "  Outfill:%d  Keepalive:%d"
+++msgstr "  Outfill:%d  Keepalive:%d"
+++
+++#: ../lib/interface.c:850
+++#, fuzzy, c-format
+++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
+++msgstr "pøijmutých paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu rámcù:%lu\n"
+++
+++#: ../lib/interface.c:855
+++#, c-format
+++msgid "             compressed:%lu\n"
+++msgstr "             komprimováno:%lu\n"
+++
+++# carrier?
+++#: ../lib/interface.c:895
+++#, fuzzy, c-format
+++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgstr "odeslaných paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu pøenos:%lu\n"
+++
+++#: ../lib/interface.c:899
+++#, c-format
+++msgid "          collisions:%lu "
+++msgstr "          kolizí:%lu "
+++
+++#: ../lib/interface.c:901
+++#, c-format
+++msgid "compressed:%lu "
+++msgstr "komprimováno:%lu "
+++
+++#: ../lib/interface.c:903
+++#, c-format
+++msgid "txqueuelen:%d "
+++msgstr "délka odchozí fronty:%d "
+++
+++#: ../lib/interface.c:905
+++#, c-format
+++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
+++msgstr ""
+++
+++#: ../lib/interface.c:916
+++#, c-format
+++msgid "Interrupt:%d "
+++msgstr "Pøeru¹ení:%d "
+++
+++#. Only print devices using it for
+++#. I/O maps
+++#: ../lib/interface.c:919
+++#, c-format
+++msgid "Base address:0x%x "
+++msgstr "Vstupnì/Výstupní port:0x%x "
+++
+++#: ../lib/interface.c:921
+++#, c-format
+++msgid "Memory:%lx-%lx "
+++msgstr "Pamì»:%lx-%lx "
+++
+++#: ../lib/interface.c:924
+++#, c-format
+++msgid "DMA chan:%x "
+++msgstr "Kanál DMA:%x "
+++
+++#: ../lib/sockets.c:63
+++#, c-format
++ msgid "No usable address families found.\n"
++ msgstr "Nebyla nalezena ¾ádná pou¾itelná tøída adres.\n"
++ 
++@@ -2396,29 +3020,32 @@ msgstr "ip: %s není platnou IPv4 adresou
++ msgid "ip: argument is wrong: %s\n"
++ msgstr "ip: argument %s je nesprávný\n"
++ 
++-#: ../ipmaddr.c:56
+++#: ../ipmaddr.c:61
+++#, c-format
++ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
++ msgstr " Usage: ipmaddr [ add | del ] MULTIADR dev ØETÌZEC\n"
++ 
++-#: ../ipmaddr.c:57
+++#: ../ipmaddr.c:62
+++#, c-format
++ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ msgstr "       ipmaddr show [ dev ØETÌZEC ] [ ipv4 | ipv6 | link | all ]\n"
++ 
++-#: ../ipmaddr.c:58
+++#: ../ipmaddr.c:63
+++#, c-format
++ msgid "       ipmaddr -V | -version\n"
++ msgstr "       ipmaddr -V | -version\n"
++ 
++-#: ../ipmaddr.c:258
+++#: ../ipmaddr.c:263
++ #, c-format
++ msgid "family %d "
++ msgstr "tøída %d "
++ 
++-#: ../ipmaddr.c:267
+++#: ../ipmaddr.c:272
++ #, c-format
++ msgid " users %d"
++ msgstr " u¾ivatelé %d"
++ 
++-#: ../ipmaddr.c:353
+++#: ../ipmaddr.c:358
++ msgid "Cannot create socket"
++ msgstr "Soket nelze vytvoøit"
++ 
++@@ -2433,6 +3060,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
++ msgstr "slattach: tty_lock: (%s): %s\n"
++ 
++ #: ../slattach.c:192
+++#, c-format
++ msgid "slattach: cannot write PID file\n"
++ msgstr "slattach: do PID souboru nelze zapisovat\n"
++ 
++@@ -2451,44 +3079,77 @@ msgstr "slattach: tty_hangup(DROP): %s\n
++ msgid "slattach: tty_hangup(RAISE): %s\n"
++ msgstr "slattach: tty_hangup(RAISE): %s\n"
++ 
++-#: ../slattach.c:486
+++#: ../slattach.c:468
+++#, fuzzy, c-format
+++msgid "slattach: tty name too long\n"
+++msgstr "jméno %s je pøíli¹ dlouhé\n"
+++
+++#: ../slattach.c:498
+++#, c-format
++ msgid "slattach: tty_open: cannot get current state!\n"
++ msgstr "slattach: tty_open: aktuální stav nelze zjistit!\n"
++ 
++-#: ../slattach.c:493
+++#: ../slattach.c:505
+++#, c-format
++ msgid "slattach: tty_open: cannot get current line disc!\n"
++ msgstr "slattach: tty_open: aktuální linkovou disciplínu nelze zjistit!\n"
++ 
++-#: ../slattach.c:501
+++#: ../slattach.c:513
+++#, c-format
++ msgid "slattach: tty_open: cannot set RAW mode!\n"
++ msgstr "slattach: tty_open: re¾im RAW nelze nastavit!\n"
++ 
++-#: ../slattach.c:508
+++#: ../slattach.c:520
++ #, c-format
++ msgid "slattach: tty_open: cannot set %s bps!\n"
++ msgstr "slattach: tty_open: %s bps nelze nastavit!\n"
++ 
++-#: ../slattach.c:518
+++#: ../slattach.c:530
+++#, c-format
++ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
++ msgstr "slattach: tty_open: re¾im 8N1 nelze nastavit!\n"
++ 
++-#: ../slattach.c:686
+++#: ../slattach.c:672
+++#, c-format
+++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
+++msgstr ""
+++
+++#: ../slattach.c:704
++ #, c-format
++ msgid "%s started"
++ msgstr "protokol %s spu¹tìn"
++ 
++-#: ../slattach.c:687
+++#: ../slattach.c:705
++ #, c-format
++ msgid " on %s"
++ msgstr " na %s"
++ 
++-#: ../slattach.c:688
+++#: ../slattach.c:706
++ #, c-format
++ msgid " interface %s\n"
++ msgstr " rozhraní %s\n"
++ 
++ #~ msgid ""
++-#~ "   This comand can read or set the hostname or the NIS domainname. You can\n"
+++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
+++#~ "<-''-\n"
+++#~ msgstr ""
+++#~ "  arp [-v]   [<HW>] [-i <if>] -s <soubor> <hwadr> [sí»mask <èís>]  <-''-\n"
+++
+++#~ msgid "%s: unknown interface: %s\n"
+++#~ msgstr "%s: rozhraní %s není známo\n"
+++
+++#~ msgid "address mask replies"
+++#~ msgstr "odpovìdi na ¾ádost o masku podsítì"
+++
+++#~ msgid "unknown title %s\n"
+++#~ msgstr "titulek %s je neznámý\n"
+++
+++#~ msgid "Routing table for `ddp' not yet supported.\n"
+++#~ msgstr "Smìrovací tabulka pro `ddp' není zatím podporována.\n"
+++
+++#~ msgid ""
+++#~ "   This comand can read or set the hostname or the NIS domainname. You "
+++#~ "can\n"
++ #~ msgstr ""
++ #~ "   Tento program zji¹»uje a nastavuje jméno poèítaèe èi NIS domény. Mù¾e "
++ #~ "také\n"
++@@ -2500,7 +3161,8 @@ msgstr " rozhraní %s\n"
++ #~ msgid ""
++ #~ "   Unless you are using bind or NIS for host lookups you can change the\n"
++ #~ msgstr ""
++-#~ "   Pokud nepou¾íváte bind èi NIS pro vyhledávání jmen poèítaèù, pak mù¾ete\n"
+++#~ "   Pokud nepou¾íváte bind èi NIS pro vyhledávání jmen poèítaèù, pak "
+++#~ "mù¾ete\n"
++ 
++ #~ msgid ""
++ #~ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
++Index: net-tools/po/Makefile
++===================================================================
++--- net-tools.orig/po/Makefile
+++++ net-tools/po/Makefile
++@@ -3,13 +3,13 @@ INSTALL_PROGRAM= ${INSTALL}
++ INSTALL_DATA= ${INSTALL} -m 644
++ INSTALLNLSDIR=${BASEDIR}/usr/share/locale
++ 
++-TUPDATE = tupdate
+++TUPDATE = msgmerge
++ 
++ NLSPACKAGE = net-tools
++ 
++ -include ../config.make
++ ifeq ($(I18N),1)
++-CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo
+++CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo ja.mo
++ else
++ CATALOGS =
++ endif
++@@ -49,7 +49,7 @@ update-po: Makefile
++ 		lang=`echo $$cat | sed 's/.mo//'`; \
++ 		mv $$lang.po $$lang.old.po; \
++ 		echo "$$lang:"; \
++-		if $(TUPDATE) $(NLSPACKAGE).pot $$lang.old.po > $$lang.po; then \
+++		if $(TUPDATE) $$lang.old.po $(NLSPACKAGE).pot > $$lang.po; then \
++ 		rm -f $$lang.old.po; \
++ 	else \
++ 	 	echo "tupdate for $$cat failed!"; \
++Index: net-tools/po/de.po
++===================================================================
++--- net-tools.orig/po/de.po
+++++ net-tools/po/de.po
++@@ -1,106 +1,121 @@
++-# $Id: de.po,v 1.10 2000/08/01 03:19:48 ecki Exp $
+++# $Id: de.po,v 1.11 2003/10/25 21:15:09 ecki Exp $
++ # German translation for net-tools 1.51
++ # Copyright (C) 1999 Ralf Bächle <ralf@gnu.org>
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: net-tools 1.51\n"
++-"POT-Creation-Date: 2000-02-14 02:31+0100\n"
++-"PO-Revision-Date: 1998-03-01 00:02+0100\n"
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
+++"PO-Revision-Date: 2005-06-13 00:02+0100\n"
++ "Last-Translator: Ralf Bächle <ralf@gnu.org>\n"
++ "Language-Team:\n"
++ "MIME-Version: 1.0\n"
++-"Content-Type: text/plain; charset=iso8859-1\n"
+++"Content-Type: text/plain; charset=iso-8859-1\n"
++ "Content-Transfer-Encoding: 8bit\n"
++ 
++-#: ../arp.c:110 ../arp.c:269
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
++ msgid "arp: need host name\n"
++-msgstr "arp: Hostname muß angegeben werden\n"
+++msgstr "arp: Hostname muss angegeben werden\n"
++ 
++-#: ../arp.c:207 ../arp.c:221
+++#: ../arp.c:215 ../arp.c:230
++ #, c-format
++ msgid "No ARP entry for %s\n"
++-msgstr "Kein ARP Eintrag für %s\n"
+++msgstr "Kein ARP-Eintrag für %s\n"
++ 
++-#: ../arp.c:239
+++#: ../arp.c:248
++ #, c-format
++ msgid "arp: cant get HW-Address for `%s': %s.\n"
++ msgstr "rarp: Kann Eintrag aus %s : %u nicht setzen.\n"
++ 
++-#: ../arp.c:243
+++#: ../arp.c:252
+++#, c-format
++ msgid "arp: protocol type mismatch.\n"
++ msgstr "arp: unpassende Protokolltypen.\n"
++ 
++-#: ../arp.c:252
+++#: ../arp.c:261
++ #, c-format
++ msgid "arp: device `%s' has HW address %s `%s'.\n"
++-msgstr "arp: Gerät ,,%s'' hat HW-Adresse %s ,,%s''.\n"
+++msgstr "arp: Gerät »%s« hat HW-Adresse %s »%s«.\n"
++ 
++-#: ../arp.c:282
+++#: ../arp.c:293
+++#, c-format
++ msgid "arp: need hardware address\n"
++-msgstr "arp: Hardwareadresse muß angegeben werden\n"
+++msgstr "arp: Hardwareadresse muss angegeben werden\n"
++ 
++-#: ../arp.c:290
+++#: ../arp.c:301
+++#, c-format
++ msgid "arp: invalid hardware address\n"
++ msgstr "arp: ungültige Hardwareadresse\n"
++ 
++-#: ../arp.c:387
+++#: ../arp.c:398
++ #, c-format
++ msgid "arp: cannot open etherfile %s !\n"
++ msgstr "arp: Kann %s nicht öffnen!\n"
++ 
++-#: ../arp.c:403
+++#: ../arp.c:414
++ #, c-format
++ msgid "arp: format error on line %u of etherfile %s !\n"
++ msgstr "arp: Formatfehler in Zeile %u von Etherfile %s.\n"
++ 
++-#: ../arp.c:416
+++#: ../arp.c:427
++ #, c-format
++ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
++ msgstr "arp: Kann Eintrag auf Zeile %u von Etherdatei %s nicht setzen!\n"
++ 
++-#: ../arp.c:437
++-msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
+++#: ../arp.c:448
+++#, fuzzy, c-format
+++msgid ""
+++"Address                  HWtype  HWaddress           Flags Mask            "
+++"Iface\n"
++ msgstr "Adresse\t\t\tHWTyp\tHWAdresse\t    Flags   Maske\t\t  Iface\n"
++ 
++-#: ../arp.c:467
+++#: ../arp.c:476
+++#, fuzzy
+++msgid "<from_interface>"
+++msgstr " Schnittstelle: %s\n"
+++
+++#: ../arp.c:478
++ msgid "(incomplete)"
++-msgstr "(unvollsändig)"
+++msgstr "(unvollständig)"
++ 
++-#: ../arp.c:484
+++#: ../arp.c:495
++ #, c-format
++ msgid "%s (%s) at "
++ msgstr "%s (%s) auf "
++ 
++-#: ../arp.c:490
+++#: ../arp.c:501
+++#, c-format
++ msgid "<incomplete> "
++ msgstr "<unvollständig> "
++ 
++-#: ../arp.c:496
+++#: ../arp.c:507
++ #, c-format
++ msgid "netmask %s "
++ msgstr "netzmaske %s "
++ 
++-#: ../arp.c:513
+++#: ../arp.c:524
++ #, c-format
++ msgid "on %s\n"
++ msgstr "auf %s\n"
++ 
++-#: ../arp.c:592
+++#: ../arp.c:605
++ #, c-format
++ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
++ msgstr "Einträge: %d   Ignoriert: %d   Gefunden: %d\n"
++ 
++-#: ../arp.c:596
+++#: ../arp.c:609
++ #, c-format
++ msgid "%s (%s) -- no entry\n"
++ msgstr "%s (%s) -- kein Eintrag\n"
++ 
++-#: ../arp.c:598
+++#: ../arp.c:611
++ #, c-format
++ msgid "arp: in %d entries no match found.\n"
++-msgstr "arp: In %d Einträgen wurde kein Zutreffender gefunden.\n"
+++msgstr "arp: In %d Einträgen wurde kein zutreffender gefunden.\n"
++ 
++-#: ../arp.c:613
+++#: ../arp.c:626
+++#, c-format
++ msgid ""
++ "Usage:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
++@@ -109,157 +124,165 @@ msgstr ""
++ "Benutzung:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<Hostname>]\n"
++ 
++-#: ../arp.c:614
+++#: ../arp.c:627
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
++ "entry\n"
++ msgstr "  arp [-v]          [-i <if>] -d  <Hostname> [pub][nopub]\n"
++ 
++-#: ../arp.c:615
+++#: ../arp.c:628
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
++ "file\n"
++ msgstr "  arp [-vnD] [<HW>] [-i <if>] -f  <Dateiname>           <- Eintrag aus Datei hinzufügen\n"
++ 
++-#: ../arp.c:616
+++#: ../arp.c:629
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
++ "entry\n"
++ msgstr ""
++ "  arp [-v]   [<HW>] [-i <if>] -s  <Rechnername> <hwaddr> [temp][nopub]\n"
++ 
++-#: ../arp.c:617
++-msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
++-"<-''-\n"
++-msgstr ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <Hostname> <hwaddr> [netmask <nm>] pub\n"
++-
++-#: ../arp.c:618
+++#: ../arp.c:630
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
++ "<-''-\n"
++ "\n"
++ msgstr "  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub\n"
++ 
++-#: ../arp.c:620
+++#: ../arp.c:632
+++#, c-format
++ msgid ""
++ "        -a                       display (all) hosts in alternative (BSD) "
++ "style\n"
++ msgstr "        -a                       Alle Hosts im BSD-Format anzeigen\n"
++ 
++-#: ../arp.c:621
+++#: ../arp.c:633
+++#, c-format
++ msgid "        -s, --set                set a new ARP entry\n"
++ msgstr "        -s, --set                Neuen ARP-Eintrag setzen\n"
++ 
++-#: ../arp.c:622
+++#: ../arp.c:634
+++#, c-format
++ msgid "        -d, --delete             delete a specified entry\n"
++ msgstr "        -d, --delete             Einen bestimmten Eintrag löschen\n"
++ 
++-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
++ msgid "        -v, --verbose            be verbose\n"
++ msgstr "        -v, --verbose            Ausführliche Ausgaben\n"
++ 
++-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
++-msgid "        -n, --numeric            dont resolve names\n"
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, fuzzy, c-format
+++msgid "        -n, --numeric            don't resolve names\n"
++ msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
++ 
++-#: ../arp.c:625
+++#: ../arp.c:637
+++#, c-format
++ msgid ""
++ "        -i, --device             specify network interface (e.g. eth0)\n"
++-msgstr "        -i, --device             Netzwerksgerät (z.B. eth0) angeben\n"
+++msgstr "        -i, --device             Netzwerkgerät (z.B. eth0) angeben\n"
++ 
++-#: ../arp.c:626
+++#: ../arp.c:638
+++#, c-format
++ msgid "        -D, --use-device         read <hwaddr> from given device\n"
++ msgstr "        -D, --use-device         <hwaddr> von gegebenem Gerät lesen\n"
++ 
++-#: ../arp.c:627
+++#: ../arp.c:639
+++#, c-format
++ msgid "        -A, -p, --protocol       specify protocol family\n"
++ msgstr "        -A, -p, --protocol              Routentabelle anzeigen\n"
++ 
++-#: ../arp.c:628
+++#: ../arp.c:640
+++#, c-format
++ msgid ""
++-"        -f, --file               read new entries from file or from "
++-"/etc/ethers\n"
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
++ "\n"
++ msgstr ""
++ "        -f, --file               Neue Einträge aus Datei lesen\n"
++ "\n"
++ 
++-#: ../arp.c:630 ../rarp.c:181
+++#: ../arp.c:642 ../rarp.c:182
++ #, c-format
++ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
++ msgstr "  <HW>='-H <hw>' um Hardwareadresstyp anzugeben.  Standard: %s\n"
++ 
++-#: ../arp.c:631 ../rarp.c:182
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
++ msgid "  List of possible hardware types (which support ARP):\n"
++ msgstr "  Liste möglicher Hardwaretypen, die ARP unterstützen:\n"
++ 
++-#: ../arp.c:664
+++#: ../arp.c:677 ../arp.c:762
++ #, c-format
++ msgid "%s: hardware type not supported!\n"
++ msgstr "%s: Hardwaretyp nicht unterstützt!\n"
++ 
++-#: ../arp.c:668
+++#: ../arp.c:681
++ #, c-format
++ msgid "%s: address family not supported!\n"
++ msgstr "%s: Adressfamilie nicht unterstützt!\n"
++ 
++-#: ../arp.c:703
+++#: ../arp.c:716
+++#, c-format
++ msgid "arp: -N not yet supported.\n"
++ msgstr "arp: -N noch nicht unterstützt.\n"
++ 
++-#: ../arp.c:713
+++#: ../arp.c:726
++ #, c-format
++ msgid "arp: %s: unknown address family.\n"
++ msgstr "arp: %s: unbekannte Adressfamilie.\n"
++ 
++-#: ../arp.c:722
+++#: ../arp.c:735
++ #, c-format
++ msgid "arp: %s: unknown hardware type.\n"
++ msgstr "arp: %s: unbekannter Hardwaretyp.\n"
++ 
++-#: ../arp.c:741
+++#: ../arp.c:754
++ #, c-format
++ msgid "arp: %s: kernel only supports 'inet'.\n"
++-msgstr "arp: %s: Kernel unterstützt nur ,,inet''.\n"
+++msgstr "arp: %s: Kernel unterstützt nur »inet«.\n"
++ 
++-#: ../arp.c:746
+++#: ../arp.c:767
++ #, c-format
++ msgid "arp: %s: hardware type without ARP support.\n"
++ msgstr "arp: %s: Hardware unterstützt kein ARP.\n"
++ 
++-#: ../hostname.c:69
+++#: ../hostname.c:71
++ #, c-format
++ msgid "Setting nodename to `%s'\n"
++-msgstr "Rechnernamen auf ,,%s'' setzen\n"
+++msgstr "Rechnernamen auf »%s« setzen\n"
++ 
++-#: ../hostname.c:74
+++#: ../hostname.c:76
++ #, c-format
++ msgid "%s: you must be root to change the node name\n"
++ msgstr "%s: Nur Root darf den Rechnernamen ändern\n"
++ 
++-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
++ #, c-format
++ msgid "%s: name too long\n"
++ msgstr "%s: name zu lang\n"
++ 
++-#: ../hostname.c:89
+++#: ../hostname.c:91
++ #, c-format
++ msgid "Setting hostname to `%s'\n"
++-msgstr "Setze Hostname auf ,,%s''\n"
+++msgstr "Setze Hostname auf »%s«\n"
++ 
++-#: ../hostname.c:94
+++#: ../hostname.c:96
++ #, c-format
++ msgid "%s: you must be root to change the host name\n"
++-msgstr "%s: Nur Root darf then Rechnernamen ändern\n"
+++msgstr "%s: Nur Root darf den Rechnernamen ändern\n"
++ 
++-#: ../hostname.c:108
+++#: ../hostname.c:109
++ #, c-format
++ msgid "Setting domainname to `%s'\n"
++-msgstr "Setze domainname auf ,,%s''\n"
+++msgstr "Setze domainname auf »%s«\n"
++ 
++-#: ../hostname.c:113
+++#: ../hostname.c:114
++ #, c-format
++ msgid "%s: you must be root to change the domain name\n"
++ msgstr "%s: Nur Root darf den Domainnamen ändern\n"
++@@ -267,51 +290,56 @@ msgstr "%s: Nur Root darf den Domainname
++ #: ../hostname.c:131
++ #, c-format
++ msgid "Resolving `%s' ...\n"
++-msgstr "Löse ,,%s'' auf ...\n"
+++msgstr "Löse »%s« auf ...\n"
++ 
++ #: ../hostname.c:137
++ #, c-format
++ msgid "Result: h_name=`%s'\n"
++-msgstr "Ergebnis: h_name=,,%s''\n"
+++msgstr "Ergebnis: h_name=»%s«\n"
++ 
++ #: ../hostname.c:142
++ #, c-format
++ msgid "Result: h_aliases=`%s'\n"
++-msgstr "Ergebnis: h_aliases=,,%s''\n"
+++msgstr "Ergebnis: h_aliases=»%s«\n"
++ 
++ #: ../hostname.c:147
++ #, c-format
++ msgid "Result: h_addr_list=`%s'\n"
++-msgstr "Ergebnis: h_addr_list=,,%s''\n"
+++msgstr "Ergebnis: h_addr_list=»%s«\n"
++ 
++-#: ../hostname.c:209
+++#: ../hostname.c:208
++ #, c-format
++ msgid "%s: can't open `%s'\n"
++-msgstr "%s: Kann ,,%s'' nicht öffnen\n"
+++msgstr "%s: Kann »%s« nicht öffnen\n"
++ 
++-#: ../hostname.c:223
+++#: ../hostname.c:222
+++#, c-format
++ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
++ msgstr ""
++ "Benutzung: hostname [-v] {Hostname|-F Datei} Hostname (aus Datei) setzen\n"
++ 
++-#: ../hostname.c:224
+++#: ../hostname.c:223
+++#, c-format
++ msgid ""
++ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
++ msgstr ""
++-"       domainname [-v] {nisdomain|-F file}   NIS Domainname (aus Datei) "
+++"       domainname [-v] {nisdomain|-F file}   NIS-Domainname (aus Datei) "
++ "setzen.\n"
++ 
++-#: ../hostname.c:226
+++#: ../hostname.c:225
+++#, c-format
++ msgid ""
++ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
++ "file)\n"
++ msgstr "       nodename [-v] {Rechnername|-F Datei}\n"
++ 
++-#: ../hostname.c:228
+++#: ../hostname.c:227
+++#, c-format
++ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
++ msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]\n"
++ 
++-#: ../hostname.c:229
+++#: ../hostname.c:228
+++#, c-format
++ msgid ""
++ "       hostname [-v]                         display hostname\n"
++ "\n"
++@@ -319,7 +347,8 @@ msgstr ""
++ "       hostname [-v]                         Hostnamen anzeigen\n"
++ "\n"
++ 
++-#: ../hostname.c:230
+++#: ../hostname.c:229
+++#, c-format
++ msgid ""
++ "       hostname -V|--version|-h|--help       print info and exit\n"
++ "\n"
++@@ -328,7 +357,8 @@ msgstr ""
++ "beenden.\n"
++ "\n"
++ 
++-#: ../hostname.c:231
+++#: ../hostname.c:230
+++#, c-format
++ msgid ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++@@ -336,43 +366,52 @@ msgstr ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++ 
++-#: ../hostname.c:232
+++#: ../hostname.c:231
+++#, c-format
++ msgid "    -s, --short           short host name\n"
++ msgstr "    -s, --short           Kurzer Hostname\n"
++ 
++-#: ../hostname.c:233
+++#: ../hostname.c:232
+++#, c-format
++ msgid "    -a, --alias           alias names\n"
++ msgstr "    -a, --alias           Namensalias\n"
++ 
++-#: ../hostname.c:234
+++#: ../hostname.c:233
+++#, c-format
++ msgid "    -i, --ip-address      addresses for the hostname\n"
++ msgstr "    -i, --ip-address      Adressen für den Hostnamen\n"
++ 
++-#: ../hostname.c:235
+++#: ../hostname.c:234
+++#, c-format
++ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
++ msgstr "    -f, --fqdn, --long    Langer Hostname (FQDN)\n"
++ 
++-#: ../hostname.c:236
+++#: ../hostname.c:235
+++#, c-format
++ msgid "    -d, --domain          DNS domain name\n"
++-msgstr "    -d, --domain          DNS Domainname\n"
+++msgstr "    -d, --domain          DNS-Domainname\n"
++ 
++-#: ../hostname.c:237
+++#: ../hostname.c:236
+++#, c-format
++ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
++-msgstr "    -y, --yp, --nis       NIS/YP Domainname\n"
+++msgstr "    -y, --yp, --nis       NIS/YP-Domainname\n"
++ 
++-#: ../hostname.c:239
+++#: ../hostname.c:238
+++#, c-format
++ msgid "    -n, --node            DECnet node name\n"
++-msgstr "    -n, --node            DECnet Knotennamen\n"
+++msgstr "    -n, --node            DECnet-Knotennamen\n"
++ 
++-#: ../hostname.c:241
+++#: ../hostname.c:240
+++#, c-format
++ msgid ""
++ "    -F, --file            read hostname or NIS domainname from given file\n"
++ "\n"
++ msgstr ""
++-"    -F, --file            Hostnamen oder NIS Domainnamen aus Datei lesen\n"
+++"    -F, --file            Hostnamen oder NIS-Domainnamen aus Datei lesen\n"
++ "\n"
++ 
++-#: ../hostname.c:243
+++#: ../hostname.c:242
+++#, c-format
++ msgid ""
++ "   This command can read or set the hostname or the NIS domainname. You can\n"
++ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
++@@ -380,395 +419,268 @@ msgid ""
++ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
++ "   part of the FQDN) in the /etc/hosts file.\n"
++ msgstr ""
++-"   Dies Kommando setzt oder gibt den Hostnamen oder NIS Domainnamen aus.\n"
++-"   Es ist ebenfalls möglich die DNS Domain oder den FQDN (langen Hostnamen)\n"
+++"   Dies Kommando setzt oder gibt den Hostnamen oder NIS-Domainnamen aus.\n"
+++"   Es ist ebenfalls möglich die DNS-Domain oder den FQDN (langen Hostnamen)\n"
++ "   ausgeben zu lassen.  Außer wenn DNS oder NIS als Namensdienst verwendet\n"
++-"   wird, können FQDN (Fully Qualified Domain Name) und DNS Domainname (welcher\n"
+++"   wird, können FQDN (Fully Qualified Domain Name) und DNS-Domainname (welcher\n"
++ "   Teil des FQDNs ist) in /etc/hosts geändert werden.\n"
++ 
++ #: ../hostname.c:338
++ #, c-format
++ msgid "%s: You can't change the DNS domain name with this command\n"
++-msgstr "%s: Mit diesem Program kann der DNS Domainname nicht geändert werden\n"
+++msgstr "%s: Mit diesem Programm kann der DNS-Domainname nicht geändert werden\n"
++ 
++ #: ../hostname.c:339
+++#, c-format
++ msgid ""
++ "\n"
++ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
++ msgstr ""
++ "\n"
++-"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der "
++-"DNS\n"
+++"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der DNS\n"
++ 
++ #: ../hostname.c:340
+++#, c-format
++ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
++-msgstr ""
++-"Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert "
++-"werden.\n"
+++msgstr "Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert werden.\n"
++ 
++ #: ../hostname.c:357
++ #, c-format
++ msgid "gethostname()=`%s'\n"
++-msgstr "gethostname()=,,%s''\n"
+++msgstr "gethostname()=»%s«\n"
++ 
++ #: ../hostname.c:374
++ #, c-format
++ msgid "getdomainname()=`%s'\n"
++-msgstr "getdomainname()=,,%s''\n"
+++msgstr "getdomainname()=»%s«\n"
++ 
++ #: ../hostname.c:389
++ #, c-format
++ msgid "getnodename()=`%s'\n"
++-msgstr "getnodename()=,,%s''\n"
+++msgstr "getnodename()=»%s«\n"
++ 
++-#: ../ifconfig.c:159
++-#, c-format
++-msgid "%-9.9s Link encap:%s  "
++-msgstr "%-9.9s Protokoll:%s  "
+++#: ../ifconfig.c:107
+++#, fuzzy, c-format
+++msgid ""
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Flg\n"
+++msgstr "SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-Ülf    TX-OK TX-Feh TX-DRP TX-Üb Flg\n"
++ 
++-#: ../ifconfig.c:164
++-#, c-format
++-msgid "HWaddr %s  "
++-msgstr "Hardware Adresse %s  "
+++#: ../ifconfig.c:129 ../ifconfig.c:161
+++#, fuzzy, c-format
+++msgid "%s: ERROR while getting interface flags: %s\n"
+++msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
++ 
++-#: ../ifconfig.c:167
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
++ #, c-format
++-msgid "Media:%s"
++-msgstr "Medium:%s"
+++msgid "No support for INET on this system.\n"
+++msgstr "INET ist auf diesem System nicht verfügbar.\n"
++ 
++-#: ../ifconfig.c:169
++-msgid "(auto)"
++-msgstr "(auto)"
+++#: ../ifconfig.c:193
+++#, fuzzy, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
++ 
++-#: ../ifconfig.c:176
++-#, c-format
++-msgid "          %s addr:%s "
++-msgstr "          %s Adresse:%s "
+++#: ../ifconfig.c:202
+++#, fuzzy, c-format
+++msgid ""
+++"Usage:\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++msgstr ""
+++"Syntax:\n"
+++"  ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n"
++ 
++-#: ../ifconfig.c:179
+++#: ../ifconfig.c:204
++ #, c-format
++-msgid " P-t-P:%s "
++-msgstr " P-z-P:%s "
+++msgid "  [add <address>[/<prefixlen>]]\n"
+++msgstr "  [add <Adresse>[/<Präfixlänge>]]\n"
++ 
++-#: ../ifconfig.c:182
+++#: ../ifconfig.c:205
++ #, c-format
++-msgid " Bcast:%s "
++-msgstr " Bcast:%s "
+++msgid "  [del <address>[/<prefixlen>]]\n"
+++msgstr "  [del <Adresse>[/<Präfixlänge>]]\n"
++ 
++-#: ../ifconfig.c:184
+++#: ../ifconfig.c:206
++ #, c-format
++-msgid " Mask:%s\n"
++-msgstr " Maske:%s\n"
+++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
+++msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
++ 
++-#: ../ifconfig.c:201
+++#: ../ifconfig.c:207
++ #, c-format
++-msgid "          inet6 addr: %s/%d"
++-msgstr "          inet6 Adresse: %s/%d"
++-
++-#: ../ifconfig.c:203
++-msgid " Scope:"
++-msgstr " Gültigkeitsbereich:"
++-
++-#: ../ifconfig.c:206
++-msgid "Global"
++-msgstr "Global"
+++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
+++msgstr "  [netmask <Adresse>]  [dstaddr <Adresse>]  [tunnel <Adresse>]\n"
++ 
++-#: ../ifconfig.c:209
++-msgid "Link"
++-msgstr "Verbindung"
+++#: ../ifconfig.c:210
+++#, c-format
+++msgid "  [outfill <NN>] [keepalive <NN>]\n"
+++msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++ 
++ #: ../ifconfig.c:212
++-msgid "Site"
++-msgstr "Standort"
++-
++-#: ../ifconfig.c:215
++-msgid "Compat"
++-msgstr "Kompatibilität"
++-
++-#: ../ifconfig.c:218
++-msgid "Host"
++-msgstr "Maschine"
++-
++-#: ../ifconfig.c:221
++-msgid "Unknown"
++-msgstr "Unbekannt"
++-
++-#: ../ifconfig.c:236
++ #, c-format
++-msgid "          IPX/Ethernet II addr:%s\n"
++-msgstr "          IPX/Ethernet II Adresse:%s\n"
+++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
+++msgstr "  [hw <HW> <Adresse>]  [metric <NN>]  [mtu <NN>]\n"
++ 
++-#: ../ifconfig.c:239
+++#: ../ifconfig.c:213
++ #, c-format
++-msgid "          IPX/Ethernet SNAP addr:%s\n"
++-msgstr "          IPX/Ethernet SNAP Adresse:%s\n"
+++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ 
++-#: ../ifconfig.c:242
+++#: ../ifconfig.c:214
++ #, c-format
++-msgid "          IPX/Ethernet 802.2 addr:%s\n"
++-msgstr "          IPX/Ethernet 802.2 Adresse:%s\n"
+++msgid "  [multicast]  [[-]promisc]\n"
+++msgstr "  [multicast]  [[-]promisc]\n"
++ 
++-#: ../ifconfig.c:245
+++#: ../ifconfig.c:215
++ #, c-format
++-msgid "          IPX/Ethernet 802.3 addr:%s\n"
++-msgstr "          IPX/Ethernet 802.3 Adresse:%s\n"
+++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
+++msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <Typ>]\n"
++ 
++-#: ../ifconfig.c:255
+++#: ../ifconfig.c:217
++ #, c-format
++-msgid "          EtherTalk Phase 2 addr:%s\n"
++-msgstr "          EtherTalk Phase 2 Adresse:%s\n"
+++msgid "  [txqueuelen <NN>]\n"
+++msgstr "  [txqueuelen <Länge>]\n"
++ 
++-#: ../ifconfig.c:264
+++#: ../ifconfig.c:220
++ #, c-format
++-msgid "          econet addr:%s\n"
++-msgstr "          econet Adresse:%s\n"
++-
++-#: ../ifconfig.c:270
++-msgid "[NO FLAGS] "
++-msgstr "[KEINE FLAGS] "
++-
++-#: ../ifconfig.c:272
++-msgid "UP "
++-msgstr "UP "
++-
++-#: ../ifconfig.c:274
++-msgid "BROADCAST "
++-msgstr "BROADCAST "
++-
++-#: ../ifconfig.c:276
++-msgid "DEBUG "
++-msgstr "DEBUG "
++-
++-#: ../ifconfig.c:278
++-msgid "LOOPBACK "
++-msgstr "LOOPBACK "
++-
++-#: ../ifconfig.c:280
++-msgid "POINTOPOINT "
++-msgstr "PUNKTZUPUNKT "
++-
++-#: ../ifconfig.c:282
++-msgid "NOTRAILERS "
++-msgstr "NOTRAILERS "
+++msgid "  [[-]dynamic]\n"
+++msgstr "  [[-]dynamic]\n"
++ 
++-#: ../ifconfig.c:284
++-msgid "RUNNING "
++-msgstr "RUNNING "
+++#: ../ifconfig.c:222
+++#, c-format
+++msgid ""
+++"  [up|down] ...\n"
+++"\n"
+++msgstr ""
+++"  [up|down] ...\n"
+++"\n"
++ 
++-#: ../ifconfig.c:286
++-msgid "NOARP "
++-msgstr "NOARP "
+++#: ../ifconfig.c:224
+++#, c-format
+++msgid "  <HW>=Hardware Type.\n"
+++msgstr "  <HW>=Hardwaretyp.\n"
++ 
++-#: ../ifconfig.c:288
++-msgid "PROMISC "
++-msgstr "PROMISC "
+++#: ../ifconfig.c:225
+++#, c-format
+++msgid "  List of possible hardware types:\n"
+++msgstr "  Liste möglicher Hardwaretypen:\n"
++ 
++-#: ../ifconfig.c:290
++-msgid "ALLMULTI "
++-msgstr "ALLMULTI "
+++#. 1 = ARPable
+++#: ../ifconfig.c:227
+++#, c-format
+++msgid "  <AF>=Address family. Default: %s\n"
+++msgstr "  <AF>=Adressfamilie.  Standardwert: %s\n"
++ 
++-#: ../ifconfig.c:292
++-msgid "SLAVE "
++-msgstr "SLAVE "
+++#: ../ifconfig.c:228
+++#, c-format
+++msgid "  List of possible address families:\n"
+++msgstr "  List der möglichen Adressfamilien:\n"
++ 
++-#: ../ifconfig.c:294
++-msgid "MASTER "
++-msgstr "MASTER "
+++#: ../ifconfig.c:303
+++#, c-format
+++msgid "ifconfig: option `%s' not recognised.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:296
++-msgid "MULTICAST "
++-msgstr "MULTICAST "
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
+++msgid "ifconfig: `--help' gives usage information.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:299
++-msgid "DYNAMIC "
++-msgstr "DYNAMIC "
+++#: ../ifconfig.c:380
+++#, c-format
+++msgid "Unknown media type.\n"
+++msgstr "Typ des Mediums unbekannt.\n"
++ 
++-#: ../ifconfig.c:302
+++#: ../ifconfig.c:417
++ #, c-format
++-msgid " MTU:%d  Metric:%d"
++-msgstr " MTU:%d  Metric:%d"
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:306
+++#: ../ifconfig.c:429
++ #, c-format
++-msgid "  Outfill:%d  Keepalive:%d"
++-msgstr "  Outfill:%d  Keepalive:%d"
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:320
+++#: ../ifconfig.c:441
++ #, c-format
++-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
++ msgstr ""
++-"Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n"
++ 
++-#: ../ifconfig.c:325
+++#: ../ifconfig.c:465
++ #, c-format
++-msgid "             compressed:%lu\n"
++-msgstr "             komprimiert:%lu\n"
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:329
+++#: ../ifconfig.c:523
++ #, c-format
++-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
++ msgstr ""
++-"Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n"
++ 
++-#: ../ifconfig.c:333
+++#: ../ifconfig.c:652
++ #, c-format
++-msgid "          collisions:%lu "
++-msgstr "          Kollisionen:%lu "
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:335
+++#: ../ifconfig.c:684
++ #, c-format
++-msgid "compressed:%lu "
++-msgstr "Komprimiert:%lu "
+++msgid "hw address type `%s' has no handler to set address. failed.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:337
+++#: ../ifconfig.c:693
++ #, c-format
++-msgid "txqueuelen:%d "
++-msgstr "Sendewarteschlangenlänge:%d "
+++msgid "%s: invalid %s address.\n"
+++msgstr "%s: ungültige %s Adresse.\n"
++ 
++-#: ../ifconfig.c:345
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
++ #, c-format
++-msgid "Interrupt:%d "
++-msgstr "Interrupt:%d "
++-
++-#. Only print devices using it for
++-#. I/O maps
++-#: ../ifconfig.c:348
++-#, c-format
++-msgid "Base address:0x%x "
++-msgstr "Basisadresse:0x%x "
++-
++-#: ../ifconfig.c:350
++-#, c-format
++-msgid "Memory:%lx-%lx "
++-msgstr "Speicher:%lx-%lx "
++-
++-#: ../ifconfig.c:353
++-#, c-format
++-msgid "DMA chan:%x "
++-msgstr "DMA Kanal:%x "
+++msgid "No support for INET6 on this system.\n"
+++msgstr "INET6 ist auf diesem System nicht verfügbar.\n"
++ 
++-#: ../ifconfig.c:384 ../ifconfig.c:405
+++#: ../ifconfig.c:780 ../ifconfig.c:871
++ #, c-format
++-msgid "%s: unknown interface: %s\n"
++-msgstr "%s: unbekannte Schnittstelle: %s\n"
++-
++-#: ../ifconfig.c:421
++-msgid ""
++-"Usage:\n"
++-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
++-msgstr ""
++-"Syntax:\n"
++-"  ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n"
++-
++-#: ../ifconfig.c:425
++-msgid "  [add <address>[/<prefixlen>]]\n"
++-msgstr "  [add <Adresse>[/<Prefixlänge>]]\n"
++-
++-#: ../ifconfig.c:427
++-msgid "  [del <address>[/<prefixlen>]]\n"
++-msgstr "  [del <Adresse>[/<Prefixlänge>]]\n"
++-
++-#: ../ifconfig.c:432
++-msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
++-msgstr "  [[-]broadcast [<Adresse>]]  [[-]pointopoint [<Adresse>]]\n"
++-
++-#: ../ifconfig.c:433
++-msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++-msgstr "  [netmask <Addresse>]  [dstaddr <Adresse>]  [tunnel <Adresse>]\n"
++-
++-#: ../ifconfig.c:436
++-msgid "  [outfill <NN>] [keepalive <NN>]\n"
++-msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++-
++-#: ../ifconfig.c:438
++-msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
++-msgstr "  [hw <HW> <Adresse>]  [metric <NN>]  [mtu <NN>]\n"
++-
++-#: ../ifconfig.c:439
++-msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-
++-#: ../ifconfig.c:440
++-msgid "  [multicast]  [[-]promisc]\n"
++-msgstr "  [multicast]  [[-]promisc]\n"
++-
++-#: ../ifconfig.c:441
++-msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++-msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <Typ>]\n"
++-
++-#: ../ifconfig.c:443
++-msgid "  [txqueuelen <NN>]\n"
++-msgstr "  [txqueuelen <Länge>]\n"
++-
++-#: ../ifconfig.c:446
++-msgid "  [[-]dynamic]\n"
++-msgstr "  [[-]dynamic]\n"
++-
++-#: ../ifconfig.c:448
++-msgid ""
++-"  [up|down] ...\n"
++-"\n"
+++msgid "Interface %s not initialized\n"
++ msgstr ""
++-"  [up|down] ...\n"
++-"\n"
++-
++-#: ../ifconfig.c:450
++-msgid "  <HW>=Hardware Type.\n"
++-msgstr "  <HW>=Hardwaretyp.\n"
++-
++-#: ../ifconfig.c:451
++-msgid "  List of possible hardware types:\n"
++-msgstr "  Liste möglicher Hardwaretypen:\n"
++-
++-#. 1 = ARPable
++-#: ../ifconfig.c:453
++-#, c-format
++-msgid "  <AF>=Address family. Default: %s\n"
++-msgstr "  <AF>=Adressfamilie.  Standardwert: %s\n"
++-
++-#: ../ifconfig.c:454
++-msgid "  List of possible address families:\n"
++-msgstr "  List der möglichen Adressfamilien:\n"
++-
++-#: ../ifconfig.c:593
++-msgid "Unknown media type.\n"
++-msgstr "Typ des Mediums unbekannt.\n"
++ 
++-#: ../ifconfig.c:881
++-#, c-format
++-msgid "%s: invalid %s address.\n"
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, fuzzy, c-format
+++msgid "Bad address.\n"
++ msgstr "%s: ungültige %s Adresse.\n"
++ 
++-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
++-msgid "No support for INET6 on this system.\n"
++-msgstr "INET6 ist auf diesem System nicht verfügbar.\n"
++-
++-#: ../ifconfig.c:983
+++#: ../ifconfig.c:885
+++#, c-format
++ msgid "Address deletion not supported on this system.\n"
++-msgstr "Das Löschen von Adressen ist auf diesem System nicht unterstützt.\n"
+++msgstr "Das Löschen von Adressen wird auf diesem System nicht unterstützt.\n"
++ 
++-#: ../ifconfig.c:1066
++-msgid "No support for INET on this system.\n"
++-msgstr "INET ist auf diesem System nicht verfügbar.\n"
+++#: ../ifconfig.c:957
+++#, fuzzy, c-format
+++msgid "ifconfig: Cannot set address for this protocol family.\n"
+++msgstr "Kann die Adressen der Familie %d nicht setzen.\n"
++ 
++-#: ../ifconfig.c:1076
+++#: ../ifconfig.c:983
+++#, c-format
++ msgid "No support for ECONET on this system.\n"
++ msgstr "ECONET wird auf diesem System nicht unterstützt.\n"
++ 
++-#: ../ifconfig.c:1084
+++#: ../ifconfig.c:991
++ #, c-format
++ msgid "Don't know how to set addresses for family %d.\n"
++ msgstr "Kann die Adressen der Familie %d nicht setzen.\n"
++ 
++-#: ../netstat.c:383
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr ""
+++
+++#: ../netstat.c:434
++ #, c-format
++ msgid ""
++ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
++-msgstr ""
++-"(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie "
++-"sollten Root sein.)\n"
+++msgstr "(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie sollten Root sein.)\n"
++ 
++-#: ../netstat.c:387
+++#: ../netstat.c:438
+++#, c-format
++ msgid ""
++ "(Not all processes could be identified, non-owned process info\n"
++ " will not be shown, you would have to be root to see it all.)\n"
++@@ -776,198 +688,220 @@ msgstr ""
++ "(Es konnten nicht alle Prozesse identifiziert werden; Informationen über\n"
++ "nicht-eigene Processe werden nicht angezeigt; Root kann sie anzeigen.)\n"
++ 
++-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
++ msgid "LISTENING"
++ msgstr "HÖRT"
++ 
++-#: ../netstat.c:395
+++#: ../netstat.c:446
++ msgid "CONN SENT"
++ msgstr "VERBINGSAUFBAU GESCHICKT"
++ 
++-#: ../netstat.c:396 ../netstat.c:1168
+++#: ../netstat.c:447 ../netstat.c:1268
++ msgid "DISC SENT"
++ msgstr "VERBINDUNGSABBAU GESCHICKT"
++ 
++-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
++ msgid "ESTABLISHED"
++ msgstr "VERBUNDEN"
++ 
++-#: ../netstat.c:419
+++#: ../netstat.c:470
+++#, c-format
++ msgid "Active NET/ROM sockets\n"
++ msgstr "Aktive NET/ROM Sockets\n"
++ 
++-#: ../netstat.c:420
+++#: ../netstat.c:471
+++#, c-format
++ msgid ""
++-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
++-"Recv-Q\n"
++-msgstr ""
++-"Benutzer   Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  "
++-"Recv-Q\n"
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
+++msgstr "Benutzer   Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  Recv-Q\n"
++ 
++-#: ../netstat.c:430 ../netstat.c:1208
+++#: ../netstat.c:481 ../netstat.c:1308
++ #, c-format
++ msgid "Problem reading data from %s\n"
++ msgstr "Probleme beim Lesen von %s\n"
++ 
++-#: ../netstat.c:465
+++#: ../netstat.c:516
++ msgid "SYN_SENT"
++ msgstr "SYN_SENT"
++ 
++-#: ../netstat.c:466
+++#: ../netstat.c:517
++ msgid "SYN_RECV"
++ msgstr "SYN_RECV"
++ 
++-#: ../netstat.c:467
+++#: ../netstat.c:518
++ msgid "FIN_WAIT1"
++ msgstr "FIN_WAIT1"
++ 
++-#: ../netstat.c:468
+++#: ../netstat.c:519
++ msgid "FIN_WAIT2"
++ msgstr "FIN_WAIT2"
++ 
++-#: ../netstat.c:469
+++#: ../netstat.c:520
++ msgid "TIME_WAIT"
++ msgstr "TIME_WAIT"
++ 
++-#: ../netstat.c:470
+++#: ../netstat.c:521
++ msgid "CLOSE"
++ msgstr "CLOSE"
++ 
++-#: ../netstat.c:471
+++#: ../netstat.c:522
++ msgid "CLOSE_WAIT"
++ msgstr "CLOSE_WAIT"
++ 
++-#: ../netstat.c:472
+++#: ../netstat.c:523
++ msgid "LAST_ACK"
++ msgstr "LAST_ACK"
++ 
++-#: ../netstat.c:473
+++#: ../netstat.c:524
++ msgid "LISTEN"
++ msgstr "LISTEN"
++ 
++-#: ../netstat.c:474
+++#: ../netstat.c:525
++ msgid "CLOSING"
++ msgstr "CLOSING"
++ 
++-#: ../netstat.c:544
+++#: ../netstat.c:596
++ #, c-format
++ msgid "warning, got bogus igmp6 line %d.\n"
++ msgstr "Warnung, fehlerhafte igmp6 line %d.\n"
++ 
++-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
++-#: ../netstat.c:935 ../netstat.c:940
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
++ #, c-format
++ msgid "netstat: unsupported address family %d !\n"
++ msgstr "netstat: Nicht unterstützte Adressfamilie %d!\n"
++ 
++-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
++ #, c-format
++ msgid "warning, got bogus igmp line %d.\n"
++ msgstr "Warnung, fehlerhafte igmp-Zeile %d.\n"
++ 
++-#: ../netstat.c:666
+++#: ../netstat.c:677
+++#, fuzzy, c-format
+++msgid "Active X.25 sockets\n"
+++msgstr "Aktive AX.25 Sockets\n"
+++
+++#. IMHO, Vr/Vs is not very usefull --SF
+++#: ../netstat.c:679
+++#, fuzzy, c-format
+++msgid ""
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
+++msgstr "Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  Empf-Q\n"
+++
+++#: ../netstat.c:759
+++#, c-format
++ msgid "warning, got bogus tcp line.\n"
++ msgstr "Warnung, fehlerhafte TCP Zeile.\n"
++ 
++-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
++ #, c-format
++ msgid "off (0.00/%ld/%d)"
++ msgstr "aus (0.00/%ld/%d)"
++ 
++-#: ../netstat.c:708
+++#: ../netstat.c:804
++ #, c-format
++ msgid "on (%2.2f/%ld/%d)"
++ msgstr "ein (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:713
+++#: ../netstat.c:809
++ #, fuzzy, c-format
++ msgid "keepalive (%2.2f/%ld/%d)"
++ msgstr "ein%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:718
+++#: ../netstat.c:814
++ #, fuzzy, c-format
++ msgid "timewait (%2.2f/%ld/%d)"
++ msgstr "ein%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
++ #, c-format
++ msgid "unkn-%d (%2.2f/%ld/%d)"
++ msgstr "unkn-%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:799
+++#: ../netstat.c:894
+++#, c-format
++ msgid "warning, got bogus udp line.\n"
++ msgstr "Warnung, fehlerhafe UDP-Zeile.\n"
++ 
++-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
++ msgid "UNKNOWN"
++ msgstr "UNBEKANNT"
++ 
++-#: ../netstat.c:860 ../netstat.c:980
+++#: ../netstat.c:958 ../netstat.c:1080
++ #, c-format
++ msgid "on%d (%2.2f/%ld/%d)"
++ msgstr "ein%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:949
+++#: ../netstat.c:1046
+++#, c-format
++ msgid "warning, got bogus raw line.\n"
++ msgstr "Warnung, fehlerhafte raw-Zeile.\n"
++ 
++-#: ../netstat.c:1028
+++#: ../netstat.c:1128
+++#, c-format
++ msgid "warning, got bogus unix line.\n"
++ msgstr "Warnung, fehlerhafte UNIX-Zeile.\n"
++ 
++-#: ../netstat.c:1055
+++#: ../netstat.c:1155
++ msgid "STREAM"
++ msgstr "STREAM"
++ 
++-#: ../netstat.c:1059
+++#: ../netstat.c:1159
++ msgid "DGRAM"
++ msgstr "DGRAM"
++ 
++-#: ../netstat.c:1063
+++#: ../netstat.c:1163
++ msgid "RAW"
++ msgstr "RAW"
++ 
++-#: ../netstat.c:1067
+++#: ../netstat.c:1167
++ msgid "RDM"
++ msgstr "RDM"
++ 
++-#: ../netstat.c:1071
+++#: ../netstat.c:1171
++ msgid "SEQPACKET"
++-msgstr "SEQPACKET"
+++msgstr "SEQPAKET"
++ 
++-#: ../netstat.c:1080
+++#: ../netstat.c:1180
++ msgid "FREE"
++ msgstr "FREI"
++ 
++-#: ../netstat.c:1096
+++#: ../netstat.c:1196
++ msgid "CONNECTING"
++ msgstr "VERBINDUNGSAUFBAU"
++ 
++-#: ../netstat.c:1100
+++#: ../netstat.c:1200
++ msgid "CONNECTED"
++ msgstr "VERBUNDEN"
++ 
++-#: ../netstat.c:1104
+++#: ../netstat.c:1204
++ msgid "DISCONNECTING"
++ msgstr "VERBINDUNGSABBAU"
++ 
++-#: ../netstat.c:1135
+++#: ../netstat.c:1235
+++#, c-format
++ msgid "Active UNIX domain sockets "
++-msgstr "Aktive Sockets in der UNIX Domäne "
+++msgstr "Aktive Sockets in der UNIX-Domäne "
++ 
++-#: ../netstat.c:1137 ../netstat.c:1666
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
++ msgid "(servers and established)"
++ msgstr "(Server und stehende Verbindungen)"
++ 
++-#: ../netstat.c:1140 ../netstat.c:1669
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
++ msgid "(only servers)"
++ msgstr "(Nur Server)"
++ 
++-#: ../netstat.c:1142 ../netstat.c:1671
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
++ msgid "(w/o servers)"
++ msgstr "(ohne Server)"
++ 
++-#: ../netstat.c:1145
+++#: ../netstat.c:1245
+++#, c-format
++ msgid ""
++ "\n"
++ "Proto RefCnt Flags       Type       State         I-Node"
++@@ -975,90 +909,90 @@ msgstr ""
++ "\n"
++ "Proto RefZäh Flaggen     Typ        Zustand       I-Node"
++ 
++-#: ../netstat.c:1147
+++#: ../netstat.c:1247
+++#, c-format
++ msgid " Path\n"
++ msgstr " Pfad\n"
++ 
++-#: ../netstat.c:1167
+++#: ../netstat.c:1267
++ msgid "SABM SENT"
++ msgstr "SABM GESCHICKT"
++ 
++-#: ../netstat.c:1170
+++#: ../netstat.c:1270
++ msgid "RECOVERY"
++ msgstr "WIEDERHERSTELLUNG"
++ 
++-#: ../netstat.c:1184
+++#: ../netstat.c:1284
+++#, c-format
++ msgid "Active AX.25 sockets\n"
++ msgstr "Aktive AX.25 Sockets\n"
++ 
++-#: ../netstat.c:1185
+++#: ../netstat.c:1285
+++#, c-format
++ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
++ msgstr "Ziel       Quelle     Gerät   Zustand      Vr/Vs    Send-Q  Empf-Q\n"
++ 
++-#: ../netstat.c:1228
+++#: ../netstat.c:1328
++ #, c-format
++ msgid "problem reading data from %s\n"
++ msgstr "Problem beim Lesen von Daten von %s\n"
++ 
++-#: ../netstat.c:1279
+++#: ../netstat.c:1379
+++#, c-format
++ msgid ""
++ "Active IPX sockets\n"
++ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
++ "State"
++ msgstr ""
++ "Aktive IPX Sockets\n"
++-"Proto Recv-Q Send-Q Lokale Adresse             Gegenaddress               "
+++"Proto Recv-Q Send-Q Lokale Adresse             Gegenadresse               "
++ "Zustand"
++ 
++-#: ../netstat.c:1281
+++#: ../netstat.c:1381
+++#, c-format
++ msgid " User"
++ msgstr " Benutzer"
++ 
++-#: ../netstat.c:1315
+++#: ../netstat.c:1415
++ msgid "ESTAB"
++ msgstr "VERBUNDEN"
++ 
++-#: ../netstat.c:1323
+++#: ../netstat.c:1423
++ msgid "UNK."
++ msgstr "UNB."
++ 
++-#: ../netstat.c:1367
++-msgid "     - no statistics available -"
++-msgstr "     - keine Statistiken verfügbar -"
++-
++-#: ../netstat.c:1370
++-msgid "[NO FLAGS]"
++-msgstr "[KEINE FLAGS]"
++-
++-#: ../netstat.c:1400
+++#: ../netstat.c:1461
+++#, c-format
++ msgid "Kernel Interface table\n"
++-msgstr "Kernel Schnittstellentabelle\n"
+++msgstr "Kernel-Schnittstellentabelle\n"
++ 
++-#: ../netstat.c:1401
+++#: ../netstat.c:1465
+++#, fuzzy, c-format
++ msgid ""
++-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++-"Flg\n"
++-msgstr ""
++-"SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-Ülf    TX-OK TX-Feh TX-DRP TX-Üb "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
+++msgstr "SStelle MTU Met    RX-OK RX-Feh RX-DRP RX-Ülf    TX-OK TX-Feh TX-DRP TX-Üb Flg\n"
++ 
++-#: ../netstat.c:1404
+++#: ../netstat.c:1469
++ msgid "missing interface information"
++-msgstr "Fehlende Interfaceinformation"
+++msgstr "Fehlende Interfaceinformationen"
++ 
++-#: ../netstat.c:1425
+++#: ../netstat.c:1492
+++#, c-format
++ msgid ""
++-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ msgstr ""
++ "Benutzung: netstat [-veenNcCF] [<Af>] -r\n"
++ "           netstat {-V|--version|-h|--help}\n"
++ 
++-#: ../netstat.c:1426
+++#: ../netstat.c:1493
+++#, c-format
++ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ msgstr "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ 
++-#: ../netstat.c:1427
+++#: ../netstat.c:1494
+++#, c-format
++ msgid ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++@@ -1066,27 +1000,32 @@ msgstr ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++ 
++-#: ../netstat.c:1429
+++#: ../netstat.c:1496
+++#, c-format
++ msgid "        -r, --route              display routing table\n"
++ msgstr "        -r, --route              Routentabelle anzeigen\n"
++ 
++-#: ../netstat.c:1430
+++#: ../netstat.c:1497
+++#, c-format
++ msgid "        -i, --interfaces         display interface table\n"
++ msgstr "        -i, --interfaces         Schnittstellentabelle auflisten\n"
++ 
++-#: ../netstat.c:1431
+++#: ../netstat.c:1498
+++#, c-format
++ msgid "        -g, --groups             display multicast group memberships\n"
++ msgstr ""
++ "        -g, --groups             Mitgliedschaft in Multicastgruppen "
++ "anzeigen\n"
++ 
++-#: ../netstat.c:1432
+++#: ../netstat.c:1499
+++#, c-format
++ msgid ""
++ "        -s, --statistics         display networking statistics (like SNMP)\n"
++ msgstr ""
++ "        -s, --statistics         Netzwerksstatistiken anzeigen (wie SNMP)\n"
++ 
++-#: ../netstat.c:1434
+++#: ../netstat.c:1501
+++#, c-format
++ msgid ""
++ "        -M, --masquerade         display masqueraded connections\n"
++ "\n"
++@@ -1094,23 +1033,38 @@ msgstr ""
++ "        -M, --masquerade         Maskierte Verbindungen auflisten\n"
++ "\n"
++ 
++-#: ../netstat.c:1438 ../route.c:87
+++#: ../netstat.c:1505
+++#, fuzzy, c-format
+++msgid "        --numeric-hosts          don't resolve host names\n"
+++msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
+++
+++#: ../netstat.c:1506
+++#, fuzzy, c-format
+++msgid "        --numeric-ports          don't resolve port names\n"
+++msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
+++
+++#: ../netstat.c:1507
+++#, fuzzy, c-format
+++msgid "        --numeric-users          don't resolve user names\n"
+++msgstr "        -n, --numeric            Adressen nicht nach Namen auflösen\n"
+++
+++#: ../netstat.c:1508
+++#, c-format
++ msgid "        -N, --symbolic           resolve hardware names\n"
++ msgstr "        -N, --symbolic           Hardwarenamen auflösen\n"
++ 
++-#: ../netstat.c:1439 ../route.c:88
++-#, fuzzy
+++#: ../netstat.c:1509 ../route.c:88
+++#, fuzzy, c-format
++ msgid "        -e, --extend             display other/more information\n"
++-msgstr ""
++-"        -e, --extend             Weitere / zusätzliche Informationen "
++-"anzeigen\n"
+++msgstr "        -e, --extend             Weitere / zusätzliche Informationen anzeigen\n"
++ 
++-#: ../netstat.c:1440
+++#: ../netstat.c:1510
+++#, c-format
++ msgid "        -p, --programs           display PID/Program name for sockets\n"
++-msgstr ""
++-"        -p, --programs           PID/Programmnamen für Sockets anzeigen\n"
+++msgstr "        -p, --programs           PID/Programmnamen für Sockets anzeigen\n"
++ 
++-#: ../netstat.c:1441
+++#: ../netstat.c:1511
+++#, c-format
++ msgid ""
++ "        -c, --continuous         continuous listing\n"
++ "\n"
++@@ -1118,24 +1072,27 @@ msgstr ""
++ "        -c, --continuous         Anzeige laufend aktualisieren\n"
++ "\n"
++ 
++-#: ../netstat.c:1442
+++#: ../netstat.c:1512
+++#, c-format
++ msgid "        -l, --listening          display listening server sockets\n"
++ msgstr ""
++ "        -l, --listening          Empfangsbereite Serversockets auflisten\n"
++ 
++-#: ../netstat.c:1443
+++#: ../netstat.c:1513
+++#, c-format
++ msgid ""
++ "        -a, --all, --listening   display all sockets (default: connected)\n"
++ msgstr ""
++ "        -a, --all, --listening   Alle Sockets anzeigen (normal: nur "
++ "verbundene)\n"
++ 
++-#: ../netstat.c:1444
+++#: ../netstat.c:1514
+++#, c-format
++ msgid "        -o, --timers             display timers\n"
++ msgstr "        -o, --timers             Timer auflisten\n"
++ 
++-#: ../netstat.c:1445 ../route.c:89
++-#, fuzzy
+++#: ../netstat.c:1515 ../route.c:89
+++#, fuzzy, c-format
++ msgid ""
++ "        -F, --fib                display Forwarding Information Base "
++ "(default)\n"
++@@ -1143,7 +1100,8 @@ msgstr ""
++ "        -F, --fib                Forwarding Infomation Base anzeigen "
++ "(Standard)\n"
++ 
++-#: ../netstat.c:1446 ../route.c:90
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
++ msgid ""
++ "        -C, --cache              display routing cache instead of FIB\n"
++ "\n"
++@@ -1151,110 +1109,118 @@ msgstr ""
++ "        -C, --cache              Routencache statt FIB anzeigen\n"
++ "\n"
++ 
++-#: ../netstat.c:1448
+++#: ../netstat.c:1518
+++#, c-format
++ msgid ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ msgstr ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ 
++-#: ../netstat.c:1449 ../route.c:92
++-#, c-format
++-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
+++#: ../netstat.c:1519
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
++ msgstr "  <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n"
++ 
++-#: ../netstat.c:1450 ../route.c:93
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
++ msgid "  List of possible address families (which support routing):\n"
++ msgstr "  Liste möglicher Adressfamilien, die Routen unterstützen:\n"
++ 
++-#: ../netstat.c:1663
+++#: ../netstat.c:1753
+++#, c-format
++ msgid "Active Internet connections "
++ msgstr "Aktive Internetverbindungen "
++ 
++-#: ../netstat.c:1673
+++#: ../netstat.c:1763
+++#, c-format
++ msgid ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ msgstr ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ 
++-#: ../netstat.c:1675
+++#: ../netstat.c:1765
+++#, c-format
++ msgid " User       Inode     "
++ msgstr " Benutzer   Inode     "
++ 
++-#: ../netstat.c:1678
+++#: ../netstat.c:1768
+++#, c-format
++ msgid " Timer"
++ msgstr " Timer"
++ 
++-#: ../netstat.c:1708
+++#: ../netstat.c:1798
+++#, c-format
++ msgid "IPv4 Group Memberships\n"
++-msgstr "IPv4 Gruppenmitgliedschaften\n"
+++msgstr "IPv4-Gruppenmitgliedschaften\n"
++ 
++-#: ../netstat.c:1709
+++#: ../netstat.c:1799
+++#, c-format
++ msgid "Interface       RefCnt Group\n"
++ msgstr "Schnittstelle   RefZäh Grupp\n"
++ 
++-#: ../rarp.c:43
+++#: ../rarp.c:44
++ msgid "This kernel does not support RARP.\n"
++ msgstr "Dieser Kernel unterstützt kein RARP.\n"
++ 
++-#: ../rarp.c:82
+++#: ../rarp.c:83
++ #, c-format
++ msgid "no RARP entry for %s.\n"
++-msgstr "Kein RARP Eintrag für %s.\n"
+++msgstr "Kein RARP-Eintrag für %s.\n"
++ 
++-#: ../rarp.c:95
+++#: ../rarp.c:96
++ #, c-format
++ msgid "%s: bad hardware address\n"
++ msgstr "%s: fehlerhafte Hardwareadresse\n"
++ 
++-#: ../rarp.c:127
+++#: ../rarp.c:128
++ #, c-format
++ msgid "rarp: cannot open file %s:%s.\n"
++ msgstr "rarp: kann Datei %s:%s nicht öffnen.\n"
++ 
++-#: ../rarp.c:139
+++#: ../rarp.c:140
++ #, c-format
++ msgid "rarp: format error at %s:%u\n"
++ msgstr "rarp: Formatfehler bei %s:%u\n"
++ 
++-#: ../rarp.c:143 ../rarp.c:287
+++#: ../rarp.c:144 ../rarp.c:289
++ #, c-format
++ msgid "rarp: %s: unknown host\n"
++ msgstr "rarp: %s: Unbekannter Host\n"
++ 
++-#: ../rarp.c:146
+++#: ../rarp.c:147
++ #, c-format
++ msgid "rarp: cannot set entry from %s:%u\n"
++ msgstr "rarp: Kann Eintrag aus %s:%u nicht setzen.\n"
++ 
++-#: ../rarp.c:175
+++#: ../rarp.c:176
+++#, c-format
++ msgid "Usage: rarp -a                               list entries in cache.\n"
++-msgstr ""
++-"Benutzung: rarp -a                               Einträge im Cache listen.\n"
+++msgstr "Benutzung: rarp -a                               Einträge im Cache listen.\n"
++ 
++-#: ../rarp.c:176
+++#: ../rarp.c:177
+++#, c-format
++ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
++-msgstr ""
++-"       rarp -d <hostname>                    Eintrag aus dem Cache löschen.\n"
+++msgstr "       rarp -d <hostname>                    Eintrag aus dem Cache löschen.\n"
++ 
++-#: ../rarp.c:177
+++#: ../rarp.c:178
+++#, c-format
++ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
++-msgstr ""
++-"       rarp [<HW>] -s <hostname> <hwaddr>    Eintrag zum Cache zufügen.\n"
+++msgstr "       rarp [<HW>] -s <hostname> <hwaddr>    Eintrag zum Cache zufügen.\n"
++ 
++-#: ../rarp.c:178
+++#: ../rarp.c:179
+++#, c-format
++ msgid ""
++ "       rarp -f                               add entries from /etc/ethers.\n"
++-msgstr ""
++-"       rarp -f                               Einträge aus /etc/ethers "
++-"zufügen.\n"
+++msgstr "       rarp -f                               Einträge aus /etc/ethers zufügen.\n"
++ 
++-#: ../rarp.c:179
+++#: ../rarp.c:180
+++#, c-format
++ msgid ""
++ "       rarp -V                               display program version.\n"
++ "\n"
++@@ -1262,24 +1228,26 @@ msgstr ""
++ "       rarp -V                               Programmversion anzeigen.\n"
++ "\n"
++ 
++-#: ../rarp.c:236
+++#: ../rarp.c:238
++ #, c-format
++ msgid "%s: illegal option mix.\n"
++ msgstr "%s: Unerlaubte Mischung von Optionen.\n"
++ 
++-#: ../rarp.c:267
+++#: ../rarp.c:269
++ #, c-format
++ msgid "rarp: %s: unknown hardware type.\n"
++-msgstr "rarp: %s: unknown hardware type.\n"
+++msgstr "rarp: %s: unbekannter Hardwaretyp.\n"
++ 
++-#: ../route.c:79
+++#: ../route.c:80
+++#, c-format
++ msgid ""
++ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
++ msgstr ""
++ "Benutzung: route [-nNvee] [-FC] [<AF>]           Kernelroutentabelle "
++ "anzeigen\n"
++ 
++-#: ../route.c:80
+++#: ../route.c:81
+++#, c-format
++ msgid ""
++ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
++ "\n"
++@@ -1287,14 +1255,15 @@ msgstr ""
++ "       route [-v] [-FC] {add|del|flush} ...  Routentabelle für AF ändern.\n"
++ "\n"
++ 
++-#: ../route.c:82
+++#: ../route.c:83
+++#, c-format
++ msgid ""
++ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
++ "specified AF.\n"
++-msgstr ""
++-"       route {-h|--help} [<AF>]              Genaue Syntax für AF anzeigen.\n"
+++msgstr "       route {-h|--help} [<AF>]              Genaue Syntax für AF anzeigen.\n"
++ 
++-#: ../route.c:83
+++#: ../route.c:84
+++#, c-format
++ msgid ""
++ "       route {-V|--version}                  Display version/author and "
++ "exit.\n"
++@@ -1304,590 +1273,891 @@ msgstr ""
++ "Ende.\n"
++ "\n"
++ 
+++#: ../route.c:92
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "  <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n"
+++
++ #: ../plipconfig.c:66
+++#, c-format
++ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
++ msgstr "Benutzung: plipconfig [-a] [-i] [-v] Interface\n"
++ 
++ #: ../plipconfig.c:67
+++#, c-format
++ msgid "                  [nibble NN] [trigger NN]\n"
++ msgstr "                  [nibble NN] [trigger NN]\n"
++ 
++ #: ../plipconfig.c:68
++-#, fuzzy
+++#, c-format
++ msgid "       plipconfig -V | --version\n"
++-msgstr "       plipconfig -V\n"
+++msgstr "       plipconfig -V | --version\n"
++ 
++ #: ../plipconfig.c:74
++ #, c-format
++ msgid "%s\tnibble %lu  trigger %lu\n"
++ msgstr "%s\tnibble %lu  trigger %lu\n"
++ 
++-#: ../iptunnel.c:79
+++#: ../iptunnel.c:85
+++#, c-format
++ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
++ msgstr "Benutzung: iptunnel { add | change | del | show } [ NAME ]\n"
++ 
++-#: ../iptunnel.c:80
+++#: ../iptunnel.c:86
+++#, c-format
++ msgid ""
++ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
++ msgstr "          [ mode { ipip | gre | sit } ] [ remote ADR ] [ local ADR ]\n"
++ 
++-#: ../iptunnel.c:81
+++#: ../iptunnel.c:87
+++#, c-format
++ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ msgstr "          [ [i|o]seq ] [ [i|o]key SCHLÜSSEL ] [ [i|o]csum ]\n"
++ 
++-#: ../iptunnel.c:82
++-#, fuzzy
+++#: ../iptunnel.c:88
+++#, c-format
++ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
++-msgstr ""
++-"          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n"
++-"\n"
+++msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n"
++ 
++-#: ../iptunnel.c:83
+++#: ../iptunnel.c:89
+++#, c-format
++ msgid ""
++ "       iptunnel -V | --version\n"
++ "\n"
++ msgstr ""
+++"       iptunnel -V | --version\n"
+++"\n"
++ 
++-#: ../iptunnel.c:84
+++#: ../iptunnel.c:90
+++#, c-format
++ msgid "Where: NAME := STRING\n"
++ msgstr "Wobei: NAME := ZEICHENKETTE\n"
++ 
++-#: ../iptunnel.c:85
+++#: ../iptunnel.c:91
+++#, c-format
++ msgid "       ADDR := { IP_ADDRESS | any }\n"
++ msgstr "       ADR := { IP_ADRESSE | any }\n"
++ 
++-#: ../iptunnel.c:86
+++#: ../iptunnel.c:92
+++#, c-format
++ msgid "       TOS  := { NUMBER | inherit }\n"
++ msgstr "       TOS  := { NUMBER | inherit }\n"
++ 
++-#: ../iptunnel.c:87
+++#: ../iptunnel.c:93
+++#, c-format
++ msgid "       TTL  := { 1..255 | inherit }\n"
++ msgstr "       TTL  := { 1..255 | inherit }\n"
++ 
++-#: ../iptunnel.c:88
+++#: ../iptunnel.c:94
+++#, c-format
++ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
++ msgstr "       KEY  := { DOTTED_QUAD | ZAHL }\n"
++ 
++-#: ../iptunnel.c:326
+++#: ../iptunnel.c:332
+++#, c-format
++ msgid "Keys are not allowed with ipip and sit.\n"
++ msgstr "Schlüssel sind mit ipip und sit nicht erlaubt.\n"
++ 
++-#: ../iptunnel.c:346
+++#: ../iptunnel.c:352
+++#, c-format
++ msgid "Broadcast tunnel requires a source address.\n"
++ msgstr "Ein Broadcasttunnel ist nur mit einer Quelladresse möglich\n"
++ 
++-#: ../iptunnel.c:361
+++#: ../iptunnel.c:367
+++#, c-format
++ msgid "ttl != 0 and noptmudisc are incompatible\n"
++ msgstr "ttl != 0 und noptmudisc sind inkompatibel\n"
++ 
++-#: ../iptunnel.c:373
+++#: ../iptunnel.c:379
+++#, c-format
++ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
++ msgstr ""
++ "Die Tunnelbetriebsart (ipip, fre oder sit) kann nicht festgestellt werden\n"
++ 
++-#: ../iptunnel.c:411
+++#: ../iptunnel.c:417
++ #, c-format
++ msgid "%s: %s/ip  remote %s  local %s "
++ msgstr "%s: %s/ip  Gegenseite %s  lokal %s "
++ 
++-#: ../iptunnel.c:415
+++#: ../iptunnel.c:421
++ msgid "unknown"
++ msgstr "Unbekannt"
++ 
++-#: ../iptunnel.c:447
+++#: ../iptunnel.c:453
+++#, c-format
++ msgid "  Drop packets out of sequence.\n"
++ msgstr "  Pakete außer der Reihenfolge fallenlassen.\n"
++ 
++-#: ../iptunnel.c:449
+++#: ../iptunnel.c:455
+++#, c-format
++ msgid "  Checksum in received packet is required.\n"
++ msgstr "  Prüfsumme im empfangenen Paket wird benötigt.\n"
++ 
++-#: ../iptunnel.c:451
+++#: ../iptunnel.c:457
+++#, c-format
++ msgid "  Sequence packets on output.\n"
++ msgstr "  Pakete in Reihenfolge ausgeben.\n"
++ 
++-#: ../iptunnel.c:453
+++#: ../iptunnel.c:459
+++#, c-format
++ msgid "  Checksum output packets.\n"
++ msgstr "  Prüfsumme für ausgegebene Pakete berechnen.\n"
++ 
++-#: ../iptunnel.c:481
+++#: ../iptunnel.c:487
+++#, c-format
++ msgid "Wrong format of /proc/net/dev. Sorry.\n"
++-msgstr "Falsches Format von /proc/net/dev. Tut mir leid\n"
+++msgstr "Falsches Format von /proc/net/dev. Tut mir leid.\n"
++ 
++-#: ../iptunnel.c:494
+++#: ../iptunnel.c:500
++ #, c-format
++ msgid "Failed to get type of [%s]\n"
++ msgstr "Kann den Typ von [%s] nicht holen\n"
++ 
++-#: ../iptunnel.c:510
+++#: ../iptunnel.c:516
+++#, c-format
++ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
++ msgstr "RX: Pakete     Bytes        Fehler CsumErrs OutOfSeq Mcasts\n"
++ 
++-#: ../iptunnel.c:513
+++#: ../iptunnel.c:519
+++#, c-format
++ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
++ msgstr "TX: Pakete     Bytes        Fehler DeadLoop NoRoute  NoBufs\n"
++ 
++-#: ../statistics.c:45
+++#: ../statistics.c:47
++ msgid "ICMP input histogram:"
++-msgstr "ICMP Eingabehistogramm:"
+++msgstr "ICMP-Eingabehistogramm:"
++ 
++-#: ../statistics.c:46
+++#: ../statistics.c:48
++ msgid "ICMP output histogram:"
++-msgstr "ICMP Ausgabehistogramm:"
+++msgstr "ICMP-Ausgabehistogramm:"
++ 
++-#: ../statistics.c:63
+++#: ../statistics.c:65
++ #, c-format
++ msgid "Forwarding is %s"
++ msgstr "Weiterleitung ist %s"
++ 
++-#: ../statistics.c:64
++-#, c-format
++-msgid "Default TTL is %d"
+++#: ../statistics.c:66
+++#, fuzzy, c-format
+++msgid "Default TTL is %u"
++ msgstr "Standard-TTL ist %d"
++ 
++-#: ../statistics.c:65
++-#, c-format
++-msgid "%d total packets received"
++-msgstr "%d Pakete insgesamt empfangen"
+++#: ../statistics.c:67
+++#, fuzzy, c-format
+++msgid "%u total packets received"
+++msgstr "%d Pakete insgesamt empfangen"
++ 
++-#: ../statistics.c:66
++-#, c-format
++-msgid "%d with invalid headers"
++-msgstr "%d with ungültigen Headern"
+++#: ../statistics.c:68
+++#, fuzzy, c-format
+++msgid "%u with invalid headers"
+++msgstr "%d mit ungültigen Headern"
++ 
++-#: ../statistics.c:67
++-#, c-format
++-msgid "%d with invalid addresses"
+++#: ../statistics.c:69
+++#, fuzzy, c-format
+++msgid "%u with invalid addresses"
++ msgstr "%d mit ungültigen Adressen"
++ 
++-#: ../statistics.c:68
++-#, c-format
++-msgid "%d forwarded"
+++#: ../statistics.c:70
+++#, fuzzy, c-format
+++msgid "%u forwarded"
++ msgstr "%d weitergeleitet"
++ 
++-#: ../statistics.c:69
++-#, c-format
++-msgid "%d with unknown protocol"
+++#: ../statistics.c:71
+++#, fuzzy, c-format
+++msgid "%u with unknown protocol"
++ msgstr "%d mit unbekanntem Protokoll"
++ 
++-#: ../statistics.c:70
++-#, c-format
++-msgid "%d incoming packets discarded"
+++#: ../statistics.c:72
+++#, fuzzy, c-format
+++msgid "%u incoming packets discarded"
++ msgstr "%d eingehende Pakete weggeworfen"
++ 
++-#: ../statistics.c:71
++-#, c-format
++-msgid "%d incoming packets delivered"
+++#: ../statistics.c:73
+++#, fuzzy, c-format
+++msgid "%u incoming packets delivered"
++ msgstr "%d eingehende Pakete zugestellt"
++ 
++-#: ../statistics.c:72
++-#, c-format
++-msgid "%d requests sent out"
+++#: ../statistics.c:74
+++#, fuzzy, c-format
+++msgid "%u requests sent out"
++ msgstr "%d Anfragen ausgesandt"
++ 
++ #. ?
++-#: ../statistics.c:73
++-#, c-format
++-msgid "%d outgoing packets dropped"
+++#: ../statistics.c:75
+++#, fuzzy, c-format
+++msgid "%u outgoing packets dropped"
++ msgstr "%d ausgehende Pakete weggeworfen"
++ 
++-#: ../statistics.c:74
++-#, c-format
++-msgid "%d dropped because of missing route"
+++#: ../statistics.c:76
+++#, fuzzy, c-format
+++msgid "%u dropped because of missing route"
++ msgstr "%d weggeworfen wegen fehlender Route"
++ 
++-#: ../statistics.c:75
++-#, c-format
++-msgid "%d fragments dropped after timeout"
+++#: ../statistics.c:77
+++#, fuzzy, c-format
+++msgid "%u fragments dropped after timeout"
++ msgstr "%d Fragmente nach Timeout weggeworfen"
++ 
++-#: ../statistics.c:76
++-#, c-format
++-msgid "%d reassemblies required"
+++#: ../statistics.c:78
+++#, fuzzy, c-format
+++msgid "%u reassemblies required"
++ msgstr "%d Wiederzusammenstellungen nötig"
++ 
++ #. ?
++-#: ../statistics.c:77
++-#, c-format
++-msgid "%d packets reassembled ok"
+++#: ../statistics.c:79
+++#, fuzzy, c-format
+++msgid "%u packets reassembled ok"
++ msgstr "%d Fragmente korrekt empfangen"
++ 
++-#: ../statistics.c:78
++-#, c-format
++-msgid "%d packet reassembles failed"
+++#: ../statistics.c:80
+++#, fuzzy, c-format
+++msgid "%u packet reassembles failed"
++ msgstr "%d fehlgeschlagene Paketdefragmentierungen"
++ 
++-#: ../statistics.c:79
++-#, c-format
++-msgid "%d fragments received ok"
+++#: ../statistics.c:81
+++#, fuzzy, c-format
+++msgid "%u fragments received ok"
++ msgstr "%d Fragmente korrekt empfangen"
++ 
++-#: ../statistics.c:80
++-#, c-format
++-msgid "%d fragments failed"
++-msgstr "%d Fragmente Fehlgeschlagen"
+++#: ../statistics.c:82
+++#, fuzzy, c-format
+++msgid "%u fragments failed"
+++msgstr "%d Fragmente fehlgeschlagen"
++ 
++-#: ../statistics.c:81
++-#, c-format
++-msgid "%d fragments created"
+++#: ../statistics.c:83
+++#, fuzzy, c-format
+++msgid "%u fragments created"
++ msgstr "%d Fragmente erzeugt"
++ 
++-#: ../statistics.c:86
++-#, c-format
++-msgid "%d ICMP messages received"
++-msgstr "%d ICMP Nachrichten empfangen"
+++#: ../statistics.c:88
+++#, fuzzy, c-format
+++msgid "%u ICMP messages received"
+++msgstr "%d ICMP-Nachrichten empfangen"
++ 
++-#: ../statistics.c:87
++-#, c-format
++-msgid "%d input ICMP message failed."
++-msgstr "%d eingegangene ICMP Nachrichten fehlgeschlagen"
+++#: ../statistics.c:89
+++#, fuzzy, c-format
+++msgid "%u input ICMP message failed."
+++msgstr "%d eingegangene ICMP-Nachrichten fehlgeschlagen"
++ 
++-#: ../statistics.c:88 ../statistics.c:101
++-#, c-format
++-msgid "destination unreachable: %d"
+++#: ../statistics.c:90 ../statistics.c:103
+++#, fuzzy, c-format
+++msgid "destination unreachable: %u"
++ msgstr "Ziel unerreichbar: %d"
++ 
++-#: ../statistics.c:89
++-#, c-format
++-msgid "timeout in transit: %d"
+++#: ../statistics.c:91
+++#, fuzzy, c-format
+++msgid "timeout in transit: %u"
++ msgstr "Timeout beim Transit: %d"
++ 
++-#: ../statistics.c:90 ../statistics.c:103
++-#, c-format
++-msgid "wrong parameters: %d"
+++#: ../statistics.c:92 ../statistics.c:105
+++#, fuzzy, c-format
+++msgid "wrong parameters: %u"
++ msgstr "Fehlerhafte Parameter: %d"
++ 
++ #. ?
++-#: ../statistics.c:91
++-#, c-format
++-msgid "source quenchs: %d"
+++#: ../statistics.c:93
+++#, fuzzy, c-format
+++msgid "source quenches: %u"
++ msgstr "Source Quenchs: %d"
++ 
++-#: ../statistics.c:92
++-#, c-format
++-msgid "redirects: %d"
+++#: ../statistics.c:94
+++#, fuzzy, c-format
+++msgid "redirects: %u"
++ msgstr "Umleitungen: %d"
++ 
++-#: ../statistics.c:93
++-#, c-format
++-msgid "echo requests: %d"
++-msgstr "Echo Requests: %d"
+++#: ../statistics.c:95
+++#, fuzzy, c-format
+++msgid "echo requests: %u"
+++msgstr "Echo Anfragen: %d"
++ 
++-#: ../statistics.c:94 ../statistics.c:107
++-#, c-format
++-msgid "echo replies: %d"
+++#: ../statistics.c:96 ../statistics.c:109
+++#, fuzzy, c-format
+++msgid "echo replies: %u"
++ msgstr "Echo Antworten: %d"
++ 
++-#: ../statistics.c:95
++-#, c-format
++-msgid "timestamp request: %d"
+++#: ../statistics.c:97
+++#, fuzzy, c-format
+++msgid "timestamp request: %u"
++ msgstr "Zeitstempelanfragen: %d"
++ 
++-#: ../statistics.c:96
++-#, c-format
++-msgid "timestamp reply: %d"
+++#: ../statistics.c:98
+++#, fuzzy, c-format
+++msgid "timestamp reply: %u"
++ msgstr "Zeitstempelantworten: %d"
++ 
++-#: ../statistics.c:97
++-#, c-format
++-msgid "address mask request: %d"
+++#: ../statistics.c:99
+++#, fuzzy, c-format
+++msgid "address mask request: %u"
++ msgstr "Adressmaskenanfragen: %d"
++ 
++ #. ?
++-#: ../statistics.c:98
++-msgid "address mask replies"
++-msgstr "Adressmaskenantworten"
+++#: ../statistics.c:100 ../statistics.c:113
+++#, fuzzy, c-format
+++msgid "address mask replies: %u"
+++msgstr "Adressmaskenantworten: %d"
++ 
++ #. ?
++-#: ../statistics.c:99
++-#, c-format
++-msgid "%d ICMP messages sent"
+++#: ../statistics.c:101
+++#, fuzzy, c-format
+++msgid "%u ICMP messages sent"
++ msgstr "%d ICMP-Nachrichten geschickt"
++ 
++-#: ../statistics.c:100
++-#, c-format
++-msgid "%d ICMP messages failed"
++-msgstr "%d ICMP Nachrichten fehlgeschlagen"
++-
++ #: ../statistics.c:102
++-#, c-format
++-msgid "time exceeded: %d"
+++#, fuzzy, c-format
+++msgid "%u ICMP messages failed"
+++msgstr "%d ICMP-Nachrichten fehlgeschlagen"
+++
+++#: ../statistics.c:104
+++#, fuzzy, c-format
+++msgid "time exceeded: %u"
++ msgstr "Zeitüberschreitung: %d"
++ 
++ #. ?
++-#: ../statistics.c:104
++-#, c-format
++-msgid "source quench: %d"
+++#: ../statistics.c:106
+++#, fuzzy, c-format
+++msgid "source quench: %u"
++ msgstr "Source Quench: %d"
++ 
++-#: ../statistics.c:105
++-#, c-format
++-msgid "redirect: %d"
+++#: ../statistics.c:107
+++#, fuzzy, c-format
+++msgid "redirect: %u"
++ msgstr "Umleitungen: %d"
++ 
++-#: ../statistics.c:106
++-#, c-format
++-msgid "echo request: %d"
+++#: ../statistics.c:108
+++#, fuzzy, c-format
+++msgid "echo request: %u"
++ msgstr "Echo Anfragen: %d"
++ 
++-#: ../statistics.c:108
++-#, c-format
++-msgid "timestamp requests: %d"
+++#: ../statistics.c:110
+++#, fuzzy, c-format
+++msgid "timestamp requests: %u"
++ msgstr "Zeitstempel Anfragen: %d"
++ 
++-#: ../statistics.c:109
++-#, c-format
++-msgid "timestamp replies: %d"
+++#: ../statistics.c:111
+++#, fuzzy, c-format
+++msgid "timestamp replies: %u"
++ msgstr "Zeitstempel Antworten: %d"
++ 
++-#: ../statistics.c:110
++-#, c-format
++-msgid "address mask requests: %d"
+++#: ../statistics.c:112
+++#, fuzzy, c-format
+++msgid "address mask requests: %u"
++ msgstr "Adressmaskenanfragen: %d"
++ 
++-#: ../statistics.c:111
+++#: ../statistics.c:118
++ #, c-format
++-msgid "address mask replies: %d"
++-msgstr "Adressmaskenantworten: %d"
+++msgid "RTO algorithm is %s"
+++msgstr "RTO-Algorithmus ist %s"
+++
+++#: ../statistics.c:122
+++#, fuzzy, c-format
+++msgid "%u active connections openings"
+++msgstr "%d Verbindungen aktiv geöffnet"
+++
+++#: ../statistics.c:123
+++#, fuzzy, c-format
+++msgid "%u passive connection openings"
+++msgstr "%d Verbindungen passiv geöffnet"
+++
+++#: ../statistics.c:124
+++#, fuzzy, c-format
+++msgid "%u failed connection attempts"
+++msgstr "%d fehlerhafte Verbindungsversuche"
+++
+++#: ../statistics.c:125
+++#, fuzzy, c-format
+++msgid "%u connection resets received"
+++msgstr "%d Verbindungsrücksetzungen empfangen"
+++
+++#: ../statistics.c:126
+++#, fuzzy, c-format
+++msgid "%u connections established"
+++msgstr "%d Verbindungen aufgebaut"
+++
+++#: ../statistics.c:127
+++#, fuzzy, c-format
+++msgid "%u segments received"
+++msgstr "%d Segmente empfangen"
+++
+++#: ../statistics.c:128
+++#, fuzzy, c-format
+++msgid "%u segments send out"
+++msgstr "%d Segmente abgeschickt"
+++
+++#: ../statistics.c:129
+++#, fuzzy, c-format
+++msgid "%u segments retransmited"
+++msgstr "%d Segmente erneut geschickt"
+++
+++#: ../statistics.c:130
+++#, fuzzy, c-format
+++msgid "%u bad segments received."
+++msgstr "%d fehlerhafte Segmente empfangen."
+++
+++#: ../statistics.c:131
+++#, fuzzy, c-format
+++msgid "%u resets sent"
+++msgstr "%d Rücksetzungen geschickt"
+++
+++#: ../statistics.c:136
+++#, fuzzy, c-format
+++msgid "%u packets received"
+++msgstr "%d Pakete empfangen"
+++
+++#: ../statistics.c:137
+++#, fuzzy, c-format
+++msgid "%u packets to unknown port received."
+++msgstr "%d Pakete für unbekannte Ports empfangen."
+++
+++#: ../statistics.c:138
+++#, fuzzy, c-format
+++msgid "%u packet receive errors"
+++msgstr "%d Paketempfangsfehler"
+++
+++#: ../statistics.c:139
+++#, fuzzy, c-format
+++msgid "%u packets sent"
+++msgstr "%d Pakete geschickt"
+++
+++#: ../statistics.c:144
+++#, fuzzy, c-format
+++msgid "%u SYN cookies sent"
+++msgstr "%d SYN-Cookies verschickt"
+++
+++#: ../statistics.c:145
+++#, fuzzy, c-format
+++msgid "%u SYN cookies received"
+++msgstr "%d SYN-Cookies empfangen"
++ 
++-#: ../statistics.c:116
+++#: ../statistics.c:146
+++#, fuzzy, c-format
+++msgid "%u invalid SYN cookies received"
+++msgstr "%d ungültige SYN-Cookies empfangen"
+++
+++#: ../statistics.c:148
+++#, fuzzy, c-format
+++msgid "%u resets received for embryonic SYN_RECV sockets"
+++msgstr "%d Rücksetzungen für embrionische SYN_RECV-Sockets"
+++
+++#: ../statistics.c:150
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue because of socket buffer overrun"
+++msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen"
+++
+++#. obsolete: 2.2.0 doesn't do that anymore
+++#: ../statistics.c:153
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue"
+++msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
+++
+++#: ../statistics.c:154
+++#, fuzzy, c-format
+++msgid ""
+++"%u packets dropped from out-of-order queue because of socket buffer overrun"
+++msgstr "%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen"
+++
+++#: ../statistics.c:156
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because they were out-of-window"
+++msgstr "%d ICMP-Pakete weggeworfen die außerhalb des Fensters waren"
+++
+++#: ../statistics.c:158
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because socket was locked"
+++msgstr "%d ICMP-Pakete verworfen weil Socket gesperrt war"
+++
+++#: ../statistics.c:160
++ #, c-format
++-msgid "RTO algorithm is %s"
++-msgstr "RTO Algorithmus is %s"
+++msgid "%u TCP sockets finished time wait in fast timer"
+++msgstr ""
++ 
++-#: ../statistics.c:120
+++#: ../statistics.c:161
++ #, c-format
++-msgid "%d active connections openings"
++-msgstr "%d Verbindungen aktiv geöffnet"
+++msgid "%u time wait sockets recycled by time stamp"
+++msgstr ""
++ 
++-#: ../statistics.c:121
+++#: ../statistics.c:162
++ #, c-format
++-msgid "%d passive connection openings"
++-msgstr "%d Verbindungen passiv geöffnet"
+++msgid "%u TCP sockets finished time wait in slow timer"
+++msgstr ""
++ 
++-#: ../statistics.c:122
+++#: ../statistics.c:163
++ #, c-format
++-msgid "%d failed connection attempts"
++-msgstr "%d fehlerhafte Verbindungsversuche"
+++msgid "%u passive connections rejected because of time stamp"
+++msgstr ""
++ 
++-#: ../statistics.c:123
+++#: ../statistics.c:165
++ #, c-format
++-msgid "%d connection resets received"
++-msgstr "%d Verbindungsrücksetzungen empfangen"
+++msgid "%u active connections rejected because of time stamp"
+++msgstr ""
++ 
++-#: ../statistics.c:124
+++#: ../statistics.c:167
++ #, c-format
++-msgid "%d connections established"
++-msgstr "%d Verbindungen aufgebaut"
+++msgid "%u packets rejects in established connections because of timestamp"
+++msgstr ""
++ 
++-#: ../statistics.c:125
+++#: ../statistics.c:169
+++#, fuzzy, c-format
+++msgid "%u delayed acks sent"
+++msgstr "%d Pakete geschickt"
+++
+++#: ../statistics.c:170
++ #, c-format
++-msgid "%d segments received"
++-msgstr "%d Segmente empfangen"
+++msgid "%u delayed acks further delayed because of locked socket"
+++msgstr ""
++ 
++-#: ../statistics.c:126
+++#: ../statistics.c:172
++ #, c-format
++-msgid "%d segments send out"
++-msgstr "%d Segmente abgeschickt"
+++msgid "Quick ack mode was activated %u times"
+++msgstr ""
++ 
++-#: ../statistics.c:127
+++#: ../statistics.c:173
++ #, c-format
++-msgid "%d segments retransmited"
++-msgstr "%d Segmente erneut geschickt"
+++msgid "%u times the listen queue of a socket overflowed"
+++msgstr ""
++ 
++-#: ../statistics.c:128
+++#: ../statistics.c:175
++ #, c-format
++-msgid "%d bad segments received."
++-msgstr "%d fehlerhafte Segmente empfangen."
+++msgid "%u SYNs to LISTEN sockets ignored"
+++msgstr ""
++ 
++-#: ../statistics.c:129
+++#: ../statistics.c:176
++ #, c-format
++-msgid "%d resets sent"
++-msgstr "%d Rücksetzungen geschickt"
+++msgid "%u packets directly queued to recvmsg prequeue."
+++msgstr ""
++ 
++-#: ../statistics.c:134
+++#: ../statistics.c:178
++ #, c-format
++-msgid "%d packets received"
+++msgid "%u of bytes directly received from backlog"
+++msgstr ""
+++
+++#: ../statistics.c:180
+++#, c-format
+++msgid "%u of bytes directly received from prequeue"
+++msgstr ""
+++
+++#: ../statistics.c:182
+++#, fuzzy, c-format
+++msgid "%u packets dropped from prequeue"
+++msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
+++
+++#: ../statistics.c:183
+++#, fuzzy, c-format
+++msgid "%u packet headers predicted"
++ msgstr "%d Pakete empfangen"
++ 
++-#: ../statistics.c:135
+++#: ../statistics.c:184
++ #, c-format
++-msgid "%d packets to unknown port received."
+++msgid "%u packets header predicted and directly queued to user"
+++msgstr ""
+++
+++#: ../statistics.c:186
+++#, c-format
+++msgid "Ran %u times out of system memory during packet sending"
+++msgstr ""
+++
+++#: ../statistics.c:188
+++#, fuzzy, c-format
+++msgid "%u acknowledgments not containing data received"
++ msgstr "%d Pakete für unbekannte Ports empfangen."
++ 
++-#: ../statistics.c:136
+++#: ../statistics.c:189
++ #, c-format
++-msgid "%d packet receive errors"
++-msgstr "%d Paketempfangsfehler"
+++msgid "%u predicted acknowledgments"
+++msgstr ""
++ 
++-#: ../statistics.c:137
+++#: ../statistics.c:190
++ #, c-format
++-msgid "%d packets sent"
++-msgstr "%d Pakete geschickt"
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr ""
++ 
++-#: ../statistics.c:142
+++#: ../statistics.c:191
++ #, c-format
++-msgid "%d SYN cookies sent"
++-msgstr "%d SYN-Cookies verschickt"
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr ""
++ 
++-#: ../statistics.c:143
+++#: ../statistics.c:192
+++#, fuzzy, c-format
+++msgid "%u bad SACKs received"
+++msgstr "%d fehlerhafte Segmente empfangen."
+++
+++#: ../statistics.c:193
++ #, c-format
++-msgid "%d SYN cookies received"
++-msgstr "%d SYN-Cookies empfangen"
+++msgid "Detected reordering %u times using FACK"
+++msgstr ""
++ 
++-#: ../statistics.c:144
+++#: ../statistics.c:194
++ #, c-format
++-msgid "%d invalid SYN cookies received"
++-msgstr "%d ungültige SYN-Cookies empfangen"
+++msgid "Detected reordering %u times using SACK"
+++msgstr ""
++ 
++-#: ../statistics.c:146
+++#: ../statistics.c:195
++ #, c-format
++-msgid "%d resets received for embryonic SYN_RECV sockets"
++-msgstr "%d Rücksetzungen fuer embrionische SYN_RECV Sockets"
+++msgid "Detected reordering %u times using time stamp"
+++msgstr ""
++ 
++-#: ../statistics.c:148
+++#: ../statistics.c:196
++ #, c-format
++-msgid "%d packets pruned from receive queue because of socket buffer overrun"
+++msgid "Detected reordering %u times using reno fast retransmit"
++ msgstr ""
++-"%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange "
++-"weggeworfen"
++ 
++-#. obsolete: 2.2.0 doesn't do that anymore
++-#: ../statistics.c:151
+++#: ../statistics.c:197
++ #, c-format
++-msgid "%d packets pruned from out-of-order queue"
++-msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen"
+++msgid "%u congestion windows fully recovered"
+++msgstr ""
++ 
++-#: ../statistics.c:152
+++#: ../statistics.c:198
++ #, c-format
++-msgid ""
++-"%d packets dropped from out-of-order queue because of socket buffer overrun"
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
++ msgstr ""
++-"%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen"
++ 
++-#: ../statistics.c:154
+++#: ../statistics.c:199
++ #, c-format
++-msgid "%d ICMP packets dropped because they were out-of-window"
++-msgstr "%d ICMP Pakete weggeworfen die auserhalb des Fensters waren"
+++msgid "%u congestion window recovered using DSACK"
+++msgstr ""
++ 
++-#: ../statistics.c:156
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr ""
+++
+++#: ../statistics.c:201
+++#, fuzzy, c-format
+++msgid "%u retransmits lost"
+++msgstr "%d Rücksetzungen geschickt"
+++
+++#: ../statistics.c:202
+++#, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr ""
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr ""
+++
+++#: ../statistics.c:205
+++#, fuzzy, c-format
+++msgid "%u fast retransmits"
+++msgstr "%d Segmente erneut geschickt"
+++
+++#: ../statistics.c:206
+++#, c-format
+++msgid "%u forward retransmits"
+++msgstr ""
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr ""
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr ""
+++
+++#: ../statistics.c:209
+++#, fuzzy, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr "%d Segmente erneut geschickt"
+++
+++#: ../statistics.c:210
+++#, fuzzy, c-format
+++msgid "%u sack retransmits failed"
+++msgstr "%d fehlgeschlagene Paketdefragmentierungen"
+++
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr ""
+++
+++#: ../statistics.c:212
+++#, fuzzy, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen"
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr ""
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr ""
+++
+++#: ../statistics.c:215
+++#, fuzzy, c-format
+++msgid "%u DSACKs received"
+++msgstr "%d Pakete empfangen"
+++
+++#: ../statistics.c:216
+++#, fuzzy, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr "%d Pakete insgesamt empfangen"
+++
+++#: ../statistics.c:217
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr "%d Verbindungsrücksetzungen empfangen"
+++
+++#: ../statistics.c:218
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr "%d Verbindungsrücksetzungen empfangen"
+++
+++#: ../statistics.c:219
+++#, fuzzy, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr "%d Verbindungsrücksetzungen empfangen"
+++
+++#: ../statistics.c:220
++ #, c-format
++-msgid "%d ICMP packets dropped because socket was locked"
++-msgstr "%d ICMP Pakete verworfen weil Socket gesperrt war"
+++msgid "%u connections aborted due to memory pressure"
+++msgstr ""
+++
+++#: ../statistics.c:221
+++#, fuzzy, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr "%d Verbindungsrücksetzungen empfangen"
++ 
++ #: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr ""
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr ""
+++
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr ""
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr ""
+++
+++#: ../statistics.c:292
++ msgid "enabled"
++ msgstr "aktiviert"
++ 
++-#: ../statistics.c:222
+++#: ../statistics.c:292
++ msgid "disabled"
++ msgstr "deaktiviert"
++ 
++-#: ../statistics.c:272
++-#, c-format
++-msgid "unknown title %s\n"
++-msgstr "Unbekannter Titel %s\n"
++-
++-#: ../statistics.c:298
+++#: ../statistics.c:375
++ msgid "error parsing /proc/net/snmp"
++ msgstr "Fehler beim Parsen von /proc/net/snmp"
++ 
++-#: ../statistics.c:311
+++#: ../statistics.c:388
++ msgid "cannot open /proc/net/snmp"
++ msgstr "Kann /proc/net/snmp nicht öffnen"
++ 
++ #: ../lib/activate.c:69
++ #, c-format
++ msgid "Hardware type `%s' not supported.\n"
++-msgstr "Hardwaretyp ,,%s'' nicht unterstützt.\n"
+++msgstr "Hardwaretyp »%s« nicht unterstützt.\n"
++ 
++ #: ../lib/activate.c:73
++ #, c-format
++ msgid "Cannot change line discipline to `%s'.\n"
++-msgstr "Kann line discipline nicht auf ``%s'' setzen.\n"
+++msgstr "Kann line discipline nicht auf »%s« setzen.\n"
++ 
++-#: ../lib/af.c:145 ../lib/hw.c:148
+++#: ../lib/af.c:153 ../lib/hw.c:161
++ msgid "UNSPEC"
++ msgstr "UNSPEC"
++ 
++-#: ../lib/af.c:147
+++#: ../lib/af.c:155
++ msgid "UNIX Domain"
++-msgstr "UNIX Domain"
+++msgstr "UNIX-Domain"
++ 
++-#: ../lib/af.c:150
+++#: ../lib/af.c:158
++ msgid "DARPA Internet"
++-msgstr "DARPA Internet"
+++msgstr "DARPA-Internet"
++ 
++-#: ../lib/af.c:153
+++#: ../lib/af.c:161
++ msgid "IPv6"
++ msgstr "IPv6"
++ 
++-#: ../lib/af.c:156 ../lib/hw.c:169
+++#: ../lib/af.c:164 ../lib/hw.c:182
++ msgid "AMPR AX.25"
++ msgstr "AMPR AX.25"
++ 
++-#: ../lib/af.c:159 ../lib/hw.c:175
+++#: ../lib/af.c:167 ../lib/hw.c:188
++ msgid "AMPR NET/ROM"
++ msgstr "AMPR NET/ROM"
++ 
++-#: ../lib/af.c:162
+++#: ../lib/af.c:170
++ msgid "Novell IPX"
++ msgstr ""
++ 
++-#: ../lib/af.c:165
+++#: ../lib/af.c:173
++ msgid "Appletalk DDP"
++ msgstr "Appletalk DDP"
++ 
++-#: ../lib/af.c:168 ../lib/hw.c:207
+++#: ../lib/af.c:176 ../lib/hw.c:223
++ msgid "Econet"
++ msgstr "Econet"
++ 
++-#: ../lib/af.c:171 ../lib/hw.c:172
+++#: ../lib/af.c:179
+++msgid "CCITT X.25"
+++msgstr ""
+++
+++#: ../lib/af.c:182 ../lib/hw.c:185
++ msgid "AMPR ROSE"
++ msgstr "AMPR ROSE"
++ 
++-#: ../lib/af.c:174 ../lib/hw.c:160
+++#: ../lib/af.c:185 ../lib/hw.c:173
++ msgid "Ash"
++ msgstr "Ash"
++ 
++-#: ../lib/af.c:232
+++#: ../lib/af.c:243
+++#, c-format
++ msgid "Please don't supply more than one address family.\n"
++ msgstr "Bitte nur eine Adressfamilie angeben.\n"
++ 
++-#: ../lib/af.c:293
+++#: ../lib/af.c:304
+++#, c-format
++ msgid "Too much address family arguments.\n"
++ msgstr "Zu viele Adressfamilien angegeben.\n"
++ 
++-#: ../lib/af.c:304
+++#: ../lib/af.c:315
++ #, c-format
++ msgid "Unknown address family `%s'.\n"
++-msgstr "Unbekannte Adressfamilie `%s'.\n"
++-
++-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
++-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
++-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
++-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
++-msgid "[NONE SET]"
++-msgstr "[NICHT GESETZT]"
+++msgstr "Unbekannte Adressfamilie »%s«.\n"
++ 
++-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
+++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
++ #, c-format
++ msgid "in_arcnet(%s): invalid arcnet address!\n"
++ msgstr "in_arcnet(%s): Ungültige ARCnet-Adresse!\n"
++ 
++-#: ../lib/arcnet.c:108
+++#: ../lib/arcnet.c:97
++ #, c-format
++ msgid "in_arcnet(%s): trailing : ignored!\n"
++ msgstr "in_arcnet(%s): angehängt : ignoriert!\n"
++ 
++-#: ../lib/arcnet.c:120
+++#: ../lib/arcnet.c:109
++ #, c-format
++ msgid "in_arcnet(%s): trailing junk!\n"
++ msgstr "in_arcnet(%s): Nachfolgender Müll!\n"
++ 
++ #: ../lib/ash.c:81
+++#, c-format
++ msgid "Malformed Ash address"
++-msgstr "Fehlerhafte Ash Adresse"
+++msgstr "Fehlerhafte Ash-Adresse"
+++
+++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
+++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
+++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
+++msgid "[NONE SET]"
+++msgstr "[NICHT GESETZT]"
++ 
++ #: ../lib/ax25.c:97 ../lib/netrom.c:100
++ msgid "Invalid callsign"
++@@ -1898,22 +2168,21 @@ msgid "Callsign too long"
++ msgstr "Rufzeichen zu lang"
++ 
++ #: ../lib/ax25_gr.c:47
+++#, c-format
++ msgid "AX.25 not configured in this system.\n"
++ msgstr "AX.25 ist auf diesem System nicht konfiguriert.\n"
++ 
++ #: ../lib/ax25_gr.c:50
+++#, c-format
++ msgid "Kernel AX.25 routing table\n"
++ msgstr "Kernel AX.25 Routentabelle\n"
++ 
++ #. xxx
++ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
++ msgid "Destination  Iface    Use\n"
++ msgstr "Ziel         SStelle  Benutzer\n"
++ 
++-#: ../lib/ddp_gr.c:21
++-msgid "Routing table for `ddp' not yet supported.\n"
++-msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n"
++-
++ #: ../lib/ether.c:74 ../lib/ether.c:91
++ #, c-format
++ msgid "in_ether(%s): invalid ether address!\n"
++@@ -1929,153 +2198,168 @@ msgstr "in_ether(%s): angehängt : ignori
++ msgid "in_ether(%s): trailing junk!\n"
++ msgstr "in_ether(%s): Nachfolgender Müll!\n"
++ 
++-#: ../lib/fddi.c:95 ../lib/fddi.c:110
+++#: ../lib/fddi.c:84 ../lib/fddi.c:99
++ #, c-format
++ msgid "in_fddi(%s): invalid fddi address!\n"
++ msgstr "in_fddi(%s): Ungültige FDDI-Adresse!\n"
++ 
++-#: ../lib/fddi.c:122
+++#: ../lib/fddi.c:111
++ #, c-format
++ msgid "in_fddi(%s): trailing : ignored!\n"
++ msgstr "in_fddi(%s): nachfolgend : ignoriert!\n"
++ 
++-#: ../lib/fddi.c:134
+++#: ../lib/fddi.c:123
++ #, c-format
++ msgid "in_fddi(%s): trailing junk!\n"
++ msgstr "in_fddi(%s): Nachfolgender Müll!\n"
++ 
++-#: ../lib/getroute.c:97 ../lib/setroute.c:76
+++#: ../lib/getroute.c:101 ../lib/setroute.c:80
++ #, c-format
++ msgid "Address family `%s' not supported.\n"
++ msgstr "Adressfamilie `%s' wird nicht unterstützt.\n"
++ 
++-#: ../lib/getroute.c:103 ../lib/setroute.c:80
+++#: ../lib/getroute.c:107 ../lib/setroute.c:84
++ #, c-format
++ msgid "No routing for address family `%s'.\n"
++ msgstr "Kein Routen für Adressfamilie `%s'.\n"
++ 
++-#: ../lib/hippi.c:96 ../lib/hippi.c:111
+++#: ../lib/hippi.c:84 ../lib/hippi.c:99
++ #, c-format
++ msgid "in_hippi(%s): invalid hippi address!\n"
++ msgstr "in_hippi(%s): Ungültige HIPPI-Adresse!\n"
++ 
++-#: ../lib/hippi.c:123
+++#: ../lib/hippi.c:111
++ #, c-format
++ msgid "in_hippi(%s): trailing : ignored!\n"
++ msgstr "in_hippi(%s): nachfolgend : ignoriert!\n"
++ 
++-#: ../lib/hippi.c:134
+++#: ../lib/hippi.c:122
++ #, c-format
++ msgid "in_hippi(%s): trailing junk!\n"
++ msgstr "in_hippi(%s): Nachfolgender Müll!\n"
++ 
++-#: ../lib/hw.c:147
+++#: ../lib/hw.c:160
++ msgid "Local Loopback"
++ msgstr "Lokale Schleife"
++ 
++-#: ../lib/hw.c:150
+++#: ../lib/hw.c:163
++ msgid "Serial Line IP"
++ msgstr "Serielle IP"
++ 
++-#: ../lib/hw.c:151
+++#: ../lib/hw.c:164
++ msgid "VJ Serial Line IP"
++ msgstr "Serielle VJ-IP"
++ 
++-#: ../lib/hw.c:152
+++#: ../lib/hw.c:165
++ msgid "6-bit Serial Line IP"
++ msgstr "6-bit Serielle IP"
++ 
++-#: ../lib/hw.c:153
+++#: ../lib/hw.c:166
++ msgid "VJ 6-bit Serial Line IP"
++ msgstr "VJ 6-bit Serielle IP"
++ 
++-#: ../lib/hw.c:154
+++#: ../lib/hw.c:167
++ msgid "Adaptive Serial Line IP"
++ msgstr "Adaptive Serielle IP"
++ 
++-#: ../lib/hw.c:157
+++#: ../lib/hw.c:170
++ msgid "Ethernet"
++ msgstr "Ethernet"
++ 
++-#: ../lib/hw.c:163
+++#: ../lib/hw.c:176
++ msgid "Fiber Distributed Data Interface"
++ msgstr "Fiber Distributed Data Interface"
++ 
++-#: ../lib/hw.c:166
+++#: ../lib/hw.c:179
++ msgid "HIPPI"
++ msgstr "HIPPI"
++ 
++-#: ../lib/hw.c:178
+++#: ../lib/hw.c:191
+++msgid "generic X.25"
+++msgstr ""
+++
+++#: ../lib/hw.c:194
++ msgid "IPIP Tunnel"
++ msgstr "IPIP Tunnel"
++ 
++-#: ../lib/hw.c:181
+++#: ../lib/hw.c:197
++ msgid "Point-to-Point Protocol"
++-msgstr "Punkt-zu-Punkt Verbindung"
+++msgstr "Punkt-zu-Punkt-Verbindung"
++ 
++-#: ../lib/hw.c:184
+++#: ../lib/hw.c:200
++ msgid "(Cisco)-HDLC"
++ msgstr "(Cisco)-HDLC"
++ 
++-#: ../lib/hw.c:185
+++#: ../lib/hw.c:201
++ msgid "LAPB"
++ msgstr "LAPB"
++ 
++-#: ../lib/hw.c:188
+++#: ../lib/hw.c:204
++ msgid "ARCnet"
++ msgstr "ARCnet"
++ 
++-#: ../lib/hw.c:191
+++#: ../lib/hw.c:207
++ msgid "Frame Relay DLCI"
++ msgstr "Frame Relay DLCI"
++ 
++-#: ../lib/hw.c:192
+++#: ../lib/hw.c:208
++ msgid "Frame Relay Access Device"
++ msgstr "Frame Relay Access Device"
++ 
++-#: ../lib/hw.c:195
+++#: ../lib/hw.c:211
++ msgid "IPv6-in-IPv4"
++ msgstr "IPv6-nach-IPv4"
++ 
++-#: ../lib/hw.c:198
++-#, fuzzy
+++#: ../lib/hw.c:214
++ msgid "IrLAP"
++-msgstr "LAPB"
+++msgstr "IrLAP"
++ 
++-#: ../lib/hw.c:201
+++#: ../lib/hw.c:217
++ msgid "16/4 Mbps Token Ring"
++ msgstr ""
++ 
++-#: ../lib/hw.c:203
+++#: ../lib/hw.c:219
++ msgid "16/4 Mbps Token Ring (New)"
++ msgstr ""
++ 
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr ""
+++
++ #: ../lib/inet.c:153 ../lib/inet6.c:79
++ #, c-format
++ msgid "rresolve: unsupport address family %d !\n"
++ msgstr "rresolve: nicht unterstützte Adressfamilie %d !\n"
++ 
++-#: ../lib/inet6_gr.c:79
+++#: ../lib/inet6.c:131
+++#, fuzzy
+++msgid "[UNKNOWN]"
+++msgstr "UNBEKANNT"
+++
+++#: ../lib/inet6_gr.c:71
+++#, c-format
++ msgid "INET6 (IPv6) not configured in this system.\n"
++ msgstr "INET6 (IPv6) ist auf diesem System nicht konfiguriert.\n"
++ 
++-#: ../lib/inet6_gr.c:82
+++#: ../lib/inet6_gr.c:74
+++#, c-format
++ msgid "Kernel IPv6 routing table\n"
++-msgstr "Kernel IPv6 Routentabelle\n"
+++msgstr "Kernel-IPv6-Routentabelle\n"
++ 
++-#: ../lib/inet6_gr.c:84
+++#: ../lib/inet6_gr.c:76
+++#, c-format
++ msgid ""
++-"Destination                                 Next Hop                         "
++-"       Flags Metric Ref    Use Iface\n"
++-msgstr ""
++-"Ziel                                        Nächster Hop                     "
++-"            Flags Metric Ref    Benutzer Iface\n"
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
+++msgstr "Ziel                                        Nächster Hop                                 Flags Metric Ref    Benutzer Iface\n"
++ 
++-#: ../lib/inet6_gr.c:158
+++#: ../lib/inet6_gr.c:150
+++#, c-format
++ msgid "Kernel IPv6 Neighbour Cache\n"
++ msgstr "Kernel IPv6 Nachbarcache\n"
++ 
++-#: ../lib/inet6_gr.c:161
+++#: ../lib/inet6_gr.c:153
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State\n"
++@@ -2083,39 +2367,45 @@ msgstr ""
++ "Nachbar                                     HW-Adresse        Iface    Flags "
++ "Ref Zustand\n"
++ 
++-#: ../lib/inet6_gr.c:165
+++#: ../lib/inet6_gr.c:157
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State            Stale(sec) Delete(sec)\n"
++-msgstr ""
++-"Nachbar                                     HW-Adresse        Iface    Flags "
++-"Ref Zustand          Stale(sec) Löschen(sec)\n"
+++msgstr "Nachbar                                     HW-Adresse        Iface    Flags Ref Zustand          Stale(sec) Löschen(sec)\n"
++ 
++ #: ../lib/inet6_sr.c:46
+++#, c-format
++ msgid "Usage: inet6_route [-vF] del Target\n"
++ msgstr "Benutzung: inet6_route [-vF] del Ziel\n"
++ 
++ #: ../lib/inet6_sr.c:47
+++#, c-format
++ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
++ msgstr "       inet6_route [-vF] add Ziel [gw Gateway] [metric M] [[dev] If]\n"
++ 
++ #: ../lib/inet6_sr.c:48
+++#, c-format
++ msgid "       inet6_route [-FC] flush      NOT supported\n"
++ msgstr "       inet6_route [-FC] flush      NICHT unterstützt\n"
++ 
++-#: ../lib/inet6_sr.c:182
+++#: ../lib/inet6_sr.c:188
+++#, c-format
++ msgid "Flushing `inet6' routing table not supported\n"
++-msgstr ",,Flush'' für IPv6 Routentabelle nicht unterstützt\n"
+++msgstr "»Flush« für IPv6-Routentabelle nicht unterstützt\n"
++ 
++ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
++ msgid "INET (IPv4) not configured in this system.\n"
++ msgstr "INET (IPv4) ist auf diesem System nicht konfiguriert.\n"
++ 
++ #: ../lib/inet_gr.c:53
+++#, c-format
++ msgid "Kernel IP routing table\n"
++-msgstr "Kernel IP Routentabelle\n"
+++msgstr "Kernel-IP-Routentabelle\n"
++ 
++ #: ../lib/inet_gr.c:56
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2124,6 +2414,7 @@ msgstr ""
++ "Iface\n"
++ 
++ #: ../lib/inet_gr.c:59
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
++ "Iface\n"
++@@ -2132,6 +2423,7 @@ msgstr ""
++ "Iface\n"
++ 
++ #: ../lib/inet_gr.c:62
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt\n"
++@@ -2140,10 +2432,12 @@ msgstr ""
++ "Iface    MSS   Fenster irtt\n"
++ 
++ #: ../lib/inet_gr.c:237
+++#, c-format
++ msgid "Kernel IP routing cache\n"
++-msgstr "Kernel IP Routencache\n"
+++msgstr "Kernel-IP-Routencache\n"
++ 
++ #: ../lib/inet_gr.c:258
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2152,6 +2446,7 @@ msgstr ""
++ "Iface\n"
++ 
++ #: ../lib/inet_gr.c:261
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags   MSS Window  irtt "
++ "Iface\n"
++@@ -2160,6 +2455,7 @@ msgstr ""
++ "Iface\n"
++ 
++ #: ../lib/inet_gr.c:266
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  HH  Arp\n"
++@@ -2168,6 +2464,7 @@ msgstr ""
++ "Iface    MSS   Fenster irtt   HH  Arp\n"
++ 
++ #: ../lib/inet_gr.c:290
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++@@ -2175,37 +2472,39 @@ msgstr ""
++ "Quelle          Ziel            Gateway         Flags Metrik Ref    Ben "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++ 
++-#: ../lib/inet_sr.c:50
+++#: ../lib/inet_sr.c:51
+++#, c-format
++ msgid ""
++ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++-msgstr ""
++-"Benutzung: inet_route [-vF] del {-host|-net} Ziel[/prefix] [gw Gw] [metric "
++-"M] [[dev] If]\n"
+++msgstr "Benutzung: inet_route [-vF] del {-host|-net} Ziel[/Präfix] [gw Gw] [metric M] [[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:51
+++#: ../lib/inet_sr.c:52
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
++-msgstr ""
++-"       inet_route [-vF] add {-host|-net} Ziel[/Prefix] [gw Gw] [metric M]\n"
+++msgstr "       inet_route [-vF] add {-host|-net} Ziel[/Präfix] [gw Gw] [metric M]\n"
++ 
++-#: ../lib/inet_sr.c:52
+++#: ../lib/inet_sr.c:53
+++#, c-format
++ msgid ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ msgstr ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ 
++-#: ../lib/inet_sr.c:53
+++#: ../lib/inet_sr.c:54
+++#, c-format
++ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:54
+++#: ../lib/inet_sr.c:55
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
++-msgstr ""
++-"       inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric M] reject\n"
+++msgstr "       inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric M] reject\n"
++ 
++-#: ../lib/inet_sr.c:55
+++#: ../lib/inet_sr.c:56
+++#, c-format
++ msgid "       inet_route [-FC] flush      NOT supported\n"
++ msgstr "       inet_route [-FC] flush      NICHT unterstützt\n"
++ 
++@@ -2215,15 +2514,17 @@ msgid "route: %s: cannot use a NETWORK a
++ msgstr "route: %s: Netzadresse als Gateway ungültig!\n"
++ 
++ #: ../lib/inet_sr.c:174
++-#, fuzzy
+++#, fuzzy, c-format
++ msgid "route: Invalid MSS/MTU.\n"
++ msgstr "route: Ungültige MSS.\n"
++ 
++ #: ../lib/inet_sr.c:187
+++#, c-format
++ msgid "route: Invalid window.\n"
++ msgstr "route: Ungültige Fenstergröße.\n"
++ 
++ #: ../lib/inet_sr.c:203
+++#, c-format
++ msgid "route: Invalid initial rtt.\n"
++ msgstr "route: Ungültige Start-RTT.\n"
++ 
++@@ -2238,126 +2539,408 @@ msgid "route: bogus netmask %s\n"
++ msgstr "Route: Fehlerhafte Netzmaske %s\n"
++ 
++ #: ../lib/inet_sr.c:270
+++#, c-format
++ msgid "route: netmask doesn't match route address\n"
++ msgstr "route: Netzmaske passt nicht zur Routenadresse\n"
++ 
++ #: ../lib/inet_sr.c:306
+++#, c-format
++ msgid "Flushing `inet' routing table not supported\n"
++-msgstr ",,Flush'' der Inet-Routentabelle nicht unterstützt\n"
+++msgstr "»Flush« der Inet-Routentabelle nicht unterstützt\n"
++ 
++ #: ../lib/inet_sr.c:310
+++#, c-format
++ msgid "Modifying `inet' routing cache not supported\n"
++-msgstr "Änderung des ,,Inet'' Routencaches nicht unterstützt\n"
+++msgstr "Änderung des »Inet« Routencaches nicht unterstützt\n"
++ 
++ #: ../lib/ipx_gr.c:52
+++#, c-format
++ msgid "IPX not configured in this system.\n"
++ msgstr "IPX ist auf diesem System nicht konfiguriert.\n"
++ 
++ #: ../lib/ipx_gr.c:56
+++#, c-format
++ msgid "Kernel IPX routing table\n"
++-msgstr "Kernel IPX Routentabelle\n"
+++msgstr "Kernel-IPX-Routentabelle\n"
++ 
++ #. xxx
++ #: ../lib/ipx_gr.c:57
+++#, c-format
++ msgid "Destination               Router Net                Router Node\n"
++-msgstr "Ziel                      Router Netz               Router Knoten\n"
+++msgstr "Ziel                      Router-Netz               Router-Knoten\n"
++ 
++ #: ../lib/ipx_sr.c:33
+++#, c-format
++ msgid "IPX: this needs to be written\n"
++-msgstr "IPX: dies muß noch geschrieben werden\n"
+++msgstr "IPX: dies muss noch geschrieben werden\n"
++ 
++-#: ../lib/masq_info.c:197
+++#: ../lib/masq_info.c:198
+++#, c-format
++ msgid "IP masquerading entries\n"
++ msgstr "IP-Maskierungseinträge\n"
++ 
++-#: ../lib/masq_info.c:200
+++#: ../lib/masq_info.c:201
+++#, c-format
++ msgid "prot   expire source               destination          ports\n"
++ msgstr "Prot   expire Quelle               Ziel                 Ports\n"
++ 
++-#: ../lib/masq_info.c:203
+++#: ../lib/masq_info.c:204
+++#, c-format
++ msgid ""
++-"prot   expire    initseq delta prevd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
++ msgstr ""
++-"Prot   Ablauf    Anf-Seq Delta Prevd Quelle               Ziel               "
++-"  Ports\n"
+++"Prot   Ablauf    Anf-Seq Delta Prevd Quelle               "
+++"Ziel                 Ports\n"
++ 
++ #: ../lib/netrom_gr.c:48
+++#, c-format
++ msgid "NET/ROM not configured in this system.\n"
++ msgstr "NET/ROM ist auf diesem System nicht verfügbar.\n"
++ 
++ #: ../lib/netrom_gr.c:51
+++#, c-format
++ msgid "Kernel NET/ROM routing table\n"
++-msgstr "Kernel NET/ROM Routentabelle\n"
+++msgstr "Kernel-NET/ROM-Routentabelle\n"
++ 
++ #: ../lib/netrom_gr.c:52
+++#, c-format
++ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
++ msgstr "Ziel         Mnemonic  Qualität  Nachbar  Iface\n"
++ 
++ #: ../lib/netrom_sr.c:34
+++#, c-format
++ msgid "netrom usage\n"
++-msgstr "NET/ROM Benutzung\n"
+++msgstr "NET/ROM-Benutzung\n"
++ 
++ #: ../lib/netrom_sr.c:44
+++#, c-format
++ msgid "NET/ROM: this needs to be written\n"
++-msgstr "NET/ROM: Dies muß noch geschrieben werden\n"
+++msgstr "NET/ROM: Dies muss noch geschrieben werden\n"
++ 
++ #: ../lib/ppp.c:44
+++#, c-format
++ msgid "You cannot start PPP with this program.\n"
++ msgstr "Mit diesem Programm kann PPP nicht gestartet werden.\n"
++ 
++ #: ../lib/ppp_ac.c:38
+++#, c-format
++ msgid "Sorry, use pppd!\n"
++-msgstr "Bitte benutzen sie pppd.\n"
+++msgstr "Bitte benutzen Sie pppd.\n"
++ 
++ #: ../lib/rose.c:87
++ msgid "Node address must be ten digits"
++-msgstr "Knotenadresse muß zehn Ziffern haben"
+++msgstr "Knotenadresse muss zehn Ziffern haben"
++ 
++ #: ../lib/rose_gr.c:51
+++#, c-format
++ msgid "ROSE not configured in this system.\n"
++ msgstr "ROSE ist auf diesem System nicht verfügbar.\n"
++ 
++ #: ../lib/rose_gr.c:54
+++#, c-format
++ msgid "Kernel ROSE routing table\n"
++-msgstr "ROSE Kernel Routentabelle\n"
+++msgstr "ROSE-Kernel-Routentabelle\n"
++ 
++-#: ../lib/tr.c:70 ../lib/tr.c:85
+++#: ../lib/tr.c:86 ../lib/tr.c:101
++ #, c-format
++ msgid "in_tr(%s): invalid token ring address!\n"
++ msgstr "in_tr(%s): ungültige Tokenringadresse!\n"
++ 
++-#: ../lib/tr.c:97
+++#: ../lib/tr.c:113
++ #, c-format
++ msgid "in_tr(%s): trailing : ignored!\n"
++ msgstr "in_tr(%s): nachfolgend : ignoriert!\n"
++ 
++-#: ../lib/tr.c:109
+++#: ../lib/tr.c:125
++ #, c-format
++ msgid "in_tr(%s): trailing junk!\n"
++ msgstr "in_tr(%s): nachfolgender Müll!\n"
++ 
++-#: ../lib/interface.c:124
+++#: ../lib/interface.c:176
++ #, c-format
++ msgid "warning: no inet socket available: %s\n"
++-msgstr "Warnung: Keine INET Sockets verfügbar: %s\n"
+++msgstr "Warnung: Keine INET-Sockets verfügbar: %s\n"
++ 
++-#: ../lib/interface.c:270
+++#: ../lib/interface.c:325
++ #, c-format
++ msgid "Warning: cannot open %s (%s). Limited output.\n"
++ msgstr ""
++ 
++ #. Give better error message for this case.
++-#: ../lib/interface.c:504
+++#: ../lib/interface.c:571
++ msgid "Device not found"
++ msgstr "Gerät nicht gefunden"
++ 
++-#: ../lib/interface.c:508
+++#: ../lib/interface.c:575
++ #, c-format
++ msgid "%s: error fetching interface information: %s\n"
++ msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n"
++ 
++-#: ../lib/sockets.c:59
+++#: ../lib/interface.c:608
+++msgid "     - no statistics available -"
+++msgstr "     - keine Statistiken verfügbar -"
+++
+++#: ../lib/interface.c:612
+++#, c-format
+++msgid "[NO FLAGS]"
+++msgstr "[KEINE FLAGS]"
+++
+++#: ../lib/interface.c:688
+++#, c-format
+++msgid "%-9.9s Link encap:%s  "
+++msgstr "%-9.9s Protokoll:%s  "
+++
+++#: ../lib/interface.c:693
+++#, c-format
+++msgid "HWaddr %s  "
+++msgstr "Hardware Adresse %s  "
+++
+++#: ../lib/interface.c:696
+++#, c-format
+++msgid "Media:%s"
+++msgstr "Medium:%s"
+++
+++#: ../lib/interface.c:698
+++#, c-format
+++msgid "(auto)"
+++msgstr "(auto)"
+++
+++#: ../lib/interface.c:705
+++#, c-format
+++msgid "          %s addr:%s "
+++msgstr "          %s Adresse:%s "
+++
+++#: ../lib/interface.c:708
+++#, c-format
+++msgid " P-t-P:%s "
+++msgstr " P-z-P:%s "
+++
+++#: ../lib/interface.c:711
+++#, c-format
+++msgid " Bcast:%s "
+++msgstr " Bcast:%s "
+++
+++#: ../lib/interface.c:713
+++#, c-format
+++msgid " Mask:%s\n"
+++msgstr " Maske:%s\n"
+++
+++#: ../lib/interface.c:730
+++#, c-format
+++msgid "          inet6 addr: %s/%d"
+++msgstr "          inet6-Adresse: %s/%d"
+++
+++#: ../lib/interface.c:732
+++#, c-format
+++msgid " Scope:"
+++msgstr " Gültigkeitsbereich:"
+++
+++#: ../lib/interface.c:735
+++#, c-format
+++msgid "Global"
+++msgstr "Global"
+++
+++#: ../lib/interface.c:738
+++#, c-format
+++msgid "Link"
+++msgstr "Verbindung"
+++
+++#: ../lib/interface.c:741
+++#, c-format
+++msgid "Site"
+++msgstr "Standort"
+++
+++#: ../lib/interface.c:744
+++#, c-format
+++msgid "Compat"
+++msgstr "Kompatibilität"
+++
+++#: ../lib/interface.c:747
+++#, c-format
+++msgid "Host"
+++msgstr "Maschine"
+++
+++#: ../lib/interface.c:750
+++#, c-format
+++msgid "Unknown"
+++msgstr "Unbekannt"
+++
+++#: ../lib/interface.c:765
+++#, c-format
+++msgid "          IPX/Ethernet II addr:%s\n"
+++msgstr "          IPX/Ethernet II Adresse:%s\n"
+++
+++#: ../lib/interface.c:768
+++#, c-format
+++msgid "          IPX/Ethernet SNAP addr:%s\n"
+++msgstr "          IPX/Ethernet SNAP Adresse:%s\n"
+++
+++#: ../lib/interface.c:771
+++#, c-format
+++msgid "          IPX/Ethernet 802.2 addr:%s\n"
+++msgstr "          IPX/Ethernet 802.2 Adresse:%s\n"
+++
+++#: ../lib/interface.c:774
+++#, c-format
+++msgid "          IPX/Ethernet 802.3 addr:%s\n"
+++msgstr "          IPX/Ethernet 802.3 Adresse:%s\n"
+++
+++#: ../lib/interface.c:784
+++#, c-format
+++msgid "          EtherTalk Phase 2 addr:%s\n"
+++msgstr "          EtherTalk Phase 2 Adresse:%s\n"
+++
+++#: ../lib/interface.c:793
+++#, c-format
+++msgid "          econet addr:%s\n"
+++msgstr "          econet Adresse:%s\n"
+++
+++#: ../lib/interface.c:800
+++#, c-format
+++msgid "[NO FLAGS] "
+++msgstr "[KEINE FLAGS] "
+++
+++#: ../lib/interface.c:802
+++#, c-format
+++msgid "UP "
+++msgstr "UP "
+++
+++#: ../lib/interface.c:804
+++#, c-format
+++msgid "BROADCAST "
+++msgstr "BROADCAST "
+++
+++#: ../lib/interface.c:806
+++#, c-format
+++msgid "DEBUG "
+++msgstr "DEBUG "
+++
+++#: ../lib/interface.c:808
+++#, c-format
+++msgid "LOOPBACK "
+++msgstr "LOOPBACK "
+++
+++#: ../lib/interface.c:810
+++#, c-format
+++msgid "POINTOPOINT "
+++msgstr "PUNKTZUPUNKT "
+++
+++#: ../lib/interface.c:812
+++#, c-format
+++msgid "NOTRAILERS "
+++msgstr "NOTRAILERS "
+++
+++#: ../lib/interface.c:814
+++#, c-format
+++msgid "RUNNING "
+++msgstr "RUNNING "
+++
+++#: ../lib/interface.c:816
+++#, c-format
+++msgid "NOARP "
+++msgstr "NOARP "
+++
+++#: ../lib/interface.c:818
+++#, c-format
+++msgid "PROMISC "
+++msgstr "PROMISC "
+++
+++#: ../lib/interface.c:820
+++#, c-format
+++msgid "ALLMULTI "
+++msgstr "ALLMULTI "
+++
+++#: ../lib/interface.c:822
+++#, c-format
+++msgid "SLAVE "
+++msgstr "SLAVE "
+++
+++#: ../lib/interface.c:824
+++#, c-format
+++msgid "MASTER "
+++msgstr "MASTER "
+++
+++#: ../lib/interface.c:826
+++#, c-format
+++msgid "MULTICAST "
+++msgstr "MULTICAST "
+++
+++#: ../lib/interface.c:829
+++#, c-format
+++msgid "DYNAMIC "
+++msgstr "DYNAMIC "
+++
+++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
+++#: ../lib/interface.c:832
+++#, c-format
+++msgid " MTU:%d  Metric:%d"
+++msgstr " MTU:%d  Metrik:%d"
+++
+++#: ../lib/interface.c:836
+++#, c-format
+++msgid "  Outfill:%d  Keepalive:%d"
+++msgstr "  Outfill:%d  Keepalive:%d"
+++
+++#: ../lib/interface.c:850
+++#, fuzzy, c-format
+++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
+++msgstr "Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n"
+++
+++#: ../lib/interface.c:855
+++#, c-format
+++msgid "             compressed:%lu\n"
+++msgstr "             komprimiert:%lu\n"
+++
+++#: ../lib/interface.c:895
+++#, fuzzy, c-format
+++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgstr "Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n"
+++
+++#: ../lib/interface.c:899
+++#, c-format
+++msgid "          collisions:%lu "
+++msgstr "          Kollisionen:%lu "
+++
+++#: ../lib/interface.c:901
+++#, c-format
+++msgid "compressed:%lu "
+++msgstr "Komprimiert:%lu "
+++
+++#: ../lib/interface.c:903
+++#, c-format
+++msgid "txqueuelen:%d "
+++msgstr "Sendewarteschlangenlänge:%d "
+++
+++#: ../lib/interface.c:905
+++#, c-format
+++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
+++msgstr ""
+++
+++#: ../lib/interface.c:916
+++#, c-format
+++msgid "Interrupt:%d "
+++msgstr "Interrupt:%d "
+++
+++#. Only print devices using it for
+++#. I/O maps
+++#: ../lib/interface.c:919
+++#, c-format
+++msgid "Base address:0x%x "
+++msgstr "Basisadresse:0x%x "
+++
+++#: ../lib/interface.c:921
+++#, c-format
+++msgid "Memory:%lx-%lx "
+++msgstr "Speicher:%lx-%lx "
+++
+++#: ../lib/interface.c:924
+++#, c-format
+++msgid "DMA chan:%x "
+++msgstr "DMA Kanal:%x "
+++
+++#: ../lib/sockets.c:63
+++#, c-format
++ msgid "No usable address families found.\n"
++ msgstr "Keine benutzbaren Adressfamilien gefunden.\n"
++ 
++@@ -2369,41 +2952,44 @@ msgstr "ip: %s ist eine ungültige INET-A
++ #: ../lib/util-ank.c:238
++ #, c-format
++ msgid "ip: %s is invalid inet prefix\n"
++-msgstr "ip: %s ist ein ungültiges INET-Prefix\n"
+++msgstr "ip: %s ist ein ungültiges INET-Präfix\n"
++ 
++ #: ../lib/util-ank.c:248
++ #, c-format
++ msgid "ip: %s is invalid IPv4 address\n"
++-msgstr "ip: %s ist eine ungültige IPv4 Adresse\n"
+++msgstr "ip: %s ist eine ungültige IPv4-Adresse\n"
++ 
++ #: ../lib/util-ank.c:256
++ #, c-format
++ msgid "ip: argument is wrong: %s\n"
++ msgstr "ip: Fehlerhaftes Argument: %s\n"
++ 
++-#: ../ipmaddr.c:56
+++#: ../ipmaddr.c:61
+++#, c-format
++ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
++ msgstr "Benutzung: ipmaddr [ add | del ] MULTIADR dev NAME\n"
++ 
++-#: ../ipmaddr.c:57
+++#: ../ipmaddr.c:62
+++#, c-format
++ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ msgstr "       ipmaddr show [ dev NAME ] [ ipv4 | ipv6 | link | all ]\n"
++ 
++-#: ../ipmaddr.c:58
+++#: ../ipmaddr.c:63
+++#, c-format
++ msgid "       ipmaddr -V | -version\n"
++ msgstr ""
++ 
++-#: ../ipmaddr.c:258
+++#: ../ipmaddr.c:263
++ #, c-format
++ msgid "family %d "
++ msgstr "familie %d "
++ 
++-#: ../ipmaddr.c:267
+++#: ../ipmaddr.c:272
++ #, c-format
++ msgid " users %d"
++ msgstr " Benutzer %d"
++ 
++-#: ../ipmaddr.c:353
+++#: ../ipmaddr.c:358
++ msgid "Cannot create socket"
++ msgstr "Kann Socket nicht öffnen"
++ 
++@@ -2418,13 +3004,14 @@ msgid "slattach: tty_lock: (%s): %s\n"
++ msgstr "slattach: tty_lock: (%s): %s\n"
++ 
++ #: ../slattach.c:192
+++#, c-format
++ msgid "slattach: cannot write PID file\n"
++ msgstr "slattach: Kann PID-Datei nicht schreiben\n"
++ 
++ #: ../slattach.c:202
++ #, c-format
++ msgid "slattach: tty_lock: UUCP user %s unknown!\n"
++-msgstr "slattach: tty_lock: UUCP Benutzer %s unbekannt!\n"
+++msgstr "slattach: tty_lock: UUCP-Benutzer %s unbekannt!\n"
++ 
++ #: ../slattach.c:430
++ #, c-format
++@@ -2436,39 +3023,71 @@ msgstr "slattach: tty_hangup(DROP): %s\n
++ msgid "slattach: tty_hangup(RAISE): %s\n"
++ msgstr "slattach: tty_hangup(RAISE): %s\n"
++ 
++-#: ../slattach.c:486
+++#: ../slattach.c:468
+++#, fuzzy, c-format
+++msgid "slattach: tty name too long\n"
+++msgstr "%s: name zu lang\n"
+++
+++#: ../slattach.c:498
+++#, c-format
++ msgid "slattach: tty_open: cannot get current state!\n"
++ msgstr "slattach: tty_open: kann aktuellen Zustand nicht auslesen!\n"
++ 
++-#: ../slattach.c:493
+++#: ../slattach.c:505
+++#, c-format
++ msgid "slattach: tty_open: cannot get current line disc!\n"
++ msgstr ""
++ "slattach: tty_open: Kann augenblicklichen Leitungszustand nicht auslesen!\n"
++ 
++-#: ../slattach.c:501
+++#: ../slattach.c:513
+++#, c-format
++ msgid "slattach: tty_open: cannot set RAW mode!\n"
++ msgstr "slattach: tty_open: Kann RAW-Modus nicht setzen!\n"
++ 
++-#: ../slattach.c:508
+++#: ../slattach.c:520
++ #, c-format
++ msgid "slattach: tty_open: cannot set %s bps!\n"
++ msgstr "slattach: tty_open: Kann %s bps nicht setzen!\n"
++ 
++-#: ../slattach.c:518
+++#: ../slattach.c:530
+++#, c-format
++ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
++ msgstr "slattach: tty_open: Kann 8N1-Modus nicht setzen!\n"
++ 
++-#: ../slattach.c:686
+++#: ../slattach.c:672
+++#, c-format
+++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
+++msgstr ""
+++
+++#: ../slattach.c:704
++ #, c-format
++ msgid "%s started"
++ msgstr "%s gestartet"
++ 
++-#: ../slattach.c:687
+++#: ../slattach.c:705
++ #, c-format
++ msgid " on %s"
++ msgstr " auf %s"
++ 
++-#: ../slattach.c:688
+++#: ../slattach.c:706
++ #, c-format
++ msgid " interface %s\n"
++ msgstr " Schnittstelle: %s\n"
+++
+++msgid ""
+++"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
+++"<-''-\n"
+++msgstr ""
+++"  arp [-v]   [<HW>] [-i <if>] -s  <Hostname> <hwaddr> [netmask <nm>] pub\n"
+++
+++msgid "%s: unknown interface: %s\n"
+++msgstr "%s: unbekannte Schnittstelle: %s\n"
+++
+++msgid "address mask replies"
+++msgstr "Adressmaskenantworten"
+++
+++msgid "unknown title %s\n"
+++msgstr "Unbekannter Titel %s\n"
+++
+++msgid "Routing table for `ddp' not yet supported.\n"
+++msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n"
++Index: net-tools/po/ja.po
++===================================================================
++--- /dev/null
+++++ net-tools/po/ja.po
++@@ -0,0 +1,3133 @@
+++# Net-tool Japanese locale data
+++# Kenshi Muto <kmuto@debian.org>, 2007.
+++# Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>, 1999.
+++#
+++msgid ""
+++msgstr ""
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
+++"PO-Revision-Date: 2007-07-04 20:47+0900\n"
+++"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
+++"Language-Team: Japanese\n"
+++"MIME-Version: 1.0\n"
+++"Content-Type: text/plain; charset=UTF-8\n"
+++"Content-Transfer-Encoding: 8-bit\n"
+++
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
+++msgid "arp: need host name\n"
+++msgstr "arp: ホスト��必���\n"
+++
+++#: ../arp.c:215 ../arp.c:230
+++#, c-format
+++msgid "No ARP entry for %s\n"
+++msgstr "%s�ARPエントリ��り��ん\n"
+++
+++#: ../arp.c:248
+++#, c-format
+++msgid "arp: cant get HW-Address for `%s': %s.\n"
+++msgstr "arp: '%s'��ードウェアアドレスを�得����ん: %s.\n"
+++
+++#: ../arp.c:252
+++#, c-format
+++msgid "arp: protocol type mismatch.\n"
+++msgstr "arp: プロトコルタイプ������ん.\n"
+++
+++#: ../arp.c:261
+++#, c-format
+++msgid "arp: device `%s' has HW address %s `%s'.\n"
+++msgstr "arp: デ�イス`%s'��ードウェアアドレス%s `%s'��.\n"
+++
+++#: ../arp.c:293
+++#, c-format
+++msgid "arp: need hardware address\n"
+++msgstr "arp: �ードウェアアドレス�必���\n"
+++
+++#: ../arp.c:301
+++#, c-format
+++msgid "arp: invalid hardware address\n"
+++msgstr "arp: �ードウェアアドレス���当��\n"
+++
+++#: ../arp.c:398
+++#, c-format
+++msgid "arp: cannot open etherfile %s !\n"
+++msgstr "arp: etherファイル%s�開���ん!\n"
+++
+++#: ../arp.c:414
+++#, c-format
+++msgid "arp: format error on line %u of etherfile %s !\n"
+++msgstr "arp: %u行(ファイル%s)�フォーマットエラー��り��!\n"
+++
+++#: ../arp.c:427
+++#, c-format
+++msgid "arp: cannot set entry on line %u of etherfile %s !\n"
+++msgstr "arp: etherファイル%u行(%s)�エントリを設定����ん!\n"
+++
+++#: ../arp.c:448
+++#, c-format
+++msgid ""
+++"Address                  HWtype  HWaddress           Flags Mask            "
+++"Iface\n"
+++msgstr "アドレス               HWタイプ  HWアドレス         フラグ マスク インタフェース\n"
+++
+++#: ../arp.c:476
+++msgid "<from_interface>"
+++msgstr "<起点インタフェース>"
+++
+++#: ../arp.c:478
+++msgid "(incomplete)"
+++msgstr "(�完全)"
+++
+++# translatable?
+++#: ../arp.c:495
+++#, c-format
+++msgid "%s (%s) at "
+++msgstr "%s (%s) at "
+++
+++#: ../arp.c:501
+++#, c-format
+++msgid "<incomplete> "
+++msgstr "<�完全> "
+++
+++#: ../arp.c:507
+++#, c-format
+++msgid "netmask %s "
+++msgstr "�ットマスク %s "
+++
+++# translatable?
+++#: ../arp.c:524
+++#, c-format
+++msgid "on %s\n"
+++msgstr "on %s\n"
+++
+++#: ../arp.c:605
+++#, c-format
+++msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
+++msgstr "エントリ: %d\tスキップ: %d\t発見: %d\n"
+++
+++#: ../arp.c:609
+++#, c-format
+++msgid "%s (%s) -- no entry\n"
+++msgstr "%s (%s) -- エントリ��\n"
+++
+++#: ../arp.c:611
+++#, c-format
+++msgid "arp: in %d entries no match found.\n"
+++msgstr "arp: %d�エントリ中, 一致�るも��見��り��ん.\n"
+++
+++#: ../arp.c:626
+++#, c-format
+++msgid ""
+++"Usage:\n"
+++"  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
+++"cache\n"
+++msgstr ""
+++"使用法:\n"
+++"  arp [-vn]  [<HW>] [-i <インタフェース>]\n"
+++"                                [-a] [<ホスト�>]   ‥‥ ARPキャッシュ�表"
+++"示\n"
+++
+++#: ../arp.c:627
+++#, c-format
+++msgid ""
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
+++"entry\n"
+++msgstr "  arp [-v]    [-i <インタフェース>]  -d  <ホスト�> [pub] ‥‥ARPエントリを削除\n"
+++
+++#: ../arp.c:628
+++#, c-format
+++msgid ""
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
+++"file\n"
+++msgstr ""
+++"  arp [-vnD] [<HW>] [-i <インタフェース>] \n"
+++"                              -f  <ファイル�>  ‥‥ファイル�らエントリを追加\n"
+++
+++#: ../arp.c:629
+++#, c-format
+++msgid ""
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
+++"entry\n"
+++msgstr ""
+++"  arp [-v]   [<HW>] [-i <インタフェース>]\n"
+++"             -s <ホスト�> <�ードウェアアドレス> [temp] ‥‥エントリを追加\n"
+++
+++# FIXME:What does '' mean?
+++#: ../arp.c:630
+++#, c-format
+++msgid ""
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
+++"<-''-\n"
+++"\n"
+++msgstr ""
+++"  arp [-v]   [<HW>] [-i <インタフェース>] -Ds <ホスト�>\n"
+++"              <インタフェース> [netmask <�ットマスク>] pub     ‥‥     〃\n"
+++
+++#: ../arp.c:632
+++#, c-format
+++msgid ""
+++"        -a                       display (all) hosts in alternative (BSD) "
+++"style\n"
+++msgstr ""
+++"        -a                 新��(BSD)スタイル�エントリ�れ�全ホストを表示"
+++"�る\n"
+++
+++#: ../arp.c:633
+++#, c-format
+++msgid "        -s, --set                set a new ARP entry\n"
+++msgstr "        -s, --set          新�ARPエントリを設定�る\n"
+++
+++#: ../arp.c:634
+++#, c-format
+++msgid "        -d, --delete             delete a specified entry\n"
+++msgstr "        -d, --delete       指定エントリを削除�る\n"
+++
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
+++msgid "        -v, --verbose            be verbose\n"
+++msgstr "        -v, --verbose            詳細表示を行��\n"
+++
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, c-format
+++msgid "        -n, --numeric            don't resolve names\n"
+++msgstr "        -n, --numeric            ���レゾルブを���\n"
+++
+++#: ../arp.c:637
+++#, c-format
+++msgid ""
+++"        -i, --device             specify network interface (e.g. eth0)\n"
+++msgstr "        -i, --device       �ットワークインタフェース�指定(例 eth0)\n"
+++
+++#: ../arp.c:638
+++#, c-format
+++msgid "        -D, --use-device         read <hwaddr> from given device\n"
+++msgstr ""
+++"        -D, --use-device   与�られ�デ�イス�ら\n"
+++"                                    <HWアドレス>を読�込む\n"
+++
+++#: ../arp.c:639
+++#, c-format
+++msgid "        -A, -p, --protocol       specify protocol family\n"
+++msgstr "        -A, -p, --protocol       プロトコルファミリを指定�る\n"
+++
+++#: ../arp.c:640
+++#, c-format
+++msgid ""
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
+++"\n"
+++msgstr "        -f, --file         /etc/ethersファイル�ら新�エントリを読�込む\n\n"
+++
+++#: ../arp.c:642 ../rarp.c:182
+++#, c-format
+++msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
+++msgstr "  <HW>=�ードウェアアドレスタイプを指定�る��'-H <hw>'を使��下��。標準: %s\n"
+++
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
+++msgid "  List of possible hardware types (which support ARP):\n"
+++msgstr "  (ARPをサ�ート��)指定�能��ードウェアタイプ�リスト:\n"
+++
+++#: ../arp.c:677 ../arp.c:762
+++#, c-format
+++msgid "%s: hardware type not supported!\n"
+++msgstr "%s: �ードウェアタイプ�サ�ート�れ����ん!\n"
+++
+++#: ../arp.c:681
+++#, c-format
+++msgid "%s: address family not supported!\n"
+++msgstr "%s: アドレスファミリ�サ�ート�れ����ん!\n"
+++
+++#: ../arp.c:716
+++#, c-format
+++msgid "arp: -N not yet supported.\n"
+++msgstr "arp: -N���サ�ート�����ん.\n"
+++
+++#: ../arp.c:726
+++#, c-format
+++msgid "arp: %s: unknown address family.\n"
+++msgstr "arp: %s: �明�アドレスファミリ��.\n"
+++
+++#: ../arp.c:735
+++#, c-format
+++msgid "arp: %s: unknown hardware type.\n"
+++msgstr "arp: %s: �明��ードウェアタイプ��.\n"
+++
+++#: ../arp.c:754
+++#, c-format
+++msgid "arp: %s: kernel only supports 'inet'.\n"
+++msgstr "arp: %s: カー�ル�'inet'以外�サ�ート�����ん.\n"
+++
+++#: ../arp.c:767
+++#, c-format
+++msgid "arp: %s: hardware type without ARP support.\n"
+++msgstr "arp: %s: ARPサ�ート����ードウェアタイプ��.\n"
+++
+++#: ../hostname.c:71
+++#, c-format
+++msgid "Setting nodename to `%s'\n"
+++msgstr "ノード�を`%s'�設定����\n"
+++
+++#: ../hostname.c:76
+++#, c-format
+++msgid "%s: you must be root to change the node name\n"
+++msgstr "%s: ノード��変更�ルート���れ��り��ん\n"
+++
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
+++#, c-format
+++msgid "%s: name too long\n"
+++msgstr "%s: ���長����\n"
+++
+++#: ../hostname.c:91
+++#, c-format
+++msgid "Setting hostname to `%s'\n"
+++msgstr "ホスト�を`%s'�設定����\n"
+++
+++#: ../hostname.c:96
+++#, c-format
+++msgid "%s: you must be root to change the host name\n"
+++msgstr "%s: ホスト��変更�ルート���れ��り��ん\n"
+++
+++#: ../hostname.c:109
+++#, c-format
+++msgid "Setting domainname to `%s'\n"
+++msgstr "ドメインを`%s'�設定����\n"
+++
+++#: ../hostname.c:114
+++#, c-format
+++msgid "%s: you must be root to change the domain name\n"
+++msgstr "%s: ドメイン��変更�ルート���れ��り��ん\n"
+++
+++#: ../hostname.c:131
+++#, c-format
+++msgid "Resolving `%s' ...\n"
+++msgstr "`%s'をレゾルブ中 ...\n"
+++
+++#: ../hostname.c:137
+++#, c-format
+++msgid "Result: h_name=`%s'\n"
+++msgstr "�果: h_name=`%s'\n"
+++
+++#: ../hostname.c:142
+++#, c-format
+++msgid "Result: h_aliases=`%s'\n"
+++msgstr "�果: h_aliases=`%s'\n"
+++
+++#: ../hostname.c:147
+++#, c-format
+++msgid "Result: h_addr_list=`%s'\n"
+++msgstr "�果: h_addr_list=`%s'\n"
+++
+++#: ../hostname.c:208
+++#, c-format
+++msgid "%s: can't open `%s'\n"
+++msgstr "%s: `%s'を開���ん\n"
+++
+++#: ../hostname.c:222
+++#, c-format
+++msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
+++msgstr "使用法: hostname   [-v] {ホスト�|-F ファイル}    (ファイル�よる)ホスト��設定\n"
+++
+++#: ../hostname.c:223
+++#, c-format
+++msgid ""
+++"       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
+++msgstr "        domainname [-v] {NISドメイン|-F ファイル} (ファイル�よる)NISドメイン��設定\n"
+++
+++#: ../hostname.c:225
+++#, c-format
+++msgid ""
+++"       nodename [-v] {nodename|-F file}      set DECnet node name (from "
+++"file)\n"
+++msgstr ""
+++"nodename [-v] {ノード�|-F ファイル}  (ファイル�よる)DECnetノード��設定\n"
+++
+++#: ../hostname.c:227
+++#, c-format
+++msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
+++msgstr "        hostname [-v] [-d|-f|-s|-a|-i|-y]     形�を指定��表示\n"
+++
+++#: ../hostname.c:228
+++#, c-format
+++msgid ""
+++"       hostname [-v]                         display hostname\n"
+++"\n"
+++msgstr ""
+++"        hostname [-v]                         ホスト��出力\n"
+++"\n"
+++
+++#: ../hostname.c:229
+++#, c-format
+++msgid ""
+++"       hostname -V|--version|-h|--help       print info and exit\n"
+++"\n"
+++msgstr ""
+++"        hostname -V|--version|-h|--help       諸情報を出力��終了\n"
+++"\n"
+++"\n"
+++
+++#: ../hostname.c:230
+++#, c-format
+++msgid ""
+++"    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
+++"\n"
+++msgstr "    dnsdomainname=ホスト� -d, {yp,nis,}domainname=ホスト� -y\n\n"
+++
+++#: ../hostname.c:231
+++#, c-format
+++msgid "    -s, --short           short host name\n"
+++msgstr "    -s, --short           短縮ホスト�\n"
+++
+++#: ../hostname.c:232
+++#, c-format
+++msgid "    -a, --alias           alias names\n"
+++msgstr "    -a, --alias           エイリアス�\n"
+++
+++#: ../hostname.c:233
+++#, c-format
+++msgid "    -i, --ip-address      addresses for the hostname\n"
+++msgstr "    -i, --ip-address      ホスト��対�るアドレス\n"
+++
+++#: ../hostname.c:234
+++#, c-format
+++msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
+++msgstr "    -f, --fqdn, --long    ロングホスト�(FQDN)\n"
+++
+++#: ../hostname.c:235
+++#, c-format
+++msgid "    -d, --domain          DNS domain name\n"
+++msgstr "    -d, --domain          DNSドメイン�\n"
+++
+++#: ../hostname.c:236
+++#, c-format
+++msgid "    -y, --yp, --nis       NIS/YP domainname\n"
+++msgstr "    -y, --yp, --nis       NIS/YPドメイン�\n"
+++
+++#: ../hostname.c:238
+++#, c-format
+++msgid "    -n, --node            DECnet node name\n"
+++msgstr "    -n, --node            DECnetノード�\n"
+++
+++#: ../hostname.c:240
+++#, c-format
+++msgid ""
+++"    -F, --file            read hostname or NIS domainname from given file\n"
+++"\n"
+++msgstr "    -F, --file            指定�ファイル�らホスト��NISドメイン�を読�込む\n\n"
+++
+++#: ../hostname.c:242
+++#, c-format
+++msgid ""
+++"   This command can read or set the hostname or the NIS domainname. You can\n"
+++"   also read the DNS domain or the FQDN (fully qualified domain name).\n"
+++"   Unless you are using bind or NIS for host lookups you can change the\n"
+++"   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
+++"   part of the FQDN) in the /etc/hosts file.\n"
+++msgstr ""
+++"   ��コマンド���ホスト����NISドメイン�を読�込����設定����。\n"
+++"   DNSドメイン���FDN(完全修飾ドメイン�)を読�込む��も����。\n"
+++"   ホスト���照�Bind�よ�, NISも使���場�, /etc/hostsファイル��る\n"
+++"   FQDNや, (FQDN�一部分�)ドメイン�を変更����.\n"
+++
+++#: ../hostname.c:338
+++#, c-format
+++msgid "%s: You can't change the DNS domain name with this command\n"
+++msgstr "%s: ��コマンド��DNSドメイン��変更����ん.\n"
+++
+++#: ../hostname.c:339
+++#, c-format
+++msgid ""
+++"\n"
+++"Unless you are using bind or NIS for host lookups you can change the DNS\n"
+++msgstr ""
+++"\n"
+++"ホスト���照�Bind�よ�, NISも使���場��/etc/hostsファイル\n"
+++
+++#: ../hostname.c:340
+++#, c-format
+++msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
+++msgstr "��るFQDNや, (FQDN�一部分�)ドメイン�を変更����.\n"
+++
+++#: ../hostname.c:357
+++#, c-format
+++msgid "gethostname()=`%s'\n"
+++msgstr "gethostname()=`%s'\n"
+++
+++#: ../hostname.c:374
+++#, c-format
+++msgid "getdomainname()=`%s'\n"
+++msgstr "getdomainname()=`%s'\n"
+++
+++#: ../hostname.c:389
+++#, c-format
+++msgid "getnodename()=`%s'\n"
+++msgstr "getnodename()=`%s'\n"
+++
+++#: ../ifconfig.c:107
+++#, c-format
+++msgid ""
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Flg\n"
+++msgstr "Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR フラグ\n"
+++
+++#: ../ifconfig.c:129 ../ifconfig.c:161
+++#, c-format
+++msgid "%s: ERROR while getting interface flags: %s\n"
+++msgstr "%s: インタフェースフラグ��得中�エラー�発生����:%s\n"
+++
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
+++#, c-format
+++msgid "No support for INET on this system.\n"
+++msgstr "INET���システム��サ�ート�れ����ん.\n"
+++
+++#: ../ifconfig.c:193
+++#, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr "%s: インタフェースフラグ�テスト中�エラー�発生����: %s\n"
+++
+++#: ../ifconfig.c:202
+++#, c-format
+++msgid ""
+++"Usage:\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++msgstr ""
+++"使用法:\n"
+++"  ifconfig [-a] [-v] [-s] <インタフェース> [[<AF>] <アドレス>]\n"
+++
+++#: ../ifconfig.c:204
+++#, c-format
+++msgid "  [add <address>[/<prefixlen>]]\n"
+++msgstr "  [add <アドレス>[/<プレフィックス長>]]\n"
+++
+++#: ../ifconfig.c:205
+++#, c-format
+++msgid "  [del <address>[/<prefixlen>]]\n"
+++msgstr "   [del <アドレス>[/<プレフィックス長>]]\n"
+++
+++#: ../ifconfig.c:206
+++#, c-format
+++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
+++msgstr "  [[-]broadcast [<アドレス>]]  [[-]pointopoint [<アドレス>]]\n"
+++
+++#: ../ifconfig.c:207
+++#, c-format
+++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
+++msgstr "  [netmask <アドレス>]  [dstaddr <アドレス>]  [tunnel <アドレス>]\n"
+++
+++#: ../ifconfig.c:210
+++#, c-format
+++msgid "  [outfill <NN>] [keepalive <NN>]\n"
+++msgstr "  [outfill <数値>] [keepalive <数値>]\n"
+++
+++#: ../ifconfig.c:212
+++#, c-format
+++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
+++msgstr "  [hw <HW> <アドレス>]  [metric <数値>]  [mtu <数値>]\n"
+++
+++#: ../ifconfig.c:213
+++#, c-format
+++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+++
+++#: ../ifconfig.c:214
+++#, c-format
+++msgid "  [multicast]  [[-]promisc]\n"
+++msgstr "  [multicast]  [[-]promisc]\n"
+++
+++#: ../ifconfig.c:215
+++#, c-format
+++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
+++msgstr "  [mem_start <開始アドレス>] [io_addr <IOアドレス>] [irq <番�>] [media <タイプ>]\n"
+++
+++#: ../ifconfig.c:217
+++#, c-format
+++msgid "  [txqueuelen <NN>]\n"
+++msgstr "   [txqueuelen <TXキュー長>]\n"
+++
+++#: ../ifconfig.c:220
+++#, c-format
+++msgid "  [[-]dynamic]\n"
+++msgstr "  [[-]dynamic]\n"
+++
+++#: ../ifconfig.c:222
+++#, c-format
+++msgid ""
+++"  [up|down] ...\n"
+++"\n"
+++msgstr "  [up|down] ...\n\n"
+++
+++#: ../ifconfig.c:224
+++#, c-format
+++msgid "  <HW>=Hardware Type.\n"
+++msgstr "  <HW>=�ードウェアタイプ.\n"
+++
+++#: ../ifconfig.c:225
+++#, c-format
+++msgid "  List of possible hardware types:\n"
+++msgstr "  利用�能��ードウェアタイプ�リスト:\n"
+++
+++#. 1 = ARPable
+++#: ../ifconfig.c:227
+++#, c-format
+++msgid "  <AF>=Address family. Default: %s\n"
+++msgstr "  <AF>=アドレスファミリ. 標準: %s\n"
+++
+++#: ../ifconfig.c:228
+++#, c-format
+++msgid "  List of possible address families:\n"
+++msgstr "  利用�能�アドレスファミリ�リスト:\n"
+++
+++#: ../ifconfig.c:303
+++#, c-format
+++msgid "ifconfig: option `%s' not recognised.\n"
+++msgstr "ifconfig: オプション`%s'を解釈����ん.\n"
+++
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
+++msgid "ifconfig: `--help' gives usage information.\n"
+++msgstr "ifconfig: `--help'�使用法を見られ��.\n"
+++
+++#: ../ifconfig.c:380
+++#, c-format
+++msgid "Unknown media type.\n"
+++msgstr "�明�メディアタイプ��.\n"
+++
+++#: ../ifconfig.c:417
+++#, c-format
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr "警告: インタフェース%s���promiscモード��...�ら�他�アプリケーション�実行中���り��ん�?\n"
+++
+++#: ../ifconfig.c:429
+++#, c-format
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr "警告: インタフェース%s���MULTICASTモード��.\n"
+++
+++#: ../ifconfig.c:441
+++#, c-format
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
+++msgstr "警告: インタフェース%s���ALLMULTIモード��.\n"
+++
+++#: ../ifconfig.c:465
+++#, c-format
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
+++msgstr "警告: インタフェース%s���DYNAMICモード��.\n"
+++
+++#: ../ifconfig.c:523
+++#, c-format
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
+++msgstr "警告: インタフェース%s���BROADCASTモード��.\n"
+++
+++#: ../ifconfig.c:652
+++#, c-format
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr "警告: インタフェース%s���POINTOPOINTモード��.\n"
+++
+++#: ../ifconfig.c:684
+++#, c-format
+++msgid "hw address type `%s' has no handler to set address. failed.\n"
+++msgstr "�ードウェアアドレスタイプ`%s'�アドレスを設定�る�ンドラを������ん. 失敗����.\n"
+++
+++#: ../ifconfig.c:693
+++#, c-format
+++msgid "%s: invalid %s address.\n"
+++msgstr "%s: ��切�アドレス��(%s).\n"
+++
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
+++#, c-format
+++msgid "No support for INET6 on this system.\n"
+++msgstr "INET6���システム��サ�ート�れ����ん.\n"
+++
+++#: ../ifconfig.c:780 ../ifconfig.c:871
+++#, c-format
+++msgid "Interface %s not initialized\n"
+++msgstr "インタフェース%s��期化�れ����ん.\n"
+++
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, c-format
+++msgid "Bad address.\n"
+++msgstr "��切�アドレス��.\n"
+++
+++#: ../ifconfig.c:885
+++#, c-format
+++msgid "Address deletion not supported on this system.\n"
+++msgstr "アドレス削除���システム��サ�ート�れ����ん.\n"
+++
+++#: ../ifconfig.c:957
+++#, c-format
+++msgid "ifconfig: Cannot set address for this protocol family.\n"
+++msgstr "ifconfig:��プロトコルファミリ�アドレスを設定����ん.\n"
+++
+++#: ../ifconfig.c:983
+++#, c-format
+++msgid "No support for ECONET on this system.\n"
+++msgstr "ECONET���システム��サ�ート�れ����ん.\n"
+++
+++#: ../ifconfig.c:991
+++#, c-format
+++msgid "Don't know how to set addresses for family %d.\n"
+++msgstr "ファミリ%d�アドレス�設定方法��明��.\n"
+++
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr "警告: 少���も1��エラー�発生����. (%d)\n"
+++
+++#: ../netstat.c:434
+++#, c-format
+++msgid ""
+++"(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
+++msgstr "(\"-p\"�情報を読�込���ん���: geteuid()=%d ���ルート��る����.)\n"
+++
+++#: ../netstat.c:438
+++#, c-format
+++msgid ""
+++"(Not all processes could be identified, non-owned process info\n"
+++" will not be shown, you would have to be root to see it all.)\n"
+++msgstr ""
+++"(一部�プロセス�識別�れ���, 所有�����プロセス�情報�\n"
+++"表示�れ��ん。�れら全�を見る��ルート��る必���り��.)\n"
+++
+++# translatable?
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
+++msgid "LISTENING"
+++msgstr "LISTENING"
+++
+++# translatable?
+++#: ../netstat.c:446
+++msgid "CONN SENT"
+++msgstr "CONN SENT"
+++
+++# translatable?
+++#: ../netstat.c:447 ../netstat.c:1268
+++msgid "DISC SENT"
+++msgstr "DISC SENT"
+++
+++# translatable?
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
+++msgid "ESTABLISHED"
+++msgstr "ESTABLISHED"
+++
+++#: ../netstat.c:470
+++#, c-format
+++msgid "Active NET/ROM sockets\n"
+++msgstr "稼�中�NET/ROMソケット\n"
+++
+++#: ../netstat.c:471
+++#, c-format
+++msgid ""
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
+++msgstr "ユーザ     �信先     発信元    デ�イス  状態        Vr/Vs    �信-Q  �信-Q\n"
+++
+++#: ../netstat.c:481 ../netstat.c:1308
+++#, c-format
+++msgid "Problem reading data from %s\n"
+++msgstr "%s�ら�データ�読�込���題\n"
+++
+++# translatable?
+++#: ../netstat.c:516
+++msgid "SYN_SENT"
+++msgstr "SYN_SENT"
+++
+++# translatable?
+++#: ../netstat.c:517
+++msgid "SYN_RECV"
+++msgstr "SYN_RECV"
+++
+++# translatable?
+++#: ../netstat.c:518
+++msgid "FIN_WAIT1"
+++msgstr "FIN_WAIT1"
+++
+++# translatable?
+++#: ../netstat.c:519
+++msgid "FIN_WAIT2"
+++msgstr "FIN_WAIT2"
+++
+++# translatable?
+++#: ../netstat.c:520
+++msgid "TIME_WAIT"
+++msgstr "TIME_WAIT"
+++
+++# translatable?
+++#: ../netstat.c:521
+++msgid "CLOSE"
+++msgstr "CLOSE"
+++
+++# translatable?
+++#: ../netstat.c:522
+++msgid "CLOSE_WAIT"
+++msgstr "CLOSE_WAIT"
+++
+++# translatable?
+++#: ../netstat.c:523
+++msgid "LAST_ACK"
+++msgstr "LAST_ACK"
+++
+++# translatable?
+++#: ../netstat.c:524
+++msgid "LISTEN"
+++msgstr "LISTEN"
+++
+++# translatable?
+++#: ../netstat.c:525
+++msgid "CLOSING"
+++msgstr "CLOSING"
+++
+++#: ../netstat.c:596
+++#, c-format
+++msgid "warning, got bogus igmp6 line %d.\n"
+++msgstr "警告, ��igmp6ライン%dを得���.\n"
+++
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
+++#, c-format
+++msgid "netstat: unsupported address family %d !\n"
+++msgstr "netstat: サ�ート����アドレスファミリ%d��!\n"
+++
+++# c-format
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
+++#, c-format
+++msgid "warning, got bogus igmp line %d.\n"
+++msgstr "警告, ��igmpライン%dを得���.\n"
+++
+++#: ../netstat.c:677
+++#, c-format
+++msgid "Active X.25 sockets\n"
+++msgstr "稼�中�X.25ソケット\n"
+++
+++#. IMHO, Vr/Vs is not very usefull --SF
+++#: ../netstat.c:679
+++#, c-format
+++msgid ""
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
+++msgstr "�信先       発信元        デ�イス  LCI  状態         Vr/Vs  �信-Q  �信-Q\n"
+++
+++#: ../netstat.c:759
+++#, c-format
+++msgid "warning, got bogus tcp line.\n"
+++msgstr "警告, ��TCPラインを得���.\n"
+++
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
+++#, c-format
+++msgid "off (0.00/%ld/%d)"
+++msgstr "オフ (0.00/%ld/%d)"
+++
+++#: ../netstat.c:804
+++#, c-format
+++msgid "on (%2.2f/%ld/%d)"
+++msgstr "オン (%2.2f/%ld/%d)"
+++
+++#: ../netstat.c:809
+++#, c-format
+++msgid "keepalive (%2.2f/%ld/%d)"
+++msgstr "キープアライブ (%2.2f/%ld/%d)"
+++
+++#: ../netstat.c:814
+++#, c-format
+++msgid "timewait (%2.2f/%ld/%d)"
+++msgstr "時間待� (%2.2f/%ld/%d)"
+++
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
+++#, c-format
+++msgid "unkn-%d (%2.2f/%ld/%d)"
+++msgstr "�明-%d (%2.2f/%ld/%d)"
+++
+++#: ../netstat.c:894
+++#, c-format
+++msgid "warning, got bogus udp line.\n"
+++msgstr "警告, ��UDPラインを得���.\n"
+++
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
+++msgid "UNKNOWN"
+++msgstr "�明"
+++
+++#: ../netstat.c:958 ../netstat.c:1080
+++#, c-format
+++msgid "on%d (%2.2f/%ld/%d)"
+++msgstr "オン%d (%2.2f/%ld/%d)"
+++
+++#: ../netstat.c:1046
+++#, c-format
+++msgid "warning, got bogus raw line.\n"
+++msgstr "警告, ��Rawラインを得���.\n"
+++
+++#: ../netstat.c:1128
+++#, c-format
+++msgid "warning, got bogus unix line.\n"
+++msgstr "警告, ��unixラインを得���.\n"
+++
+++# translatable?
+++#: ../netstat.c:1155
+++msgid "STREAM"
+++msgstr "STREAM"
+++
+++# translatable?
+++#: ../netstat.c:1159
+++msgid "DGRAM"
+++msgstr "DGRAM"
+++
+++# translatable?
+++#: ../netstat.c:1163
+++msgid "RAW"
+++msgstr "RAW"
+++
+++# translatable?
+++#: ../netstat.c:1167
+++msgid "RDM"
+++msgstr "RDM"
+++
+++# translatable?
+++#: ../netstat.c:1171
+++msgid "SEQPACKET"
+++msgstr "SEQPACKET"
+++
+++# translatable?
+++#: ../netstat.c:1180
+++msgid "FREE"
+++msgstr "FREE"
+++
+++# translatable?
+++#: ../netstat.c:1196
+++msgid "CONNECTING"
+++msgstr "CONNECTING"
+++
+++# translatable?
+++#: ../netstat.c:1200
+++msgid "CONNECTED"
+++msgstr "CONNECTED"
+++
+++# translatable?
+++#: ../netstat.c:1204
+++msgid "DISCONNECTING"
+++msgstr "DISCONNECTING"
+++
+++#: ../netstat.c:1235
+++#, c-format
+++msgid "Active UNIX domain sockets "
+++msgstr "稼�中�UNIXドメインソケット "
+++
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
+++msgid "(servers and established)"
+++msgstr "(サー��確立)"
+++
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
+++msgid "(only servers)"
+++msgstr "(サー���)"
+++
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
+++msgid "(w/o servers)"
+++msgstr "(w/oサー�)"
+++
+++#: ../netstat.c:1245
+++#, c-format
+++msgid ""
+++"\n"
+++"Proto RefCnt Flags       Type       State         I-Node"
+++msgstr ""
+++"\n"
+++"Proto RefCnt フラグ      タイプ     状態         Iノード"
+++
+++#: ../netstat.c:1247
+++#, c-format
+++msgid " Path\n"
+++msgstr " パス\n"
+++
+++# translatable?
+++#: ../netstat.c:1267
+++msgid "SABM SENT"
+++msgstr "SABM SENT"
+++
+++# translatable?
+++#: ../netstat.c:1270
+++msgid "RECOVERY"
+++msgstr "RECOVERY"
+++
+++#: ../netstat.c:1284
+++#, c-format
+++msgid "Active AX.25 sockets\n"
+++msgstr "稼�中�AX.25ソケット\n"
+++
+++#: ../netstat.c:1285
+++#, c-format
+++msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
+++msgstr "�信先     発信元     デ�イス 状態        Vr/Vs    �信-Q  �信-Q\n"
+++
+++#: ../netstat.c:1328
+++#, c-format
+++msgid "problem reading data from %s\n"
+++msgstr "%s�ら�データ読�込�中��題\n"
+++
+++#: ../netstat.c:1379
+++#, c-format
+++msgid ""
+++"Active IPX sockets\n"
+++"Proto Recv-Q Send-Q Local Address              Foreign Address            "
+++"State"
+++msgstr ""
+++"稼�中�IPXソケット\n"
+++"Proto �信-Q �信-Q 内部アドレス               外部アドレス               状"
+++"æ…‹"
+++
+++#: ../netstat.c:1381
+++#, c-format
+++msgid " User"
+++msgstr " ユーザ"
+++
+++# translatable?
+++#: ../netstat.c:1415
+++msgid "ESTAB"
+++msgstr "ESTAB"
+++
+++# translatable?
+++#: ../netstat.c:1423
+++msgid "UNK."
+++msgstr "UNK."
+++
+++#: ../netstat.c:1461
+++#, c-format
+++msgid "Kernel Interface table\n"
+++msgstr "カー�ルインタフェーステーブル\n"
+++
+++#: ../netstat.c:1465
+++#, c-format
+++msgid ""
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Flg\n"
+++msgstr "Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR フラグ\n"
+++
+++#: ../netstat.c:1469
+++msgid "missing interface information"
+++msgstr "インタフェース情報�足り��ん"
+++
+++#: ../netstat.c:1492
+++#, c-format
+++msgid ""
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
+++msgstr ""
+++"使用法: netstat [-veenNcCF] [<アドレスファミリ>] -r\n"
+++"        netstat {-V|--version|-h|--help}\n"
+++
+++#: ../netstat.c:1493
+++#, c-format
+++msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
+++msgstr "        netstat [-vnNcaeol] [<ソケット> ...]\n"
+++
+++#: ../netstat.c:1494
+++#, c-format
+++msgid ""
+++"       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
+++"\n"
+++msgstr "        netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n"
+++
+++#: ../netstat.c:1496
+++#, c-format
+++msgid "        -r, --route              display routing table\n"
+++msgstr "        -r, --routing            経路テーブル�表示\n"
+++
+++#: ../netstat.c:1497
+++#, c-format
+++msgid "        -i, --interfaces         display interface table\n"
+++msgstr "        -i, --interfaces         インタフェーステーブル�表示\n"
+++
+++#: ../netstat.c:1498
+++#, c-format
+++msgid "        -g, --groups             display multicast group memberships\n"
+++msgstr "        -g, --groups             マル�キャスト・グループメン�シップ�表示\n"
+++
+++#: ../netstat.c:1499
+++#, c-format
+++msgid ""
+++"        -s, --statistics         display networking statistics (like SNMP)\n"
+++msgstr ""
+++"        -s, --statistics         (SNMP�よ��)�ットワーク統計を表示\n"
+++
+++#: ../netstat.c:1501
+++#, c-format
+++msgid ""
+++"        -M, --masquerade         display masqueraded connections\n"
+++"\n"
+++msgstr ""
+++"        -M, --masquerade         マスカレード接続�表示\n"
+++"\n"
+++
+++#: ../netstat.c:1505
+++#, c-format
+++msgid "        --numeric-hosts          don't resolve host names\n"
+++msgstr "        --numeric-hosts          ホスト�をレゾルブ���\n"
+++
+++#: ../netstat.c:1506
+++#, c-format
+++msgid "        --numeric-ports          don't resolve port names\n"
+++msgstr "        --numeric-ports          �ート�をレゾルブ���\n"
+++
+++#: ../netstat.c:1507
+++#, c-format
+++msgid "        --numeric-users          don't resolve user names\n"
+++msgstr "        --numeric-users          ユーザ�をレゾルブ���\n"
+++
+++#: ../netstat.c:1508
+++#, c-format
+++msgid "        -N, --symbolic           resolve hardware names\n"
+++msgstr "        -N, --symbolic           �ードウェア�をレゾルブ�る\n"
+++
+++#: ../netstat.c:1509 ../route.c:88
+++#, c-format
+++msgid "        -e, --extend             display other/more information\n"
+++msgstr "        -e, --extend             他�情報や多��情報を表示�る\n"
+++
+++#: ../netstat.c:1510
+++#, c-format
+++msgid "        -p, --programs           display PID/Program name for sockets\n"
+++msgstr "        -p, --programs           ソケット�PID/プログラム�を表示�る\n"
+++
+++#: ../netstat.c:1511
+++#, c-format
+++msgid ""
+++"        -c, --continuous         continuous listing\n"
+++"\n"
+++msgstr ""
+++"        -c, --continous          継続的�表示\n"
+++"\n"
+++
+++#: ../netstat.c:1512
+++#, c-format
+++msgid "        -l, --listening          display listening server sockets\n"
+++msgstr "        -l, --listening          サー��listenソケット�表示\n"
+++
+++#: ../netstat.c:1513
+++#, c-format
+++msgid ""
+++"        -a, --all, --listening   display all sockets (default: connected)\n"
+++msgstr "        -a, --all, --listening   全��情報を表示 (標準: connected)\n"
+++
+++#: ../netstat.c:1514
+++#, c-format
+++msgid "        -o, --timers             display timers\n"
+++msgstr "        -o, --timers             タイマ�表示\n"
+++
+++#: ../netstat.c:1515 ../route.c:89
+++#, c-format
+++msgid ""
+++"        -F, --fib                display Forwarding Information Base "
+++"(default)\n"
+++msgstr "        -F, --fib                フォワード情報ベースを表示�る(標準)\n"
+++
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
+++msgid ""
+++"        -C, --cache              display routing cache instead of FIB\n"
+++"\n"
+++msgstr "        -C, --cache              FIB���り�経路キャッシュを表示�る\n\n"
+++
+++#: ../netstat.c:1518
+++#, c-format
+++msgid ""
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
+++msgstr ""
+++"  <ソケット>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
+++
+++#: ../netstat.c:1519
+++#, c-format
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "  <AF>='-6|-4'���'-A <af>'���'--<af>'を利用; 標準: %s\n"
+++
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
+++msgid "  List of possible address families (which support routing):\n"
+++msgstr "  (ルーティングをサ�ート��)利用�能�アドレスファミリ�リスト:\n"
+++
+++#: ../netstat.c:1753
+++#, c-format
+++msgid "Active Internet connections "
+++msgstr "稼�中�インター�ット接続 "
+++
+++#: ../netstat.c:1763
+++#, c-format
+++msgid ""
+++"\n"
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
+++msgstr ""
+++"\n"
+++"Proto �信-Q �信-Q 内部アドレス            外部アドレス            状"
+++"æ…‹       "
+++
+++#: ../netstat.c:1765
+++#, c-format
+++msgid " User       Inode     "
+++msgstr " ユーザ    Iノード    "
+++
+++#: ../netstat.c:1768
+++#, c-format
+++msgid " Timer"
+++msgstr "タイマ"
+++
+++#: ../netstat.c:1798
+++#, c-format
+++msgid "IPv4 Group Memberships\n"
+++msgstr "IPv4グループメン�シップ\n"
+++
+++#: ../netstat.c:1799
+++#, c-format
+++msgid "Interface       RefCnt Group\n"
+++msgstr "インタフェース �照Cnt グループ\n"
+++
+++#: ../rarp.c:44
+++msgid "This kernel does not support RARP.\n"
+++msgstr "��カー�ル�RARPをサ�ート�����ん.\n"
+++
+++#: ../rarp.c:83
+++#, c-format
+++msgid "no RARP entry for %s.\n"
+++msgstr "%s�RARPエントリ��り��ん.\n"
+++
+++#: ../rarp.c:96
+++#, c-format
+++msgid "%s: bad hardware address\n"
+++msgstr "%s: �正��ードウェアアドレス��\n"
+++
+++#: ../rarp.c:128
+++#, c-format
+++msgid "rarp: cannot open file %s:%s.\n"
+++msgstr "rarp: ファイル%sを開���ん:%s.\n"
+++
+++#: ../rarp.c:140
+++#, c-format
+++msgid "rarp: format error at %s:%u\n"
+++msgstr "rarp: %s:%u行�フォーマットエラー��り��\n"
+++
+++#: ../rarp.c:144 ../rarp.c:289
+++#, c-format
+++msgid "rarp: %s: unknown host\n"
+++msgstr "rarp: %s: �明�ホスト��\n"
+++
+++#: ../rarp.c:147
+++#, c-format
+++msgid "rarp: cannot set entry from %s:%u\n"
+++msgstr "rarp: %s:%u行�らエントリを設定����ん\n"
+++
+++#: ../rarp.c:176
+++#, c-format
+++msgid "Usage: rarp -a                               list entries in cache.\n"
+++msgstr ""
+++"使用法: rarp -a                              キャッシュエントリ�表示.\n"
+++
+++#: ../rarp.c:177
+++#, c-format
+++msgid "       rarp -d <hostname>                    delete entry from cache.\n"
+++msgstr ""
+++"       rarp -d <ホスト�>                    キャッシュ�らエントリを削除�"
+++"ã‚‹.\n"
+++
+++#: ../rarp.c:178
+++#, c-format
+++msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
+++msgstr ""
+++"       rarp [<HW>] -s <ホスト�> <�ードウェアアドレス>\n"
+++"                                             キャッシュ�エントリを追加.\n"
+++
+++#: ../rarp.c:179
+++#, c-format
+++msgid ""
+++"       rarp -f                               add entries from /etc/ethers.\n"
+++msgstr ""
+++"       rarp -f                               /etc/ethers�らエントリ追加.\n"
+++
+++#: ../rarp.c:180
+++#, c-format
+++msgid ""
+++"       rarp -V                               display program version.\n"
+++"\n"
+++msgstr "       rarp -V                               �ージョン情報�出力.\n"
+++
+++#: ../rarp.c:238
+++#, c-format
+++msgid "%s: illegal option mix.\n"
+++msgstr "%s: オプション�組���間������.\n"
+++
+++#: ../rarp.c:269
+++#, c-format
+++msgid "rarp: %s: unknown hardware type.\n"
+++msgstr "rarp: %s: �ードウェアタイプ��明��.\n"
+++
+++#: ../route.c:80
+++#, c-format
+++msgid ""
+++"Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
+++msgstr "使用法:route [-nNvee] [-FC] [アドレスファミリ]  カー�ル経路テーブル�表示.\n"
+++
+++#: ../route.c:81
+++#, c-format
+++msgid ""
+++"       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
+++"\n"
+++msgstr ""
+++"       route [-v] [-FC] {add|del|flush}‥‥\n"
+++"\t\t\t\t   アドレスファミリ�経路テーブル�設定.\n"
+++"\n"
+++
+++#: ../route.c:83
+++#, c-format
+++msgid ""
+++"       route {-h|--help} [<AF>]              Detailed usage syntax for "
+++"specified AF.\n"
+++msgstr ""
+++"       route {-h|--help} [アドレスファミリ]\n"
+++"                                     アドレスファミリ特定�文法�説明.\n"
+++
+++#: ../route.c:84
+++#, c-format
+++msgid ""
+++"       route {-V|--version}                  Display version/author and "
+++"exit.\n"
+++"\n"
+++msgstr "       route {-V|--version}          �ージョン/作者情報�出力�終了.\n\n"
+++
+++#: ../route.c:92
+++#, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "  <AF>='-A <af>'���'--<af>'を利用; 標準: %s\n"
+++
+++#: ../plipconfig.c:66
+++#, c-format
+++msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
+++msgstr "使用法: plipconfig [-a] [-i] [-v] インタフェース\n"
+++
+++#: ../plipconfig.c:67
+++#, c-format
+++msgid "                  [nibble NN] [trigger NN]\n"
+++msgstr "                  [nibble 数値] [trigger 数値]\n"
+++
+++#: ../plipconfig.c:68
+++#, c-format
+++msgid "       plipconfig -V | --version\n"
+++msgstr "       plipconfig -V | --version\n"
+++
+++# translatable?
+++#: ../plipconfig.c:74
+++#, c-format
+++msgid "%s\tnibble %lu  trigger %lu\n"
+++msgstr "%s\tnibble %lu  trigger %lu\n"
+++
+++#: ../iptunnel.c:85
+++#, c-format
+++msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
+++msgstr "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
+++
+++#: ../iptunnel.c:86
+++#, c-format
+++msgid ""
+++"          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
+++msgstr "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
+++
+++#: ../iptunnel.c:87
+++#, c-format
+++msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
+++msgstr "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
+++
+++#: ../iptunnel.c:88
+++#, c-format
+++msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
+++msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
+++
+++#: ../iptunnel.c:89
+++#, c-format
+++msgid ""
+++"       iptunnel -V | --version\n"
+++"\n"
+++msgstr "       iptunnel -V | --version\n\n"
+++
+++#: ../iptunnel.c:90
+++#, c-format
+++msgid "Where: NAME := STRING\n"
+++msgstr "�味: NAME := STRING\n"
+++
+++#: ../iptunnel.c:91
+++#, c-format
+++msgid "       ADDR := { IP_ADDRESS | any }\n"
+++msgstr "       ADDR := { IP_ADDRESS | any }\n"
+++
+++#: ../iptunnel.c:92
+++#, c-format
+++msgid "       TOS  := { NUMBER | inherit }\n"
+++msgstr "       TOS  := { NUMBER | inherit }\n"
+++
+++#: ../iptunnel.c:93
+++#, c-format
+++msgid "       TTL  := { 1..255 | inherit }\n"
+++msgstr "       TTL  := { 1..255 | inherit }\n"
+++
+++#: ../iptunnel.c:94
+++#, c-format
+++msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
+++msgstr "       KEY  := { DOTTED_QUAD | NUMBER }\n"
+++
+++#: ../iptunnel.c:332
+++#, c-format
+++msgid "Keys are not allowed with ipip and sit.\n"
+++msgstr "キー�ipip�よ�sit��許��れ��ん.\n"
+++
+++#: ../iptunnel.c:352
+++#, c-format
+++msgid "Broadcast tunnel requires a source address.\n"
+++msgstr "ブロードキャストトン�ル�発信元アドレス�必���.\n"
+++
+++#: ../iptunnel.c:367
+++#, c-format
+++msgid "ttl != 0 and noptmudisc are incompatible\n"
+++msgstr "ttl != 0�よ�noptmudisc�矛盾���\n"
+++
+++#: ../iptunnel.c:379
+++#, c-format
+++msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
+++msgstr "トン�ルモードを決定����ん(ipip, gre���sit)\n"
+++
+++#: ../iptunnel.c:417
+++#, c-format
+++msgid "%s: %s/ip  remote %s  local %s "
+++msgstr "%s: %s/ip  リモート%s  ローカル%s "
+++
+++#: ../iptunnel.c:421
+++msgid "unknown"
+++msgstr "�明"
+++
+++# FIXME: what does it mean?
+++#: ../iptunnel.c:453
+++#, c-format
+++msgid "  Drop packets out of sequence.\n"
+++msgstr "  シーケンス�ら外れ�パケットをドロップ.\n"
+++
+++#: ../iptunnel.c:455
+++#, c-format
+++msgid "  Checksum in received packet is required.\n"
+++msgstr "  �信パケット��ェックサム�必須��.\n"
+++
+++# FIXME: what does it mean?
+++#: ../iptunnel.c:457
+++#, c-format
+++msgid "  Sequence packets on output.\n"
+++msgstr "  �信�シーケンスパケット.\n"
+++
+++# FIXME: what does it mean?
+++#: ../iptunnel.c:459
+++#, c-format
+++msgid "  Checksum output packets.\n"
+++msgstr "  �信パケット��ェックサム.\n"
+++
+++#: ../iptunnel.c:487
+++#, c-format
+++msgid "Wrong format of /proc/net/dev. Sorry.\n"
+++msgstr "/proc/net/dev��正�フォーマット��. ����ん.\n"
+++
+++#: ../iptunnel.c:500
+++#, c-format
+++msgid "Failed to get type of [%s]\n"
+++msgstr "[%s]�タイプ��得�失敗\n"
+++
+++#: ../iptunnel.c:516
+++#, c-format
+++msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
+++msgstr "RX: パケット   �イト      エラー  CsumErrs outOfSeq マル�キャスト\n"
+++
+++#: ../iptunnel.c:519
+++#, c-format
+++msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
+++msgstr "TX: パケット   �イト       エラー DeadLoop NoRoute  �ッファ��\n"
+++
+++#: ../statistics.c:47
+++msgid "ICMP input histogram:"
+++msgstr "ICMP入力ヒストグラム:"
+++
+++#: ../statistics.c:48
+++msgid "ICMP output histogram:"
+++msgstr "ICMP出力ヒストグラム:"
+++
+++#: ../statistics.c:65
+++#, c-format
+++msgid "Forwarding is %s"
+++msgstr "フォワード�%s��"
+++
+++#: ../statistics.c:66
+++#, c-format
+++msgid "Default TTL is %u"
+++msgstr "標準TTL�%u��"
+++
+++#: ../statistics.c:67
+++#, c-format
+++msgid "%u total packets received"
+++msgstr "�計%uパケットを�信"
+++
+++#: ../statistics.c:68
+++#, c-format
+++msgid "%u with invalid headers"
+++msgstr "��当�ヘッダ�%u"
+++
+++#: ../statistics.c:69
+++#, c-format
+++msgid "%u with invalid addresses"
+++msgstr "��当�アドレス�%u"
+++
+++#: ../statistics.c:70
+++#, c-format
+++msgid "%u forwarded"
+++msgstr "%u�転�"
+++
+++#: ../statistics.c:71
+++#, c-format
+++msgid "%u with unknown protocol"
+++msgstr "%u��明�プロトコル"
+++
+++#: ../statistics.c:72
+++#, c-format
+++msgid "%u incoming packets discarded"
+++msgstr "%u��信パケットを破棄"
+++
+++#: ../statistics.c:73
+++#, c-format
+++msgid "%u incoming packets delivered"
+++msgstr "%u��信パケットを��"
+++
+++#: ../statistics.c:74
+++#, c-format
+++msgid "%u requests sent out"
+++msgstr "%u��求を�信"
+++
+++#. ?
+++#: ../statistics.c:75
+++#, c-format
+++msgid "%u outgoing packets dropped"
+++msgstr "%u��信パケットをドロップ"
+++
+++#: ../statistics.c:76
+++#, c-format
+++msgid "%u dropped because of missing route"
+++msgstr "�明�経路�%uをドロップ"
+++
+++#: ../statistics.c:77
+++#, c-format
+++msgid "%u fragments dropped after timeout"
+++msgstr "タイムアウト後�%u�フラグメントをドロップ"
+++
+++#: ../statistics.c:78
+++#, c-format
+++msgid "%u reassemblies required"
+++msgstr "%u��構築�必�"
+++
+++#. ?
+++#: ../statistics.c:79
+++#, c-format
+++msgid "%u packets reassembled ok"
+++msgstr "%uパケット��構築��功"
+++
+++#: ../statistics.c:80
+++#, c-format
+++msgid "%u packet reassembles failed"
+++msgstr "%uパケット��構築�失敗"
+++
+++#: ../statistics.c:81
+++#, c-format
+++msgid "%u fragments received ok"
+++msgstr "%uフラグメント��信��功"
+++
+++#: ../statistics.c:82
+++#, c-format
+++msgid "%u fragments failed"
+++msgstr "%uフラグメント�失敗"
+++
+++#: ../statistics.c:83
+++#, c-format
+++msgid "%u fragments created"
+++msgstr "%uフラグメントを生�"
+++
+++#: ../statistics.c:88
+++#, c-format
+++msgid "%u ICMP messages received"
+++msgstr "%u�ICMPメッセージ�信"
+++
+++#: ../statistics.c:89
+++#, c-format
+++msgid "%u input ICMP message failed."
+++msgstr "%u�ICMPメッセージ入力失敗."
+++
+++#: ../statistics.c:90 ../statistics.c:103
+++#, c-format
+++msgid "destination unreachable: %u"
+++msgstr "�信先到���: %u"
+++
+++#: ../statistics.c:91
+++#, c-format
+++msgid "timeout in transit: %u"
+++msgstr "�信時間オー�: %u"
+++
+++#: ../statistics.c:92 ../statistics.c:105
+++#, c-format
+++msgid "wrong parameters: %u"
+++msgstr "���パラメータ: %u"
+++
+++#. ?
+++#: ../statistics.c:93
+++#, c-format
+++msgid "source quenches: %u"
+++msgstr "発信元消滅: %u"
+++
+++#: ../statistics.c:94
+++#, c-format
+++msgid "redirects: %u"
+++msgstr "リダイレクト: %u"
+++
+++#: ../statistics.c:95
+++#, c-format
+++msgid "echo requests: %u"
+++msgstr "エコー�求: %u"
+++
+++#: ../statistics.c:96 ../statistics.c:109
+++#, c-format
+++msgid "echo replies: %u"
+++msgstr "エコー応答: %u"
+++
+++#: ../statistics.c:97
+++#, c-format
+++msgid "timestamp request: %u"
+++msgstr "タイムスタンプ�求: %u"
+++
+++#: ../statistics.c:98
+++#, c-format
+++msgid "timestamp reply: %u"
+++msgstr "タイムスタンプ応答: %u"
+++
+++#: ../statistics.c:99
+++#, c-format
+++msgid "address mask request: %u"
+++msgstr "アドレスマスク�求: %u"
+++
+++#. ?
+++#: ../statistics.c:100 ../statistics.c:113
+++#, c-format
+++msgid "address mask replies: %u"
+++msgstr "アドレスマスク応答: %u"
+++
+++#. ?
+++#: ../statistics.c:101
+++#, c-format
+++msgid "%u ICMP messages sent"
+++msgstr "%u�ICMPメッセージ�信"
+++
+++#: ../statistics.c:102
+++#, c-format
+++msgid "%u ICMP messages failed"
+++msgstr "%u�ICMPメッセージ失敗"
+++
+++#: ../statistics.c:104
+++#, c-format
+++msgid "time exceeded: %u"
+++msgstr "時間切れ: %u"
+++
+++#. ?
+++#: ../statistics.c:106
+++#, c-format
+++msgid "source quench: %u"
+++msgstr "発信元消滅: %u"
+++
+++#: ../statistics.c:107
+++#, c-format
+++msgid "redirect: %u"
+++msgstr "リダイレクト: %u"
+++
+++#: ../statistics.c:108
+++#, c-format
+++msgid "echo request: %u"
+++msgstr "エコー�求: %u"
+++
+++#: ../statistics.c:110
+++#, c-format
+++msgid "timestamp requests: %u"
+++msgstr "タイムスタンプ�求: %u"
+++
+++#: ../statistics.c:111
+++#, c-format
+++msgid "timestamp replies: %u"
+++msgstr "タイムスタンプ応答: %u"
+++
+++#: ../statistics.c:112
+++#, c-format
+++msgid "address mask requests: %u"
+++msgstr "アドレスマスク�求: %u"
+++
+++#: ../statistics.c:118
+++#, c-format
+++msgid "RTO algorithm is %s"
+++msgstr "RTOアルゴリズム�%s��"
+++
+++#: ../statistics.c:122
+++#, c-format
+++msgid "%u active connections openings"
+++msgstr "%u�能動接続開始"
+++
+++#: ../statistics.c:123
+++#, c-format
+++msgid "%u passive connection openings"
+++msgstr "%u��動接続開始"
+++
+++#: ../statistics.c:124
+++#, c-format
+++msgid "%u failed connection attempts"
+++msgstr "%u�接続試行失敗"
+++
+++#: ../statistics.c:125
+++#, c-format
+++msgid "%u connection resets received"
+++msgstr "%u�接続リセット�信"
+++
+++#: ../statistics.c:126
+++#, c-format
+++msgid "%u connections established"
+++msgstr "%u�接続確立"
+++
+++#: ../statistics.c:127
+++#, c-format
+++msgid "%u segments received"
+++msgstr "%uセグメント��信"
+++
+++#: ../statistics.c:128
+++#, c-format
+++msgid "%u segments send out"
+++msgstr "%uセグメント��信"
+++
+++#: ../statistics.c:129
+++#, c-format
+++msgid "%u segments retransmited"
+++msgstr "%uセグメント��転�"
+++
+++#: ../statistics.c:130
+++#, c-format
+++msgid "%u bad segments received."
+++msgstr "%u��正セグメント�信."
+++
+++#: ../statistics.c:131
+++#, c-format
+++msgid "%u resets sent"
+++msgstr "%u�リセット�信"
+++
+++#: ../statistics.c:136
+++#, c-format
+++msgid "%u packets received"
+++msgstr "%uパケット�信"
+++
+++#: ../statistics.c:137
+++#, c-format
+++msgid "%u packets to unknown port received."
+++msgstr "�明��ート�ら�%uパケット��信."
+++
+++#: ../statistics.c:138
+++#, c-format
+++msgid "%u packet receive errors"
+++msgstr "%u�パケット�信エラー"
+++
+++#: ../statistics.c:139
+++#, c-format
+++msgid "%u packets sent"
+++msgstr "%u�パケットを�信"
+++
+++#: ../statistics.c:144
+++#, c-format
+++msgid "%u SYN cookies sent"
+++msgstr "%u�SYNクッキーを�信"
+++
+++#: ../statistics.c:145
+++#, c-format
+++msgid "%u SYN cookies received"
+++msgstr "%u�SYNクッキーを�信"
+++
+++#: ../statistics.c:146
+++#, c-format
+++msgid "%u invalid SYN cookies received"
+++msgstr "%u���当�SYNクッキーを�信"
+++
+++#: ../statistics.c:148
+++#, c-format
+++msgid "%u resets received for embryonic SYN_RECV sockets"
+++msgstr "%u�未完��SYN_RECVソケット�対�るリセットを�信"
+++
+++#: ../statistics.c:150
+++#, c-format
+++msgid "%u packets pruned from receive queue because of socket buffer overrun"
+++msgstr "%u�パケットをソケット�ッファオー�ラン����信キュー�ら除外"
+++
+++#. obsolete: 2.2.0 doesn't do that anymore
+++#: ../statistics.c:153
+++#, c-format
+++msgid "%u packets pruned from receive queue"
+++msgstr "%u�パケットを�信キュー�ら除外"
+++
+++#: ../statistics.c:154
+++#, c-format
+++msgid ""
+++"%u packets dropped from out-of-order queue because of socket buffer overrun"
+++msgstr "%u�パケット�ソケット�ッファオー�ーラン���out-of-orderキュー�らドロップ"
+++
+++#: ../statistics.c:156
+++#, c-format
+++msgid "%u ICMP packets dropped because they were out-of-window"
+++msgstr "%u�ICMPパケット�out-of-window���ドロップ"
+++
+++#: ../statistics.c:158
+++#, c-format
+++msgid "%u ICMP packets dropped because socket was locked"
+++msgstr "%u�ICMPパケットをソケット�ロック�よ��ドロップ"
+++
+++# FIXME: what does it mean?
+++#: ../statistics.c:160
+++#, c-format
+++msgid "%u TCP sockets finished time wait in fast timer"
+++msgstr "%u�TCPソケット�ファーストタイマ��時間待�を完了"
+++
+++# FIXME
+++#: ../statistics.c:161
+++#, c-format
+++msgid "%u time wait sockets recycled by time stamp"
+++msgstr "%u�時間待�ソケット�タイムスタンプ��利用"
+++
+++# FIXME
+++#: ../statistics.c:162
+++#, c-format
+++msgid "%u TCP sockets finished time wait in slow timer"
+++msgstr "%u�TCPソケット�スロータイマ��時間待�を完了"
+++
+++#: ../statistics.c:163
+++#, c-format
+++msgid "%u passive connections rejected because of time stamp"
+++msgstr "%u��動的接続�タイムスタンプ����拒�"
+++
+++#: ../statistics.c:165
+++#, c-format
+++msgid "%u active connections rejected because of time stamp"
+++msgstr "%u�能動的接続�タイムスタンプ����拒�"
+++
+++#: ../statistics.c:167
+++#, c-format
+++msgid "%u packets rejects in established connections because of timestamp"
+++msgstr "%u�パケット�タイムスタンプ����接続確立を拒�"
+++
+++#: ../statistics.c:169
+++#, c-format
+++msgid "%u delayed acks sent"
+++msgstr "%u��延ackを�信"
+++
+++# FIXME
+++#: ../statistics.c:170
+++#, c-format
+++msgid "%u delayed acks further delayed because of locked socket"
+++msgstr "%u��延ack�ロック�れ�ソケット�����ら��延"
+++
+++#: ../statistics.c:172
+++#, c-format
+++msgid "Quick ack mode was activated %u times"
+++msgstr "クイックackモード�%u回稼�"
+++
+++# FIXME
+++#: ../statistics.c:173
+++#, c-format
+++msgid "%u times the listen queue of a socket overflowed"
+++msgstr "ソケット�リスンキュー�%u回オー�フロー"
+++
+++# FIXME
+++#: ../statistics.c:175
+++#, c-format
+++msgid "%u SYNs to LISTEN sockets ignored"
+++msgstr "%u�ソケットリスンSYN�無視"
+++
+++#: ../statistics.c:176
+++#, c-format
+++msgid "%u packets directly queued to recvmsg prequeue."
+++msgstr "%uパケットをrecvmsgプレキュー�直接キュー."
+++
+++#: ../statistics.c:178
+++#, c-format
+++msgid "%u of bytes directly received from backlog"
+++msgstr "%u�イトを�ックログ�ら直接�信"
+++
+++#: ../statistics.c:180
+++#, c-format
+++msgid "%u of bytes directly received from prequeue"
+++msgstr "%u�イトをプレキュー�ら直接�信"
+++
+++#: ../statistics.c:182
+++#, c-format
+++msgid "%u packets dropped from prequeue"
+++msgstr "%u�パケットをプレキュー�らドロップ"
+++
+++#: ../statistics.c:183
+++#, c-format
+++msgid "%u packet headers predicted"
+++msgstr "%u�パケットヘッダを予測"
+++
+++#: ../statistics.c:184
+++#, c-format
+++msgid "%u packets header predicted and directly queued to user"
+++msgstr "%u�パケットヘッダを予測��ユーザ�直接キュー"
+++
+++#: ../statistics.c:186
+++#, c-format
+++msgid "Ran %u times out of system memory during packet sending"
+++msgstr "%u回�パケット�信中�システムメモリ��れ"
+++
+++#: ../statistics.c:188
+++#, c-format
+++msgid "%u acknowledgments not containing data received"
+++msgstr "データを����%u�承���信"
+++
+++#: ../statistics.c:189
+++#, c-format
+++msgid "%u predicted acknowledgments"
+++msgstr "%u�予測承�"
+++
+++#: ../statistics.c:190
+++#, c-format
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr "高速����よるパケットロス�%u回�回復"
+++
+++#: ../statistics.c:191
+++#, c-format
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr "SACKデータ�よるパケットロス�%u回�回復"
+++
+++#: ../statistics.c:192
+++#, c-format
+++msgid "%u bad SACKs received"
+++msgstr "%u��正�SACKを�信"
+++
+++#: ../statistics.c:193
+++#, c-format
+++msgid "Detected reordering %u times using FACK"
+++msgstr "FACKを使��%u回�検出�れ�並�替�"
+++
+++#: ../statistics.c:194
+++#, c-format
+++msgid "Detected reordering %u times using SACK"
+++msgstr "SACKを使��%u回�検出�れ�並�替�"
+++
+++#: ../statistics.c:195
+++#, c-format
+++msgid "Detected reordering %u times using time stamp"
+++msgstr "タイムスタンプを使��%u回�検出�れ�並�替�"
+++
+++# FIXME:what does it mean?
+++#: ../statistics.c:196
+++#, c-format
+++msgid "Detected reordering %u times using reno fast retransmit"
+++msgstr "高速��を使��%u回�検出�れ�並�替�"
+++
+++#: ../statistics.c:197
+++#, c-format
+++msgid "%u congestion windows fully recovered"
+++msgstr "%u�輻輳ウィンドウを完全�回復"
+++
+++#: ../statistics.c:198
+++#, c-format
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
+++msgstr "Hoeヒューリスティックを使��%u�輻輳ウィンドウを部分的�回復"
+++
+++#: ../statistics.c:199
+++#, c-format
+++msgid "%u congestion window recovered using DSACK"
+++msgstr "DSACKを使��%u�輻輳ウィンドウを回復"
+++
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr "部分ack後�%u�輻輳ウィンドウを回復"
+++
+++#: ../statistics.c:201
+++#, c-format
+++msgid "%u retransmits lost"
+++msgstr "%u���ロスト"
+++
+++# FIXME
+++#: ../statistics.c:202
+++#, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr "高速��後�%u�タイムアウト"
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr "SACK復元後�%u�タイムアウト"
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr "状態ロス��%u�タイムアウト"
+++
+++#: ../statistics.c:205
+++#, c-format
+++msgid "%u fast retransmits"
+++msgstr "%u�高速��"
+++
+++#: ../statistics.c:206
+++#, c-format
+++msgid "%u forward retransmits"
+++msgstr "%u�転���"
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr "スロースタート��%u���"
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr "%u���他�TCPタイムアウト"
+++
+++# FIXME
+++#: ../statistics.c:209
+++#, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr "%d�高速��失敗"
+++
+++#: ../statistics.c:210
+++#, c-format
+++msgid "%u sack retransmits failed"
+++msgstr "%u�sack��失敗"
+++
+++# FIXME
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr "直接処������る�スケジュール�れ�%u回�レシー�"
+++
+++# FIXME
+++#: ../statistics.c:212
+++#, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr "%u�パケットを低ソケット�ッファ�����信キュー�ら除外"
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr "%u�DSACKを��パケット����信"
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr "%u�DSACKを順�外パケット����信"
+++
+++#: ../statistics.c:215
+++#, c-format
+++msgid "%u DSACKs received"
+++msgstr "%u�DSACKを�信"
+++
+++#: ../statistics.c:216
+++#, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr "%u�DSACKを順�外パケット����信"
+++
+++#: ../statistics.c:217
+++#, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr "予期��SYN����%u�接続をリセット"
+++
+++#: ../statistics.c:218
+++#, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr "予期��データ����%u�接続をリセット"
+++
+++#: ../statistics.c:219
+++#, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr "早期�ユーザ�クローズ����%u�接続をリセット"
+++
+++#: ../statistics.c:220
+++#, c-format
+++msgid "%u connections aborted due to memory pressure"
+++msgstr "メモリ�制約����%u�接続を中止"
+++
+++#: ../statistics.c:221
+++#, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr "タイムアウト����%u�接続を中止"
+++
+++# FIXME
+++#: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr "ユーザ�長期タイムアウト��クローズ後�%u�接続�中止"
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr "メモリ�足����RST��信�%u回�能"
+++
+++# FIXME
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr "TCP�少��メモリ�%u回実行"
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr "%u�TCPデータ�イベントをロス"
+++
+++#: ../statistics.c:292
+++msgid "enabled"
+++msgstr "有効"
+++
+++#: ../statistics.c:292
+++msgid "disabled"
+++msgstr "無効"
+++
+++#: ../statistics.c:375
+++msgid "error parsing /proc/net/snmp"
+++msgstr "/proc/net/snmp�処�中�エラー�発生����"
+++
+++#: ../statistics.c:388
+++msgid "cannot open /proc/net/snmp"
+++msgstr "/proc/net/snmpを開���ん"
+++
+++#: ../lib/activate.c:69
+++#, c-format
+++msgid "Hardware type `%s' not supported.\n"
+++msgstr "�ードウェアタイプ`%s'�サ�ート�れ����ん.\n"
+++
+++#: ../lib/activate.c:73
+++#, c-format
+++msgid "Cannot change line discipline to `%s'.\n"
+++msgstr "`%s'�line disciplineを変更����ん.\n"
+++
+++#: ../lib/af.c:153 ../lib/hw.c:161
+++msgid "UNSPEC"
+++msgstr "�明��ット"
+++
+++#: ../lib/af.c:155
+++msgid "UNIX Domain"
+++msgstr "UNIXドメイン"
+++
+++#: ../lib/af.c:158
+++msgid "DARPA Internet"
+++msgstr "DARPAインター�ット"
+++
+++#: ../lib/af.c:161
+++msgid "IPv6"
+++msgstr "IPv6"
+++
+++#: ../lib/af.c:164 ../lib/hw.c:182
+++msgid "AMPR AX.25"
+++msgstr "AMPR AX.25"
+++
+++#: ../lib/af.c:167 ../lib/hw.c:188
+++msgid "AMPR NET/ROM"
+++msgstr "AMPR NET/ROM"
+++
+++#: ../lib/af.c:170
+++msgid "Novell IPX"
+++msgstr "Novell IPX"
+++
+++#: ../lib/af.c:173
+++msgid "Appletalk DDP"
+++msgstr "アップルトークDDP"
+++
+++#: ../lib/af.c:176 ../lib/hw.c:223
+++msgid "Econet"
+++msgstr "エコ�ット"
+++
+++#: ../lib/af.c:179
+++msgid "CCITT X.25"
+++msgstr "CCITT X.25"
+++
+++#: ../lib/af.c:182 ../lib/hw.c:185
+++msgid "AMPR ROSE"
+++msgstr "AMPR ROSE"
+++
+++#: ../lib/af.c:185 ../lib/hw.c:173
+++msgid "Ash"
+++msgstr "Ash"
+++
+++#: ../lib/af.c:243
+++#, c-format
+++msgid "Please don't supply more than one address family.\n"
+++msgstr "複数�アドレスファミリを����下��.\n"
+++
+++#: ../lib/af.c:304
+++#, c-format
+++msgid "Too much address family arguments.\n"
+++msgstr "アドレスファミリ�引数�多����.\n"
+++
+++#: ../lib/af.c:315
+++#, c-format
+++msgid "Unknown address family `%s'.\n"
+++msgstr "�明�アドレスファミリ�� `%s'.\n"
+++
+++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
+++#, c-format
+++msgid "in_arcnet(%s): invalid arcnet address!\n"
+++msgstr "in_arcnet(%s): ��当�ARCNETアドレス��!\n"
+++
+++#: ../lib/arcnet.c:97
+++#, c-format
+++msgid "in_arcnet(%s): trailing : ignored!\n"
+++msgstr "in_arcnet(%s): trailing : 無効!\n"
+++
+++# translatable?
+++#: ../lib/arcnet.c:109
+++#, c-format
+++msgid "in_arcnet(%s): trailing junk!\n"
+++msgstr "in_arcnet(%s): trailing junk!\n"
+++
+++#: ../lib/ash.c:81
+++#, c-format
+++msgid "Malformed Ash address"
+++msgstr "異常�Ashアドレス��"
+++
+++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
+++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
+++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
+++msgid "[NONE SET]"
+++msgstr "[設定��]"
+++
+++#: ../lib/ax25.c:97 ../lib/netrom.c:100
+++msgid "Invalid callsign"
+++msgstr "��当�コールサイン��"
+++
+++#: ../lib/ax25.c:110 ../lib/netrom.c:113
+++msgid "Callsign too long"
+++msgstr "コールサイン�長����"
+++
+++#: ../lib/ax25_gr.c:47
+++#, c-format
+++msgid "AX.25 not configured in this system.\n"
+++msgstr "AX.25���システム��設定�れ����ん.\n"
+++
+++#: ../lib/ax25_gr.c:50
+++#, c-format
+++msgid "Kernel AX.25 routing table\n"
+++msgstr "カー�ル AX.25経路テーブル\n"
+++
+++#. xxx
+++#: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
+++msgid "Destination  Iface    Use\n"
+++msgstr "�信先サイト Iface    使用数\n"
+++
+++#: ../lib/ether.c:74 ../lib/ether.c:91
+++#, c-format
+++msgid "in_ether(%s): invalid ether address!\n"
+++msgstr "in_ether(%s): ��当�イーサアドレス!\n"
+++
+++#: ../lib/ether.c:105
+++#, c-format
+++msgid "in_ether(%s): trailing : ignored!\n"
+++msgstr "in_ether(%s): trailing : 無効!\n"
+++
+++# translatable?
+++#: ../lib/ether.c:117
+++#, c-format
+++msgid "in_ether(%s): trailing junk!\n"
+++msgstr "in_ether(%s): trailing junk!\n"
+++
+++#: ../lib/fddi.c:84 ../lib/fddi.c:99
+++#, c-format
+++msgid "in_fddi(%s): invalid fddi address!\n"
+++msgstr "in_fddi(%s): ��当�fddiアドレス!\n"
+++
+++#: ../lib/fddi.c:111
+++#, c-format
+++msgid "in_fddi(%s): trailing : ignored!\n"
+++msgstr "in_fddi(%s): trailing : 無効!\n"
+++
+++# translatable?
+++#: ../lib/fddi.c:123
+++#, c-format
+++msgid "in_fddi(%s): trailing junk!\n"
+++msgstr "in_fddi(%s): trailing junk!\n"
+++
+++#: ../lib/getroute.c:101 ../lib/setroute.c:80
+++#, c-format
+++msgid "Address family `%s' not supported.\n"
+++msgstr "アドレスファミリ`%s'�サ�ート�れ����ん.\n"
+++
+++#: ../lib/getroute.c:107 ../lib/setroute.c:84
+++#, c-format
+++msgid "No routing for address family `%s'.\n"
+++msgstr "アドレスファミリ`%s'��経路�見��り��ん.\n"
+++
+++#: ../lib/hippi.c:84 ../lib/hippi.c:99
+++#, c-format
+++msgid "in_hippi(%s): invalid hippi address!\n"
+++msgstr "in_hippi(%s): ��当�hippiアドレス��!\n"
+++
+++#: ../lib/hippi.c:111
+++#, c-format
+++msgid "in_hippi(%s): trailing : ignored!\n"
+++msgstr "in_hippi(%s): trailing : 無効!\n"
+++
+++# translatable?
+++#: ../lib/hippi.c:122
+++#, c-format
+++msgid "in_hippi(%s): trailing junk!\n"
+++msgstr "in_hippi(%s): trailing junk!\n"
+++
+++#: ../lib/hw.c:160
+++msgid "Local Loopback"
+++msgstr "ローカルループ�ック"
+++
+++#: ../lib/hw.c:163
+++msgid "Serial Line IP"
+++msgstr "シリアルラインIP"
+++
+++#: ../lib/hw.c:164
+++msgid "VJ Serial Line IP"
+++msgstr "VJシリアルラインIP"
+++
+++#: ../lib/hw.c:165
+++msgid "6-bit Serial Line IP"
+++msgstr "6ビットシリアルラインIP"
+++
+++#: ../lib/hw.c:166
+++msgid "VJ 6-bit Serial Line IP"
+++msgstr "VJ 6ビットシリアルラインIP"
+++
+++#: ../lib/hw.c:167
+++msgid "Adaptive Serial Line IP"
+++msgstr "AdaptiveシリアルラインIP"
+++
+++#: ../lib/hw.c:170
+++msgid "Ethernet"
+++msgstr "イーサ�ット"
+++
+++# translatable?
+++#: ../lib/hw.c:176
+++msgid "Fiber Distributed Data Interface"
+++msgstr "Fiber Distributed Data Interface"
+++
+++#: ../lib/hw.c:179
+++msgid "HIPPI"
+++msgstr "HIPPI"
+++
+++#: ../lib/hw.c:191
+++msgid "generic X.25"
+++msgstr "ジェ�リックX.25"
+++
+++#: ../lib/hw.c:194
+++msgid "IPIP Tunnel"
+++msgstr "IPIPトン�ル"
+++
+++#: ../lib/hw.c:197
+++msgid "Point-to-Point Protocol"
+++msgstr "Point-to-Pointプロトコル"
+++
+++#: ../lib/hw.c:200
+++msgid "(Cisco)-HDLC"
+++msgstr "(Cisco)-HDLC"
+++
+++#: ../lib/hw.c:201
+++msgid "LAPB"
+++msgstr "LAPB"
+++
+++#: ../lib/hw.c:204
+++msgid "ARCnet"
+++msgstr "ARC�ット"
+++
+++#: ../lib/hw.c:207
+++msgid "Frame Relay DLCI"
+++msgstr "フレームリレーDLCI"
+++
+++#: ../lib/hw.c:208
+++msgid "Frame Relay Access Device"
+++msgstr "フレームリレーアクセスデ�イス"
+++
+++#: ../lib/hw.c:211
+++msgid "IPv6-in-IPv4"
+++msgstr "IPv6-in-IPv4"
+++
+++#: ../lib/hw.c:214
+++msgid "IrLAP"
+++msgstr "IrLAP"
+++
+++#: ../lib/hw.c:217
+++msgid "16/4 Mbps Token Ring"
+++msgstr "16/4 Mbpsトークンリング"
+++
+++#: ../lib/hw.c:219
+++msgid "16/4 Mbps Token Ring (New)"
+++msgstr "16/4 Mbpsトークンリング(新)"
+++
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr "ジェ�リックEUI-64"
+++
+++#: ../lib/inet.c:153 ../lib/inet6.c:79
+++#, c-format
+++msgid "rresolve: unsupport address family %d !\n"
+++msgstr "rresolve: アドレスファミリ%dをサ�ート�����ん!\n"
+++
+++#: ../lib/inet6.c:131
+++msgid "[UNKNOWN]"
+++msgstr "[�明]"
+++
+++#: ../lib/inet6_gr.c:71
+++#, c-format
+++msgid "INET6 (IPv6) not configured in this system.\n"
+++msgstr "INET6(IPv6)���システム��利用��るよ�設定�れ����ん.\n"
+++
+++#: ../lib/inet6_gr.c:74
+++#, c-format
+++msgid "Kernel IPv6 routing table\n"
+++msgstr "カー�ルIPv6 経路テーブル\n"
+++
+++#: ../lib/inet6_gr.c:76
+++#, c-format
+++msgid ""
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
+++msgstr "�信先サイト                                次回ホップ                             フラグ Metric Ref 使用数 インタフェース\n"
+++
+++#: ../lib/inet6_gr.c:150
+++#, c-format
+++msgid "Kernel IPv6 Neighbour Cache\n"
+++msgstr "カー�ルIPv6 近隣�ットワーク�キャッシュ\n"
+++
+++#: ../lib/inet6_gr.c:153
+++#, c-format
+++msgid ""
+++"Neighbour                                   HW Address        Iface    Flags "
+++"Ref State\n"
+++msgstr ""
+++"近隣サイト                               �ードウェアアドレス Iface   フラグ "
+++"Ref 状態\n"
+++
+++#: ../lib/inet6_gr.c:157
+++#, c-format
+++msgid ""
+++"Neighbour                                   HW Address        Iface    Flags "
+++"Ref State            Stale(sec) Delete(sec)\n"
+++msgstr ""
+++"近隣サイト                               �ードウェアアドレス Iface   フラグ "
+++"Ref 状態             Stale[秒]  Delete[秒]\n"
+++
+++#: ../lib/inet6_sr.c:46
+++#, c-format
+++msgid "Usage: inet6_route [-vF] del Target\n"
+++msgstr "使用法: inet6_route [-vF] del ターゲット\n"
+++
+++#: ../lib/inet6_sr.c:47
+++#, c-format
+++msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
+++msgstr ""
+++"        inet6_route [-vF] add ターゲット \n"
+++"                    [gw ゲートウェイ] [metric メトリック]\n"
+++"                    [[dev] インタフェース]\n"
+++
+++#: ../lib/inet6_sr.c:48
+++#, c-format
+++msgid "       inet6_route [-FC] flush      NOT supported\n"
+++msgstr "        inet6_route [-FC] flush      サ�ート�����ん\n"
+++
+++#: ../lib/inet6_sr.c:188
+++#, c-format
+++msgid "Flushing `inet6' routing table not supported\n"
+++msgstr "`inet6'経路テーブル�フラッシュ�サ�ート�����ん\n"
+++
+++#: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
+++msgid "INET (IPv4) not configured in this system.\n"
+++msgstr "INET(IPv4)���システム��利用��るよ��設定�れ����ん.\n"
+++
+++#: ../lib/inet_gr.c:53
+++#, c-format
+++msgid "Kernel IP routing table\n"
+++msgstr "カー�ルIP経路テーブル\n"
+++
+++#: ../lib/inet_gr.c:56
+++#, c-format
+++msgid ""
+++"Destination     Gateway         Genmask         Flags Metric Ref    Use "
+++"Iface\n"
+++msgstr "�信先サイト    ゲートウェイ    �ットマスク   フラグ Metric Ref 使用数 インタフェース\n"
+++
+++#: ../lib/inet_gr.c:59
+++#, c-format
+++msgid ""
+++"Destination     Gateway         Genmask         Flags   MSS Window  irtt "
+++"Iface\n"
+++msgstr "�信先サイト    ゲートウェイ    �ットマスク   フラグ   MSS Window  irtt インタフェース\n"
+++
+++#: ../lib/inet_gr.c:62
+++#, c-format
+++msgid ""
+++"Destination     Gateway         Genmask         Flags Metric Ref    Use "
+++"Iface    MSS   Window irtt\n"
+++msgstr ""
+++"�信先サイト   ゲートウェイ    �ットマスク    フラグ Metric Ref 使用数 "
+++"Iface    MSS   Window irtt\n"
+++
+++#: ../lib/inet_gr.c:237
+++#, c-format
+++msgid "Kernel IP routing cache\n"
+++msgstr "カー�ルIP経路キャッシュ\n"
+++
+++#: ../lib/inet_gr.c:258
+++#, c-format
+++msgid ""
+++"Source          Destination     Gateway         Flags Metric Ref    Use "
+++"Iface\n"
+++msgstr "発信元サイト   �信先サイト    ゲートウェイ    フラグ Metric Ref 使用数 インタフェース\n"
+++
+++#: ../lib/inet_gr.c:261
+++#, c-format
+++msgid ""
+++"Source          Destination     Gateway         Flags   MSS Window  irtt "
+++"Iface\n"
+++msgstr "発信元サイト    �信先サイト    ゲートウェイ   フラグ   MSS Window  irtt インタフェース\n"
+++
+++#: ../lib/inet_gr.c:266
+++#, c-format
+++msgid ""
+++"Source          Destination     Gateway         Flags Metric Ref    Use "
+++"Iface    MSS   Window irtt  HH  Arp\n"
+++msgstr ""
+++"発信元サイト    �信先サイト    ゲートウェイ   フラグ Metric Ref 使用数 "
+++"Iface    MSS   Window irtt   HH  Arp\n"
+++
+++#: ../lib/inet_gr.c:290
+++#, c-format
+++msgid ""
+++"Source          Destination     Gateway         Flags Metric Ref    Use "
+++"Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
+++msgstr ""
+++"発信元サイト   �信先サイト     ゲートウェイ   フラグ Metric Ref 使用数 "
+++"Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
+++
+++#: ../lib/inet_sr.c:51
+++#, c-format
+++msgid ""
+++"Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
+++"[[dev] If]\n"
+++msgstr ""
+++"使用法:inet_route [-vF] del {-host|-net} �信先[/プレフィックス]\n"
+++"                   [gw ゲートウェイ] [metric メトリック]\n"
+++"                   [[dev] インタフェース]\n"
+++
+++#: ../lib/inet_sr.c:52
+++#, c-format
+++msgid ""
+++"       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
+++msgstr ""
+++"       inet_route [-vF] add {-host|-net} �信先[/プレフィックス]\n"
+++"                   [gw ゲートウェイ] [metric メトリック]\n"
+++
+++#: ../lib/inet_sr.c:53
+++#, c-format
+++msgid ""
+++"                              [netmask N] [mss Mss] [window W] [irtt I]\n"
+++msgstr "            [netmask �ットマスク] [mss Mss] [window W] [irtt I]\n"
+++
+++#: ../lib/inet_sr.c:54
+++#, c-format
+++msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
+++msgstr "            [mod] [dyn] [reinstate] [[dev] インタフェース]\n"
+++
+++#: ../lib/inet_sr.c:55
+++#, c-format
+++msgid ""
+++"       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
+++msgstr ""
+++"       inet_route [-vF] add {-host|-net} �信先[/プレフィックス]\n"
+++"                   [metric メトリック] reject\n"
+++
+++#: ../lib/inet_sr.c:56
+++#, c-format
+++msgid "       inet_route [-FC] flush      NOT supported\n"
+++msgstr "        inet_route [-FC] flush      サ�ート�����ん\n"
+++
+++#: ../lib/inet_sr.c:158
+++#, c-format
+++msgid "route: %s: cannot use a NETWORK as gateway!\n"
+++msgstr "route: %s: NETWORKをゲートウェイ���使���ん!\n"
+++
+++#: ../lib/inet_sr.c:174
+++#, c-format
+++msgid "route: Invalid MSS/MTU.\n"
+++msgstr "route: MSS/MTU���当��.\n"
+++
+++#: ../lib/inet_sr.c:187
+++#, c-format
+++msgid "route: Invalid window.\n"
+++msgstr "route: window���当��.\n"
+++
+++#: ../lib/inet_sr.c:203
+++#, c-format
+++msgid "route: Invalid initial rtt.\n"
+++msgstr "route: �期rtt���当��.\n"
+++
+++#: ../lib/inet_sr.c:261
+++#, c-format
+++msgid "route: netmask %.8x doesn't make sense with host route\n"
+++msgstr "route: �ットマスク%.8x�ホスト経路を検出���ん\n"
+++
+++#: ../lib/inet_sr.c:265
+++#, c-format
+++msgid "route: bogus netmask %s\n"
+++msgstr "route: ���ットマスク`%s'��\n"
+++
+++#: ../lib/inet_sr.c:270
+++#, c-format
+++msgid "route: netmask doesn't match route address\n"
+++msgstr "route: �ットマスク�経路アドレス�一致���ん\n"
+++
+++#: ../lib/inet_sr.c:306
+++#, c-format
+++msgid "Flushing `inet' routing table not supported\n"
+++msgstr "`inet'経路テーブル�フラッシュ�サ�ート�����ん\n"
+++
+++#: ../lib/inet_sr.c:310
+++#, c-format
+++msgid "Modifying `inet' routing cache not supported\n"
+++msgstr "`inet'経路テーブル�変更�サ�ート�����ん\n"
+++
+++#: ../lib/ipx_gr.c:52
+++#, c-format
+++msgid "IPX not configured in this system.\n"
+++msgstr "IPX���システム��設定�れ����ん.\n"
+++
+++#: ../lib/ipx_gr.c:56
+++#, c-format
+++msgid "Kernel IPX routing table\n"
+++msgstr "カー�ルIPX経路テーブル\n"
+++
+++#. xxx
+++#: ../lib/ipx_gr.c:57
+++#, c-format
+++msgid "Destination               Router Net                Router Node\n"
+++msgstr "�信先サイト              ルータ �ット             ルータノード\n"
+++
+++#: ../lib/ipx_sr.c:33
+++#, c-format
+++msgid "IPX: this needs to be written\n"
+++msgstr "IPX: �れ�書�込��必���\n"
+++
+++#: ../lib/masq_info.c:198
+++#, c-format
+++msgid "IP masquerading entries\n"
+++msgstr "IPマスカレード エントリ\n"
+++
+++#: ../lib/masq_info.c:201
+++#, c-format
+++msgid "prot   expire source               destination          ports\n"
+++msgstr "プロト expire 発信元サイト         �信先サイト         �ート\n"
+++
+++#: ../lib/masq_info.c:204
+++#, c-format
+++msgid ""
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
+++msgstr ""
+++"プロト expire    �期seq delta prevd 発信元サイト         �信先サイ"
+++"ト         �ート\n"
+++
+++#: ../lib/netrom_gr.c:48
+++#, c-format
+++msgid "NET/ROM not configured in this system.\n"
+++msgstr "NET/ROM���システム��利用�能�よ��設定�れ����ん.\n"
+++
+++#: ../lib/netrom_gr.c:51
+++#, c-format
+++msgid "Kernel NET/ROM routing table\n"
+++msgstr "カー�ルNET/ROM経路テーブル\n"
+++
+++#: ../lib/netrom_gr.c:52
+++#, c-format
+++msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
+++msgstr "�信先サイト ニーモニック �質  近隣サイト インタフェース\n"
+++
+++#: ../lib/netrom_sr.c:34
+++#, c-format
+++msgid "netrom usage\n"
+++msgstr "netrom使用法\n"
+++
+++#: ../lib/netrom_sr.c:44
+++#, c-format
+++msgid "NET/ROM: this needs to be written\n"
+++msgstr "NET/ROM: �れ�書�込��必���\n"
+++
+++#: ../lib/ppp.c:44
+++#, c-format
+++msgid "You cannot start PPP with this program.\n"
+++msgstr "��プログラム��PPPを開始����ん. \n"
+++
+++#: ../lib/ppp_ac.c:38
+++#, c-format
+++msgid "Sorry, use pppd!\n"
+++msgstr "申�訳�り��ん�, pppdを使��下��!\n"
+++
+++#: ../lib/rose.c:87
+++msgid "Node address must be ten digits"
+++msgstr "ノードアドレス�10進数���れ��り��ん"
+++
+++#: ../lib/rose_gr.c:51
+++#, c-format
+++msgid "ROSE not configured in this system.\n"
+++msgstr "ROSE���システム��利用�能�よ��設定�れ����ん\n"
+++
+++#: ../lib/rose_gr.c:54
+++#, c-format
+++msgid "Kernel ROSE routing table\n"
+++msgstr "カー�ルROSE経路テーブル\n"
+++
+++#: ../lib/tr.c:86 ../lib/tr.c:101
+++#, c-format
+++msgid "in_tr(%s): invalid token ring address!\n"
+++msgstr "in_tr(%s): ��当�トークンリングアドレス��!\n"
+++
+++#: ../lib/tr.c:113
+++#, c-format
+++msgid "in_tr(%s): trailing : ignored!\n"
+++msgstr "in_tr(%s): trailing : 無効!\n"
+++
+++# translatable?
+++#: ../lib/tr.c:125
+++#, c-format
+++msgid "in_tr(%s): trailing junk!\n"
+++msgstr "in_tr(%s): trailing junk!\n"
+++
+++#: ../lib/interface.c:176
+++#, c-format
+++msgid "warning: no inet socket available: %s\n"
+++msgstr "警告: Inetソケット�利用����ん: %s\n"
+++
+++#: ../lib/interface.c:325
+++#, c-format
+++msgid "Warning: cannot open %s (%s). Limited output.\n"
+++msgstr "警告: %sを開���ん(%s). �定�れ�出力��.\n"
+++
+++#. Give better error message for this case.
+++#: ../lib/interface.c:571
+++msgid "Device not found"
+++msgstr "デ�イス�見��り��ん"
+++
+++#: ../lib/interface.c:575
+++#, c-format
+++msgid "%s: error fetching interface information: %s\n"
+++msgstr "%s: インタフェース情報を�得中�エラー�発生����: %s\n"
+++
+++#: ../lib/interface.c:608
+++msgid "     - no statistics available -"
+++msgstr "     - 統計情報を利用����ん -"
+++
+++#: ../lib/interface.c:612
+++#, c-format
+++msgid "[NO FLAGS]"
+++msgstr "[フラグ��]"
+++
+++#: ../lib/interface.c:688
+++#, c-format
+++msgid "%-9.9s Link encap:%s  "
+++msgstr "%-9.9s リンク方法:%s  "
+++
+++#: ../lib/interface.c:693
+++#, c-format
+++msgid "HWaddr %s  "
+++msgstr "�ードウェアアドレス %s "
+++
+++#: ../lib/interface.c:696
+++#, c-format
+++msgid "Media:%s"
+++msgstr "メディア:%s"
+++
+++#: ../lib/interface.c:698
+++#, c-format
+++msgid "(auto)"
+++msgstr "(自動)"
+++
+++#: ../lib/interface.c:705
+++#, c-format
+++msgid "          %s addr:%s "
+++msgstr "          %sアドレス:%s"
+++
+++#: ../lib/interface.c:708
+++#, c-format
+++msgid " P-t-P:%s "
+++msgstr " P-t-P:%s "
+++
+++#: ../lib/interface.c:711
+++#, c-format
+++msgid " Bcast:%s "
+++msgstr " ブロードキャスト:%s "
+++
+++#: ../lib/interface.c:713
+++#, c-format
+++msgid " Mask:%s\n"
+++msgstr " マスク:%s\n"
+++
+++#: ../lib/interface.c:730
+++#, c-format
+++msgid "          inet6 addr: %s/%d"
+++msgstr "          inet6アドレス: %s/%d"
+++
+++#: ../lib/interface.c:732
+++#, c-format
+++msgid " Scope:"
+++msgstr " 範囲:"
+++
+++#: ../lib/interface.c:735
+++#, c-format
+++msgid "Global"
+++msgstr "グロー�ル"
+++
+++#: ../lib/interface.c:738
+++#, c-format
+++msgid "Link"
+++msgstr "リンク"
+++
+++#: ../lib/interface.c:741
+++#, c-format
+++msgid "Site"
+++msgstr "サイト"
+++
+++# translatable?
+++#: ../lib/interface.c:744
+++#, c-format
+++msgid "Compat"
+++msgstr "Compat"
+++
+++#: ../lib/interface.c:747
+++#, c-format
+++msgid "Host"
+++msgstr "ホスト"
+++
+++#: ../lib/interface.c:750
+++#, c-format
+++msgid "Unknown"
+++msgstr "�明"
+++
+++#: ../lib/interface.c:765
+++#, c-format
+++msgid "          IPX/Ethernet II addr:%s\n"
+++msgstr "          IPX/イーサ�ットIIアドレス:%s\n"
+++
+++#: ../lib/interface.c:768
+++#, c-format
+++msgid "          IPX/Ethernet SNAP addr:%s\n"
+++msgstr "          IPX/イーサ�ットSNAPアドレス:%s\n"
+++
+++#: ../lib/interface.c:771
+++#, c-format
+++msgid "          IPX/Ethernet 802.2 addr:%s\n"
+++msgstr "          IPX/イーサ�ット802.2アドレス:%s\n"
+++
+++#: ../lib/interface.c:774
+++#, c-format
+++msgid "          IPX/Ethernet 802.3 addr:%s\n"
+++msgstr "          IPX/イーサ�ット802.3アドレス:%s\n"
+++
+++#: ../lib/interface.c:784
+++#, c-format
+++msgid "          EtherTalk Phase 2 addr:%s\n"
+++msgstr "          イーサトーク フェーズ2アドレス:%s\n"
+++
+++#: ../lib/interface.c:793
+++#, c-format
+++msgid "          econet addr:%s\n"
+++msgstr "          エコ�ットアドレス:%s\n"
+++
+++#: ../lib/interface.c:800
+++#, c-format
+++msgid "[NO FLAGS] "
+++msgstr "[フラグ��]"
+++
+++# translatable?
+++#: ../lib/interface.c:802
+++#, c-format
+++msgid "UP "
+++msgstr "UP "
+++
+++# translatable?
+++#: ../lib/interface.c:804
+++#, c-format
+++msgid "BROADCAST "
+++msgstr "BROADCAST "
+++
+++# translatable?
+++#: ../lib/interface.c:806
+++#, c-format
+++msgid "DEBUG "
+++msgstr "DEBUG "
+++
+++# translatable?
+++#: ../lib/interface.c:808
+++#, c-format
+++msgid "LOOPBACK "
+++msgstr "LOOPBACK "
+++
+++# translatable?
+++#: ../lib/interface.c:810
+++#, c-format
+++msgid "POINTOPOINT "
+++msgstr "POINTOPOINT "
+++
+++# translatable?
+++#: ../lib/interface.c:812
+++#, c-format
+++msgid "NOTRAILERS "
+++msgstr "NOTRAILERS "
+++
+++# translatable?
+++#: ../lib/interface.c:814
+++#, c-format
+++msgid "RUNNING "
+++msgstr "RUNNING "
+++
+++# translatable?
+++#: ../lib/interface.c:816
+++#, c-format
+++msgid "NOARP "
+++msgstr "NOARP "
+++
+++# translatable?
+++#: ../lib/interface.c:818
+++#, c-format
+++msgid "PROMISC "
+++msgstr "PROMISC "
+++
+++# translatable?
+++#: ../lib/interface.c:820
+++#, c-format
+++msgid "ALLMULTI "
+++msgstr "ALLMULTI "
+++
+++# translatable?
+++#: ../lib/interface.c:822
+++#, c-format
+++msgid "SLAVE "
+++msgstr "SLAVE "
+++
+++# translatable?
+++#: ../lib/interface.c:824
+++#, c-format
+++msgid "MASTER "
+++msgstr "MASTER "
+++
+++# translatable?
+++#: ../lib/interface.c:826
+++#, c-format
+++msgid "MULTICAST "
+++msgstr "MULTICAST "
+++
+++# translatable?
+++#: ../lib/interface.c:829
+++#, c-format
+++msgid "DYNAMIC "
+++msgstr "DYNAMIC "
+++
+++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
+++#: ../lib/interface.c:832
+++#, c-format
+++msgid " MTU:%d  Metric:%d"
+++msgstr " MTU:%d  メトリック:%d"
+++
+++# translatable?
+++#: ../lib/interface.c:836
+++#, c-format
+++msgid "  Outfill:%d  Keepalive:%d"
+++msgstr "  Outfill:%d  キープアライブ:%d"
+++
+++#: ../lib/interface.c:850
+++#, c-format
+++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
+++msgstr "RXパケット:%llu エラー:%lu �失:%lu オー�ラン:%lu フレーム:%lu\n"
+++
+++#: ../lib/interface.c:855
+++#, c-format
+++msgid "             compressed:%lu\n"
+++msgstr "             圧縮:%lu\n"
+++
+++#: ../lib/interface.c:895
+++#, c-format
+++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgstr "TXパケット:%llu エラー:%lu �失:%lu オー�ラン:%lu キャリア:%lu\n"
+++
+++#: ../lib/interface.c:899
+++#, c-format
+++msgid "          collisions:%lu "
+++msgstr "      ��(Collisions):%lu "
+++
+++#: ../lib/interface.c:901
+++#, c-format
+++msgid "compressed:%lu "
+++msgstr "圧縮:%lu "
+++
+++#: ../lib/interface.c:903
+++#, c-format
+++msgid "txqueuelen:%d "
+++msgstr "TXキュー長:%d "
+++
+++#: ../lib/interface.c:905
+++#, c-format
+++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
+++msgstr "RX�イト:%llu (%lu.%lu %s)  TX�イト:%llu (%lu.%lu %s)\n"
+++
+++#: ../lib/interface.c:916
+++#, c-format
+++msgid "Interrupt:%d "
+++msgstr "割り込�:%d "
+++
+++#. Only print devices using it for
+++#. I/O maps
+++#: ../lib/interface.c:919
+++#, c-format
+++msgid "Base address:0x%x "
+++msgstr "ベースアドレス:0x%x "
+++
+++#: ../lib/interface.c:921
+++#, c-format
+++msgid "Memory:%lx-%lx "
+++msgstr "メモリ:%lx-%lx "
+++
+++#: ../lib/interface.c:924
+++#, c-format
+++msgid "DMA chan:%x "
+++msgstr "DMA�ェイン:%x "
+++
+++#: ../lib/sockets.c:63
+++#, c-format
+++msgid "No usable address families found.\n"
+++msgstr "利用�能�アドレスファミリ�見��り��ん.\n"
+++
+++#: ../lib/util-ank.c:229
+++#, c-format
+++msgid "ip: %s is invalid inet address\n"
+++msgstr "ip: %s���切�Inetアドレス��.\n"
+++
+++#: ../lib/util-ank.c:238
+++#, c-format
+++msgid "ip: %s is invalid inet prefix\n"
+++msgstr "ip: %s���切�Inetプレフィックス��\n"
+++
+++#: ../lib/util-ank.c:248
+++#, c-format
+++msgid "ip: %s is invalid IPv4 address\n"
+++msgstr "ip: %s���切�IPv4アドレス��.\n"
+++
+++#: ../lib/util-ank.c:256
+++#, c-format
+++msgid "ip: argument is wrong: %s\n"
+++msgstr "ip: 引数�間������: %s\n"
+++
+++#: ../ipmaddr.c:61
+++#, c-format
+++msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
+++msgstr "使用法: ipmaddr [ add | del ] マル�キャストアドレス dev 文字列\n"
+++
+++#: ../ipmaddr.c:62
+++#, c-format
+++msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
+++msgstr "        ipmaddr show [ dev 文字列 ] [ ipv4 | ipv6 | link | all ]\n"
+++
+++#: ../ipmaddr.c:63
+++#, c-format
+++msgid "       ipmaddr -V | -version\n"
+++msgstr "       ipmaddr -V | -version\n"
+++
+++#: ../ipmaddr.c:263
+++#, c-format
+++msgid "family %d "
+++msgstr "ファミリ %d "
+++
+++#: ../ipmaddr.c:272
+++#, c-format
+++msgid " users %d"
+++msgstr " ユーザ %d"
+++
+++#: ../ipmaddr.c:358
+++msgid "Cannot create socket"
+++msgstr "ソケットを作�����ん"
+++
+++#: ../slattach.c:180
+++#, c-format
+++msgid "slattach: /dev/%s already locked!\n"
+++msgstr "slattach: /dev/%s ����ロック�れ����!\n"
+++
+++#: ../slattach.c:186
+++#, c-format
+++msgid "slattach: tty_lock: (%s): %s\n"
+++msgstr "slattach: tty_lock: (%s): %s\n"
+++
+++#: ../slattach.c:192
+++#, c-format
+++msgid "slattach: cannot write PID file\n"
+++msgstr "slattach: PIDファイルを書�込���ん\n"
+++
+++#: ../slattach.c:202
+++#, c-format
+++msgid "slattach: tty_lock: UUCP user %s unknown!\n"
+++msgstr "slattach: tty_lock: UUCPユーザ%s��明��!\n"
+++
+++#: ../slattach.c:430
+++#, c-format
+++msgid "slattach: tty_hangup(DROP): %s\n"
+++msgstr "slattach: tty_hangup(DROP): %s\n"
+++
+++#: ../slattach.c:437
+++#, c-format
+++msgid "slattach: tty_hangup(RAISE): %s\n"
+++msgstr "slattach: tty_hangup(RAISE): %s\n"
+++
+++#: ../slattach.c:468
+++#, c-format
+++msgid "slattach: tty name too long\n"
+++msgstr "slattach: tty��長����\n"
+++
+++#: ../slattach.c:498
+++#, c-format
+++msgid "slattach: tty_open: cannot get current state!\n"
+++msgstr "slattach: tty_open: �在�状態を得られ��ん!\n"
+++
+++#: ../slattach.c:505
+++#, c-format
+++msgid "slattach: tty_open: cannot get current line disc!\n"
+++msgstr "slattach: tty_open: �在�ライン・ディスクを得られ��ん!\n"
+++
+++#: ../slattach.c:513
+++#, c-format
+++msgid "slattach: tty_open: cannot set RAW mode!\n"
+++msgstr "slattach: tty_open: RAWモードを設定����ん!\n"
+++
+++#: ../slattach.c:520
+++#, c-format
+++msgid "slattach: tty_open: cannot set %s bps!\n"
+++msgstr "slattach: tty_open: %s bpsを設定����ん!\n"
+++
+++#: ../slattach.c:530
+++#, c-format
+++msgid "slattach: tty_open: cannot set 8N1 mode!\n"
+++msgstr "slattach: tty_open: 8N1モード�設定����ん!\n"
+++
+++#: ../slattach.c:672
+++#, c-format
+++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
+++msgstr "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
+++
+++#: ../slattach.c:704
+++#, c-format
+++msgid "%s started"
+++msgstr "%sを開始����"
+++
+++#: ../slattach.c:705
+++#, c-format
+++msgid " on %s"
+++msgstr "(%s上)"
+++
+++#: ../slattach.c:706
+++#, c-format
+++msgid " interface %s\n"
+++msgstr " インタフェース %s\n"
++Index: net-tools/po/fr.po
++===================================================================
++--- net-tools.orig/po/fr.po
+++++ net-tools/po/fr.po
++@@ -4,281 +4,286 @@
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: net-tools 1.51\n"
++-"POT-Creation-Date: 2000-02-14 02:31+0100\n"
+++"Report-Msgid-Bugs-To: \n"
+++"POT-Creation-Date: 2007-06-30 12:28+0900\n"
++ "PO-Revision-Date: 1998-03-01 00:02+0100\n"
++ "Last-Translator: J.M.Vansteene <vanstee@worldnet.fr>\n"
++ "Language-Team:\n"
++ "MIME-Version: 1.0\n"
++-"Content-Type: text/plain; charset=iso8859-1\n"
+++"Content-Type: text/plain; charset=iso-8859-1\n"
++ "Content-Transfer-Encoding: 8bit\n"
++ 
++-#: ../arp.c:110 ../arp.c:269
+++#: ../arp.c:112 ../arp.c:279
+++#, c-format
++ msgid "arp: need host name\n"
++ msgstr "arp: nécessite un nom d'hôte\n"
++ 
++-#: ../arp.c:207 ../arp.c:221
+++#: ../arp.c:215 ../arp.c:230
++ #, c-format
++ msgid "No ARP entry for %s\n"
++ msgstr "Pas d'entrée ARP pour %s\n"
++ 
++-#: ../arp.c:239
+++#: ../arp.c:248
++ #, fuzzy, c-format
++ msgid "arp: cant get HW-Address for `%s': %s.\n"
++ msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n"
++ 
++-#: ../arp.c:243
+++#: ../arp.c:252
+++#, c-format
++ msgid "arp: protocol type mismatch.\n"
++ msgstr ""
++ 
++-#: ../arp.c:252
+++#: ../arp.c:261
++ #, c-format
++ msgid "arp: device `%s' has HW address %s `%s'.\n"
++ msgstr ""
++ 
++-#: ../arp.c:282
+++#: ../arp.c:293
+++#, c-format
++ msgid "arp: need hardware address\n"
++ msgstr "arp: nécessite une adresse matériel\n"
++ 
++-#: ../arp.c:290
+++#: ../arp.c:301
+++#, c-format
++ msgid "arp: invalid hardware address\n"
++ msgstr "arp: adresse matériel invalide\n"
++ 
++-#: ../arp.c:387
+++#: ../arp.c:398
++ #, c-format
++ msgid "arp: cannot open etherfile %s !\n"
++ msgstr "arp: ne peut ouvrir le fichier ether %s !\n"
++ 
++-#: ../arp.c:403
+++#: ../arp.c:414
++ #, c-format
++ msgid "arp: format error on line %u of etherfile %s !\n"
++ msgstr "arp: erreur de format ligne %u du fichier ether %s !\n"
++ 
++-#: ../arp.c:416
+++#: ../arp.c:427
++ #, c-format
++ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
++ msgstr "arp: ne peut définir l'entrée en ligne %u du fichier ether %s !\n"
++ 
++-#: ../arp.c:437
++-msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
+++#: ../arp.c:448
+++#, fuzzy, c-format
+++msgid ""
+++"Address                  HWtype  HWaddress           Flags Mask            "
+++"Iface\n"
++ msgstr "Adresse\t\t\tTypeMap\tAdresseMat\t   Indicateurs\t\t  Iface\n"
++ 
++-#: ../arp.c:467
+++#: ../arp.c:476
+++#, fuzzy
+++msgid "<from_interface>"
+++msgstr "%s: interface inconnue: %s\n"
+++
+++#: ../arp.c:478
++ msgid "(incomplete)"
++ msgstr ""
++ 
++-#: ../arp.c:484
+++#: ../arp.c:495
++ #, c-format
++ msgid "%s (%s) at "
++ msgstr ""
++ 
++-#: ../arp.c:490
+++#: ../arp.c:501
+++#, c-format
++ msgid "<incomplete> "
++ msgstr ""
++ 
++-#: ../arp.c:496
+++#: ../arp.c:507
++ #, c-format
++ msgid "netmask %s "
++ msgstr ""
++ 
++-#: ../arp.c:513
+++#: ../arp.c:524
++ #, c-format
++ msgid "on %s\n"
++ msgstr ""
++ 
++-#: ../arp.c:592
+++#: ../arp.c:605
++ #, c-format
++ msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
++ msgstr "Entrées: %d\tIgnorées: %d\tTrouvées: %d\n"
++ 
++-#: ../arp.c:596
+++#: ../arp.c:609
++ #, c-format
++ msgid "%s (%s) -- no entry\n"
++ msgstr ""
++ 
++-#: ../arp.c:598
+++#: ../arp.c:611
++ #, c-format
++ msgid "arp: in %d entries no match found.\n"
++ msgstr "arp: aucune correspondance trouvée dans %d entrées\n"
++ 
++-#: ../arp.c:613
+++#: ../arp.c:626
+++#, c-format
++ msgid ""
++ "Usage:\n"
++ "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
++ "cache\n"
++ msgstr ""
++ "Syntaxe:\n"
++-"  arp [-vn]  [<MAT>] [-i <if>] [-a] [<hôte>]              <-Affiche cache "
++-"ARP\n"
+++"  arp [-vn]  [<MAT>] [-i <if>] [-a] [<hôte>]              <-Affiche cache ARP\n"
++ 
++-#: ../arp.c:614
+++#: ../arp.c:627
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
+++"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
++ "entry\n"
++-msgstr ""
++-"  arp [-v]          [-i <if>] -d  <hôte> [pub][nopub]     <-Supprime entrée "
++-"ARP\n"
+++msgstr "  arp [-v]          [-i <if>] -d  <hôte> [pub][nopub]     <-Supprime entrée ARP\n"
++ 
++-#: ../arp.c:615
++-#, fuzzy
+++#: ../arp.c:628
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
+++"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
++ "file\n"
++-msgstr ""
++-"  arp [-vnD] [<MAT>] [-i <if>] -f  <fichier>              <-Ajout entrée "
++-"depuis fichier\n"
+++msgstr "  arp [-vnD] [<MAT>] [-i <if>] -f  <fichier>              <-Ajout entrée depuis fichier\n"
++ 
++-#: ../arp.c:616
+++#: ../arp.c:629
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
+++"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
++ "entry\n"
++-msgstr ""
++-"  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [temp][nopub] <-Ajout "
++-"entrée\n"
+++msgstr "  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [temp][nopub] <-Ajout entrée\n"
++ 
++-#: ../arp.c:617
++-msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
++-"<-''-\n"
++-msgstr ""
++-"  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [netmask <nm>] pub  "
++-"<-''-\n"
++-
++-#: ../arp.c:618
+++#: ../arp.c:630
+++#, fuzzy, c-format
++ msgid ""
++-"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
+++"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
++ "<-''-\n"
++ "\n"
++ msgstr ""
++-"  arp [-v]   [<MAT>] [-i <if>] -Ds <hôte> <if> [netmask <nm>] pub      "
++-"<-''-\n"
+++"  arp [-v]   [<MAT>] [-i <if>] -Ds <hôte> <if> [netmask <nm>] pub      <-''-\n"
++ "\n"
++ 
++-#: ../arp.c:620
+++#: ../arp.c:632
+++#, c-format
++ msgid ""
++ "        -a                       display (all) hosts in alternative (BSD) "
++ "style\n"
++-msgstr ""
++-"        -a                       affiche (tous) les hôtes en style BSD\n"
+++msgstr "        -a                       affiche (tous) les hôtes en style BSD\n"
++ 
++-#: ../arp.c:621
+++#: ../arp.c:633
+++#, c-format
++ msgid "        -s, --set                set a new ARP entry\n"
++ msgstr "        -s, --set                définit une nouvelle entrée ARP\n"
++ 
++-#: ../arp.c:622
+++#: ../arp.c:634
+++#, c-format
++ msgid "        -d, --delete             delete a specified entry\n"
++ msgstr "        -d, --delete             supprime une entrée\n"
++ 
++-#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
+++#: ../arp.c:635 ../netstat.c:1503 ../route.c:86
+++#, c-format
++ msgid "        -v, --verbose            be verbose\n"
++ msgstr "        -v, --verbose            mode verbeux\n"
++ 
++-#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
++-msgid "        -n, --numeric            dont resolve names\n"
+++#: ../arp.c:636 ../netstat.c:1504 ../route.c:87
+++#, fuzzy, c-format
+++msgid "        -n, --numeric            don't resolve names\n"
++ msgstr "        -n, --numeric            ne résout pas les noms\n"
++ 
++-#: ../arp.c:625
+++#: ../arp.c:637
+++#, c-format
++ msgid ""
++ "        -i, --device             specify network interface (e.g. eth0)\n"
++-msgstr ""
++-"        -i, --device             spécifie l'interface réseau (p.ex. eth0)\n"
+++msgstr "        -i, --device             spécifie l'interface réseau (p.ex. eth0)\n"
++ 
++-#: ../arp.c:626
+++#: ../arp.c:638
+++#, c-format
++ msgid "        -D, --use-device         read <hwaddr> from given device\n"
++-msgstr ""
++-"        -D, --use-device         lit l'<adrmat> depuis le périphérique\n"
+++msgstr "        -D, --use-device         lit l'<adrmat> depuis le périphérique\n"
++ 
++-#: ../arp.c:627
++-#, fuzzy
+++#: ../arp.c:639
+++#, fuzzy, c-format
++ msgid "        -A, -p, --protocol       specify protocol family\n"
++ msgstr "        -r, --route              affiche la table de routage\n"
++ 
++-#: ../arp.c:628
++-#, fuzzy
+++#: ../arp.c:640
+++#, fuzzy, c-format
++ msgid ""
++-"        -f, --file               read new entries from file or from "
++-"/etc/ethers\n"
+++"        -f, --file               read new entries from file or from /etc/"
+++"ethers\n"
++ "\n"
++ msgstr ""
++ "        -f, --file               lit les nouvelles entrées dans le fichier\n"
++ "\n"
++ 
++-#: ../arp.c:630 ../rarp.c:181
+++#: ../arp.c:642 ../rarp.c:182
++ #, c-format
++ msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
++-msgstr ""
++-"  <HW>=Utilisez '-H <hw>' pour spécifier le type d'adresse matériel. Défaut: "
++-"%s\n"
+++msgstr "  <HW>=Utilisez '-H <hw>' pour spécifier le type d'adresse matériel. Défaut: %s\n"
++ 
++-#: ../arp.c:631 ../rarp.c:182
+++#: ../arp.c:643 ../rarp.c:183
+++#, c-format
++ msgid "  List of possible hardware types (which support ARP):\n"
++ msgstr "  Liste les types de matériels supportant ARP:\n"
++ 
++-#: ../arp.c:664
+++#: ../arp.c:677 ../arp.c:762
++ #, c-format
++ msgid "%s: hardware type not supported!\n"
++ msgstr "%s: type de matétiel non supporté !\n"
++ 
++-#: ../arp.c:668
+++#: ../arp.c:681
++ #, c-format
++ msgid "%s: address family not supported!\n"
++ msgstr "%s: famille d'adresses non supportée !\n"
++ 
++-#: ../arp.c:703
++-#, fuzzy
+++#: ../arp.c:716
+++#, fuzzy, c-format
++ msgid "arp: -N not yet supported.\n"
++ msgstr "Table de routage pour `ddp' pas encore supporté.\n"
++ 
++-#: ../arp.c:713
+++#: ../arp.c:726
++ #, c-format
++ msgid "arp: %s: unknown address family.\n"
++ msgstr "arp: %s: famille d'adresses inconnue.\n"
++ 
++-#: ../arp.c:722
+++#: ../arp.c:735
++ #, c-format
++ msgid "arp: %s: unknown hardware type.\n"
++ msgstr "arp: %s: type de matériel inconnu.\n"
++ 
++-#: ../arp.c:741
+++#: ../arp.c:754
++ #, c-format
++ msgid "arp: %s: kernel only supports 'inet'.\n"
++ msgstr "arp: %s: le noyau ne supporte que 'inet'.\n"
++ 
++-#: ../arp.c:746
+++#: ../arp.c:767
++ #, c-format
++ msgid "arp: %s: hardware type without ARP support.\n"
++ msgstr "arp: %s: type de matériel sans support ARP.\n"
++ 
++-#: ../hostname.c:69
+++#: ../hostname.c:71
++ #, c-format
++ msgid "Setting nodename to `%s'\n"
++ msgstr "Définit le nom de noeud à `%s'\n"
++ 
++-#: ../hostname.c:74
+++#: ../hostname.c:76
++ #, c-format
++ msgid "%s: you must be root to change the node name\n"
++ msgstr "%s: vous devez être root pour changer le nom de noeud\n"
++ 
++-#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
+++#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117
++ #, c-format
++ msgid "%s: name too long\n"
++ msgstr "%s: nom trop long\n"
++ 
++-#: ../hostname.c:89
+++#: ../hostname.c:91
++ #, c-format
++ msgid "Setting hostname to `%s'\n"
++ msgstr "Définit le nom d'hôte à `%s'\n"
++ 
++-#: ../hostname.c:94
+++#: ../hostname.c:96
++ #, c-format
++ msgid "%s: you must be root to change the host name\n"
++ msgstr "%s: vous devez être root pour changer le nom d'hôte\n"
++ 
++-#: ../hostname.c:108
+++#: ../hostname.c:109
++ #, c-format
++ msgid "Setting domainname to `%s'\n"
++ msgstr "Définit le nom de domaine à `%s'\n"
++ 
++-#: ../hostname.c:113
+++#: ../hostname.c:114
++ #, c-format
++ msgid "%s: you must be root to change the domain name\n"
++ msgstr "%s: vous devez être root pour changer le nom de domaine\n"
++@@ -303,38 +308,36 @@ msgstr "Résultat : h_aliases=`%s'\n"
++ msgid "Result: h_addr_list=`%s'\n"
++ msgstr "Résultat : h_addr_list=`%s'\n"
++ 
++-#: ../hostname.c:209
+++#: ../hostname.c:208
++ #, c-format
++ msgid "%s: can't open `%s'\n"
++ msgstr "%s: ne peut ouvrir `%s'\n"
++ 
++-#: ../hostname.c:223
+++#: ../hostname.c:222
+++#, c-format
++ msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
++-msgstr ""
++-"Syntaxe : hostname [-v] {hôte|-F fichier}      définit le nom d'hôte (depuis "
++-"le fichier)\n"
+++msgstr "Syntaxe : hostname [-v] {hôte|-F fichier}      définit le nom d'hôte (depuis le fichier)\n"
++ 
++-#: ../hostname.c:224
+++#: ../hostname.c:223
+++#, c-format
++ msgid ""
++ "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
++-msgstr ""
++-"       domainname [-v] {domaine_nis|-F fichier}   définit le domaine NIS "
++-"(depuis le fichier)\n"
+++msgstr "       domainname [-v] {domaine_nis|-F fichier}   définit le domaine NIS (depuis le fichier)\n"
++ 
++-#: ../hostname.c:226
++-#, fuzzy
+++#: ../hostname.c:225
+++#, fuzzy, c-format
++ msgid ""
++ "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
++ "file)\n"
++-msgstr ""
++-"       nodename [-v] {nom_noeud|-F fichier}      Définit le nom de noeud "
++-"DECnet (depuis le fichier)\n"
+++msgstr "       nodename [-v] {nom_noeud|-F fichier}      Définit le nom de noeud DECnet (depuis le fichier)\n"
++ 
++-#: ../hostname.c:228
+++#: ../hostname.c:227
+++#, c-format
++ msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
++ msgstr "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  affiche le nom formatté\n"
++ 
++-#: ../hostname.c:229
+++#: ../hostname.c:228
+++#, c-format
++ msgid ""
++ "       hostname [-v]                         display hostname\n"
++ "\n"
++@@ -342,7 +345,8 @@ msgstr ""
++ "       hostname [-v]                         affiche le nom d'hôte\n"
++ "\n"
++ 
++-#: ../hostname.c:230
+++#: ../hostname.c:229
+++#, c-format
++ msgid ""
++ "       hostname -V|--version|-h|--help       print info and exit\n"
++ "\n"
++@@ -350,7 +354,8 @@ msgstr ""
++ "       hostname -V|--version|-h|--help       affiche des infos et termine\n"
++ "\n"
++ 
++-#: ../hostname.c:231
+++#: ../hostname.c:230
+++#, c-format
++ msgid ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++@@ -358,45 +363,52 @@ msgstr ""
++ "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
++ "\n"
++ 
++-#: ../hostname.c:232
+++#: ../hostname.c:231
+++#, c-format
++ msgid "    -s, --short           short host name\n"
++ msgstr "    -s, --short           nom d'hôte court\n"
++ 
++-#: ../hostname.c:233
+++#: ../hostname.c:232
+++#, c-format
++ msgid "    -a, --alias           alias names\n"
++ msgstr "    -a, --alias           noms d'alias\n"
++ 
++-#: ../hostname.c:234
+++#: ../hostname.c:233
+++#, c-format
++ msgid "    -i, --ip-address      addresses for the hostname\n"
++ msgstr "    -i, --ip-address      adresses de l'hôte\n"
++ 
++-#: ../hostname.c:235
+++#: ../hostname.c:234
+++#, c-format
++ msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
++ msgstr "    -f, --fqdn, --long    nom d'hôte long (FQDN)\n"
++ 
++-#: ../hostname.c:236
+++#: ../hostname.c:235
+++#, c-format
++ msgid "    -d, --domain          DNS domain name\n"
++ msgstr "    -d, --domain          nom de domaine DNS\n"
++ 
++-#: ../hostname.c:237
+++#: ../hostname.c:236
+++#, c-format
++ msgid "    -y, --yp, --nis       NIS/YP domainname\n"
++ msgstr "    -y, --yp, --nis       nom de domaine NIS/YP\n"
++ 
++-#: ../hostname.c:239
+++#: ../hostname.c:238
+++#, c-format
++ msgid "    -n, --node            DECnet node name\n"
++ msgstr "    -n, --node            nom de noeud DECnet\n"
++ 
++-#: ../hostname.c:241
++-#, fuzzy
+++#: ../hostname.c:240
+++#, fuzzy, c-format
++ msgid ""
++ "    -F, --file            read hostname or NIS domainname from given file\n"
++ "\n"
++ msgstr ""
++-"    -F, --file            lit le nom d'hôte ou le nom de domaine NIS depuis "
++-"le fichier\n"
+++"    -F, --file            lit le nom d'hôte ou le nom de domaine NIS depuis le fichier\n"
++ "\n"
++ 
++-#: ../hostname.c:243
+++#: ../hostname.c:242
+++#, c-format
++ msgid ""
++ "   This command can read or set the hostname or the NIS domainname. You can\n"
++ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
++@@ -411,15 +423,16 @@ msgid "%s: You can't change the DNS doma
++ msgstr "%s: Vous ne pouvez changer le nom de domaine DNS avec cette commande\n"
++ 
++ #: ../hostname.c:339
+++#, c-format
++ msgid ""
++ "\n"
++ "Unless you are using bind or NIS for host lookups you can change the DNS\n"
++ msgstr ""
++ "\n"
++-"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez "
++-"changer le\n"
+++"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n"
++ 
++ #: ../hostname.c:340
+++#, c-format
++ msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
++ msgstr ""
++ "nom de domaine DNS (qui fait partie du FQDN) dans le fichier /etc/hosts.\n"
++@@ -439,554 +452,453 @@ msgstr "getdomainname()=`%s'\n"
++ msgid "getnodename()=`%s'\n"
++ msgstr "getnodename()=`%s'\n"
++ 
++-#: ../ifconfig.c:159
++-#, c-format
++-msgid "%-9.9s Link encap:%s  "
++-msgstr "%-9.9s Lien encap:%s  "
+++#: ../ifconfig.c:107
+++#, fuzzy, c-format
+++msgid ""
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
+++"Flg\n"
+++msgstr ""
+++"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Indic\n"
++ 
++-#: ../ifconfig.c:164
++-#, c-format
++-msgid "HWaddr %s  "
++-msgstr "HWaddr %s  "
+++#: ../ifconfig.c:129 ../ifconfig.c:161
+++#, fuzzy, c-format
+++msgid "%s: ERROR while getting interface flags: %s\n"
+++msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
++ 
++-#: ../ifconfig.c:167
+++#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862
+++#: ../ifconfig.c:973
++ #, c-format
++-msgid "Media:%s"
++-msgstr "Media:%s"
+++msgid "No support for INET on this system.\n"
+++msgstr "Pas de support de INET sur ce système.\n"
++ 
++-#: ../ifconfig.c:169
++-msgid "(auto)"
++-msgstr "(auto)"
+++#: ../ifconfig.c:193
+++#, fuzzy, c-format
+++msgid "%s: ERROR while testing interface flags: %s\n"
+++msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
++ 
++-#: ../ifconfig.c:176
++-#, c-format
++-msgid "          %s addr:%s "
++-msgstr "          %s adr:%s "
+++#: ../ifconfig.c:202
+++#, fuzzy, c-format
+++msgid ""
+++"Usage:\n"
+++"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
+++msgstr ""
+++"Syntaxe:\n"
+++"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n"
++ 
++-#: ../ifconfig.c:179
+++#: ../ifconfig.c:204
++ #, c-format
++-msgid " P-t-P:%s "
++-msgstr " P-t-P:%s "
+++msgid "  [add <address>[/<prefixlen>]]\n"
+++msgstr "  [add <adresse>[/<lg_prefixe>]]\n"
++ 
++-#: ../ifconfig.c:182
+++#: ../ifconfig.c:205
++ #, c-format
++-msgid " Bcast:%s "
++-msgstr " Bcast:%s "
+++msgid "  [del <address>[/<prefixlen>]]\n"
+++msgstr "  [del <adresse>[/<lg_prefixe>]]\n"
++ 
++-#: ../ifconfig.c:184
+++#: ../ifconfig.c:206
++ #, c-format
++-msgid " Mask:%s\n"
++-msgstr " Masque:%s\n"
+++msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
+++msgstr "  [[-]broadcast [<adresse>]]  [[-]pointopoint [<adresse>]]\n"
++ 
++-#: ../ifconfig.c:201
++-#, c-format
++-msgid "          inet6 addr: %s/%d"
++-msgstr "          adr inet6: %s/%d"
+++#: ../ifconfig.c:207
+++#, fuzzy, c-format
+++msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
+++msgstr "  [netmask <adresse>]  [dstaddr <adresse>]  [tunnel <adresse>]\n"
++ 
++-#: ../ifconfig.c:203
++-msgid " Scope:"
++-msgstr " Scope:"
+++#: ../ifconfig.c:210
+++#, c-format
+++msgid "  [outfill <NN>] [keepalive <NN>]\n"
+++msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++ 
++-#: ../ifconfig.c:206
++-msgid "Global"
++-msgstr "Global"
+++#: ../ifconfig.c:212
+++#, c-format
+++msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
+++msgstr "  [hw <HW> <adresse>]  [metric <NN>]  [mtu <NN>]\n"
++ 
++-#: ../ifconfig.c:209
++-msgid "Link"
++-msgstr "Lien"
+++#: ../ifconfig.c:213
+++#, c-format
+++msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
+++msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++ 
++-#: ../ifconfig.c:212
++-msgid "Site"
++-msgstr "Site"
+++#: ../ifconfig.c:214
+++#, c-format
+++msgid "  [multicast]  [[-]promisc]\n"
+++msgstr "  [multicast]  [[-]promisc]\n"
++ 
++ #: ../ifconfig.c:215
++-msgid "Compat"
++-msgstr "Compat"
+++#, c-format
+++msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
+++msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++ 
++-#: ../ifconfig.c:218
++-msgid "Host"
++-msgstr "Hôte"
+++#: ../ifconfig.c:217
+++#, fuzzy, c-format
+++msgid "  [txqueuelen <NN>]\n"
+++msgstr "  [txqueuelen longueur]\n"
++ 
++-#: ../ifconfig.c:221
++-msgid "Unknown"
++-msgstr "Inconnu"
+++#: ../ifconfig.c:220
+++#, c-format
+++msgid "  [[-]dynamic]\n"
+++msgstr "  [[-]dynamic]\n"
++ 
++-#: ../ifconfig.c:236
+++#: ../ifconfig.c:222
++ #, c-format
++-msgid "          IPX/Ethernet II addr:%s\n"
++-msgstr "          adr IPX/Ethernet II:%s\n"
+++msgid ""
+++"  [up|down] ...\n"
+++"\n"
+++msgstr ""
+++"  [up|down] ...\n"
+++"\n"
++ 
++-#: ../ifconfig.c:239
+++#: ../ifconfig.c:224
++ #, c-format
++-msgid "          IPX/Ethernet SNAP addr:%s\n"
++-msgstr "          adr IPX/Ethernet SNAP:%s\n"
+++msgid "  <HW>=Hardware Type.\n"
+++msgstr "  <HW>=Type de matériel.\n"
++ 
++-#: ../ifconfig.c:242
+++#: ../ifconfig.c:225
++ #, c-format
++-msgid "          IPX/Ethernet 802.2 addr:%s\n"
++-msgstr "          adr IPX/Ethernet 802.2:%s\n"
+++msgid "  List of possible hardware types:\n"
+++msgstr "  Liste des types de matériels possibles:\n"
++ 
++-#: ../ifconfig.c:245
+++#. 1 = ARPable
+++#: ../ifconfig.c:227
++ #, c-format
++-msgid "          IPX/Ethernet 802.3 addr:%s\n"
++-msgstr "          adr IPX/Ethernet 802.3:%s\n"
+++msgid "  <AF>=Address family. Default: %s\n"
+++msgstr "  <AF>=famille d'Adresses. Défaut: %s\n"
++ 
++-#: ../ifconfig.c:255
+++#: ../ifconfig.c:228
++ #, c-format
++-msgid "          EtherTalk Phase 2 addr:%s\n"
++-msgstr "          adr EtherTalk Phase 2:%s\n"
+++msgid "  List of possible address families:\n"
+++msgstr "  Liste des familles d'adresses possibles:\n"
++ 
++-#: ../ifconfig.c:264
+++#: ../ifconfig.c:303
++ #, c-format
++-msgid "          econet addr:%s\n"
++-msgstr "          adr econet:%s\n"
+++msgid "ifconfig: option `%s' not recognised.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:270
++-msgid "[NO FLAGS] "
++-msgstr "[PAS INDICATEURS] "
+++#: ../ifconfig.c:305 ../ifconfig.c:962
+++#, c-format
+++msgid "ifconfig: `--help' gives usage information.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:272
++-msgid "UP "
++-msgstr "UP "
+++#: ../ifconfig.c:380
+++#, c-format
+++msgid "Unknown media type.\n"
+++msgstr "Type de média inconnu.\n"
++ 
++-#: ../ifconfig.c:274
++-msgid "BROADCAST "
++-msgstr "BROADCAST "
+++#: ../ifconfig.c:417
+++#, c-format
+++msgid ""
+++"Warning: Interface %s still in promisc mode... maybe other application is "
+++"running?\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:276
++-msgid "DEBUG "
++-msgstr "DEBUG "
+++#: ../ifconfig.c:429
+++#, c-format
+++msgid "Warning: Interface %s still in MULTICAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:278
++-msgid "LOOPBACK "
++-msgstr "LOOPBACK "
+++#: ../ifconfig.c:441
+++#, c-format
+++msgid "Warning: Interface %s still in ALLMULTI mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:280
++-msgid "POINTOPOINT "
++-msgstr "POINTOPOINT "
+++#: ../ifconfig.c:465
+++#, c-format
+++msgid "Warning: Interface %s still in DYNAMIC mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:282
++-msgid "NOTRAILERS "
++-msgstr "NOTRAILERS "
+++#: ../ifconfig.c:523
+++#, c-format
+++msgid "Warning: Interface %s still in BROADCAST mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:284
++-msgid "RUNNING "
++-msgstr "RUNNING "
+++#: ../ifconfig.c:652
+++#, c-format
+++msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:286
++-msgid "NOARP "
++-msgstr "NOARP "
+++#: ../ifconfig.c:684
+++#, c-format
+++msgid "hw address type `%s' has no handler to set address. failed.\n"
+++msgstr ""
++ 
++-#: ../ifconfig.c:288
++-msgid "PROMISC "
++-msgstr "PROMISC "
+++#: ../ifconfig.c:693
+++#, c-format
+++msgid "%s: invalid %s address.\n"
+++msgstr "%s: adresse %s invalide.\n"
++ 
++-#: ../ifconfig.c:290
++-msgid "ALLMULTI "
++-msgstr "ALLMULTI "
++-
++-#: ../ifconfig.c:292
++-msgid "SLAVE "
++-msgstr "SLAVE "
++-
++-#: ../ifconfig.c:294
++-msgid "MASTER "
++-msgstr "MASTER "
++-
++-#: ../ifconfig.c:296
++-msgid "MULTICAST "
++-msgstr "MULTICAST "
++-
++-#: ../ifconfig.c:299
++-msgid "DYNAMIC "
++-msgstr "DYNAMIC "
++-
++-#: ../ifconfig.c:302
++-#, c-format
++-msgid " MTU:%d  Metric:%d"
++-msgstr " MTU:%d  Metric:%d"
++-
++-#: ../ifconfig.c:306
++-#, c-format
++-msgid "  Outfill:%d  Keepalive:%d"
++-msgstr "  Outfill:%d  Keepalive:%d"
++-
++-#: ../ifconfig.c:320
++-#, c-format
++-msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
++-msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n"
++-
++-#: ../ifconfig.c:325
++-#, c-format
++-msgid "             compressed:%lu\n"
++-msgstr "             compressés:%lu\n"
++-
++-#: ../ifconfig.c:329
++-#, c-format
++-msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
++-msgstr ""
++-"Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n"
++-
++-#: ../ifconfig.c:333
+++#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913
++ #, c-format
++-msgid "          collisions:%lu "
++-msgstr "          collisions:%lu "
++-
++-#: ../ifconfig.c:335
++-#, c-format
++-msgid "compressed:%lu "
++-msgstr "compressés:%lu "
++-
++-#: ../ifconfig.c:337
++-#, c-format
++-msgid "txqueuelen:%d "
++-msgstr "lg file transmission:%d "
++-
++-#: ../ifconfig.c:345
++-#, c-format
++-msgid "Interrupt:%d "
++-msgstr "Interruption:%d "
++-
++-#. Only print devices using it for
++-#. I/O maps
++-#: ../ifconfig.c:348
++-#, c-format
++-msgid "Base address:0x%x "
++-msgstr "Adresse de base:0x%x "
++-
++-#: ../ifconfig.c:350
++-#, c-format
++-msgid "Memory:%lx-%lx "
++-msgstr "Mémoire:%lx-%lx "
++-
++-#: ../ifconfig.c:353
++-#, c-format
++-msgid "DMA chan:%x "
++-msgstr "Canal DMA:%x "
+++msgid "No support for INET6 on this system.\n"
+++msgstr "Pas de support de INET6 sur ce système.\n"
++ 
++-#: ../ifconfig.c:384 ../ifconfig.c:405
+++#: ../ifconfig.c:780 ../ifconfig.c:871
++ #, c-format
++-msgid "%s: unknown interface: %s\n"
++-msgstr "%s: interface inconnue: %s\n"
++-
++-#: ../ifconfig.c:421
++-msgid ""
++-"Usage:\n"
++-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
++-msgstr ""
++-"Syntaxe:\n"
++-"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n"
++-
++-#: ../ifconfig.c:425
++-msgid "  [add <address>[/<prefixlen>]]\n"
++-msgstr "  [add <adresse>[/<lg_prefixe>]]\n"
++-
++-#: ../ifconfig.c:427
++-msgid "  [del <address>[/<prefixlen>]]\n"
++-msgstr "  [del <adresse>[/<lg_prefixe>]]\n"
++-
++-#: ../ifconfig.c:432
++-msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
++-msgstr "  [[-]broadcast [<adresse>]]  [[-]pointopoint [<adresse>]]\n"
++-
++-#: ../ifconfig.c:433
++-#, fuzzy
++-msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
++-msgstr "  [netmask <adresse>]  [dstaddr <adresse>]  [tunnel <adresse>]\n"
++-
++-#: ../ifconfig.c:436
++-msgid "  [outfill <NN>] [keepalive <NN>]\n"
++-msgstr "  [outfill <NN>] [keepalive <NN>]\n"
++-
++-#: ../ifconfig.c:438
++-msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
++-msgstr "  [hw <HW> <adresse>]  [metric <NN>]  [mtu <NN>]\n"
++-
++-#: ../ifconfig.c:439
++-msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
++-
++-#: ../ifconfig.c:440
++-msgid "  [multicast]  [[-]promisc]\n"
++-msgstr "  [multicast]  [[-]promisc]\n"
++-
++-#: ../ifconfig.c:441
++-msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++-msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
++-
++-#: ../ifconfig.c:443
++-#, fuzzy
++-msgid "  [txqueuelen <NN>]\n"
++-msgstr "  [txqueuelen longueur]\n"
++-
++-#: ../ifconfig.c:446
++-msgid "  [[-]dynamic]\n"
++-msgstr "  [[-]dynamic]\n"
++-
++-#: ../ifconfig.c:448
++-msgid ""
++-"  [up|down] ...\n"
++-"\n"
+++msgid "Interface %s not initialized\n"
++ msgstr ""
++-"  [up|down] ...\n"
++-"\n"
++-
++-#: ../ifconfig.c:450
++-msgid "  <HW>=Hardware Type.\n"
++-msgstr "  <HW>=Type de matériel.\n"
++-
++-#: ../ifconfig.c:451
++-msgid "  List of possible hardware types:\n"
++-msgstr "  Liste des types de matériels possibles:\n"
++-
++-#. 1 = ARPable
++-#: ../ifconfig.c:453
++-#, c-format
++-msgid "  <AF>=Address family. Default: %s\n"
++-msgstr "  <AF>=famille d'Adresses. Défaut: %s\n"
++-
++-#: ../ifconfig.c:454
++-msgid "  List of possible address families:\n"
++-msgstr "  Liste des familles d'adresses possibles:\n"
++-
++-#: ../ifconfig.c:593
++-msgid "Unknown media type.\n"
++-msgstr "Type de média inconnu.\n"
++ 
++-#: ../ifconfig.c:881
++-#, c-format
++-msgid "%s: invalid %s address.\n"
+++#: ../ifconfig.c:792 ../ifconfig.c:882
+++#, fuzzy, c-format
+++msgid "Bad address.\n"
++ msgstr "%s: adresse %s invalide.\n"
++ 
++-#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
++-msgid "No support for INET6 on this system.\n"
++-msgstr "Pas de support de INET6 sur ce système.\n"
++-
++-#: ../ifconfig.c:983
+++#: ../ifconfig.c:885
+++#, c-format
++ msgid "Address deletion not supported on this system.\n"
++ msgstr "Suppression d'adresses pas supporté par ce système.\n"
++ 
++-#: ../ifconfig.c:1066
++-msgid "No support for INET on this system.\n"
++-msgstr "Pas de support de INET sur ce système.\n"
+++#: ../ifconfig.c:957
+++#, fuzzy, c-format
+++msgid "ifconfig: Cannot set address for this protocol family.\n"
+++msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n"
++ 
++-#: ../ifconfig.c:1076
+++#: ../ifconfig.c:983
+++#, c-format
++ msgid "No support for ECONET on this system.\n"
++ msgstr "Pas de support de ECONET sur ce système.\n"
++ 
++-#: ../ifconfig.c:1084
+++#: ../ifconfig.c:991
++ #, c-format
++ msgid "Don't know how to set addresses for family %d.\n"
++ msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n"
++ 
++-#: ../netstat.c:383
+++#: ../ifconfig.c:1021
+++#, c-format
+++msgid "WARNING: at least one error occured. (%d)\n"
+++msgstr ""
+++
+++#: ../netstat.c:434
++ #, c-format
++ msgid ""
++ "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
++-msgstr ""
++-"(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez être root.)\n"
+++msgstr "(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez être root.)\n"
++ 
++-#: ../netstat.c:387
+++#: ../netstat.c:438
+++#, c-format
++ msgid ""
++ "(Not all processes could be identified, non-owned process info\n"
++ " will not be shown, you would have to be root to see it all.)\n"
++ msgstr ""
++ "(Tous les processus ne peuvent être identifiés, les infos sur les processus\n"
++-"non possédés ne seront pas affichées, vous devez être root pour les voir "
++-"toutes.)\n"
+++"non possédés ne seront pas affichées, vous devez être root pour les voir toutes.)\n"
++ 
++-#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
+++#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
++ msgid "LISTENING"
++ msgstr "LISTENING"
++ 
++-#: ../netstat.c:395
+++#: ../netstat.c:446
++ msgid "CONN SENT"
++ msgstr "CONN SENT"
++ 
++-#: ../netstat.c:396 ../netstat.c:1168
+++#: ../netstat.c:447 ../netstat.c:1268
++ msgid "DISC SENT"
++ msgstr "DISC SENT"
++ 
++-#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
+++#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
++ msgid "ESTABLISHED"
++ msgstr "ESTABLISHED"
++ 
++-#: ../netstat.c:419
+++#: ../netstat.c:470
+++#, c-format
++ msgid "Active NET/ROM sockets\n"
++ msgstr "sockets NET/ROM actives\n"
++ 
++-#: ../netstat.c:420
+++#: ../netstat.c:471
+++#, c-format
++ msgid ""
++-"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
++-"Recv-Q\n"
+++"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
+++"Q\n"
++ msgstr ""
++-"Utilisatr  Dest       Source     Periph  Etat         Vr/Vs    Send-Q  "
++-"Recv-Q\n"
+++"Utilisatr  Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-"
+++"Q\n"
++ 
++-#: ../netstat.c:430 ../netstat.c:1208
+++#: ../netstat.c:481 ../netstat.c:1308
++ #, c-format
++ msgid "Problem reading data from %s\n"
++ msgstr ""
++ 
++-#: ../netstat.c:465
+++#: ../netstat.c:516
++ msgid "SYN_SENT"
++ msgstr "SYN_SENT"
++ 
++-#: ../netstat.c:466
+++#: ../netstat.c:517
++ msgid "SYN_RECV"
++ msgstr "SYN_RECV"
++ 
++-#: ../netstat.c:467
+++#: ../netstat.c:518
++ msgid "FIN_WAIT1"
++ msgstr "FIN_WAIT1"
++ 
++-#: ../netstat.c:468
+++#: ../netstat.c:519
++ msgid "FIN_WAIT2"
++ msgstr "FIN_WAIT2"
++ 
++-#: ../netstat.c:469
+++#: ../netstat.c:520
++ msgid "TIME_WAIT"
++ msgstr "TIME_WAIT"
++ 
++-#: ../netstat.c:470
+++#: ../netstat.c:521
++ msgid "CLOSE"
++ msgstr "CLOSE"
++ 
++-#: ../netstat.c:471
+++#: ../netstat.c:522
++ msgid "CLOSE_WAIT"
++ msgstr "CLOSE_WAIT"
++ 
++-#: ../netstat.c:472
+++#: ../netstat.c:523
++ msgid "LAST_ACK"
++ msgstr "LAST_ACK"
++ 
++-#: ../netstat.c:473
+++#: ../netstat.c:524
++ msgid "LISTEN"
++ msgstr "LISTEN"
++ 
++-#: ../netstat.c:474
+++#: ../netstat.c:525
++ msgid "CLOSING"
++ msgstr "CLOSING"
++ 
++-#: ../netstat.c:544
+++#: ../netstat.c:596
++ #, c-format
++ msgid "warning, got bogus igmp6 line %d.\n"
++ msgstr "attention, ligne igmp6 en erreur %d.\n"
++ 
++-#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
++-#: ../netstat.c:935 ../netstat.c:940
+++#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
+++#: ../netstat.c:1032 ../netstat.c:1037
++ #, c-format
++ msgid "netstat: unsupported address family %d !\n"
++ msgstr "netstat: famille d'adresses pas supportée %d !\n"
++ 
++-#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
+++#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
++ #, c-format
++ msgid "warning, got bogus igmp line %d.\n"
++ msgstr "attention, ligne igmp6 en erreur %d.\n"
++ 
++-#: ../netstat.c:666
+++#: ../netstat.c:677
+++#, fuzzy, c-format
+++msgid "Active X.25 sockets\n"
+++msgstr "Sockets AX.25 actives\n"
+++
+++#. IMHO, Vr/Vs is not very usefull --SF
+++#: ../netstat.c:679
+++#, fuzzy, c-format
+++msgid ""
+++"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
+++"Q\n"
+++msgstr "Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-Q\n"
+++
+++#: ../netstat.c:759
+++#, c-format
++ msgid "warning, got bogus tcp line.\n"
++ msgstr "attention, ligne tcp en erreur.\n"
++ 
++-#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
+++#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
++ #, c-format
++ msgid "off (0.00/%ld/%d)"
++ msgstr "off (0.00/%ld/%d)"
++ 
++-#: ../netstat.c:708
+++#: ../netstat.c:804
++ #, fuzzy, c-format
++ msgid "on (%2.2f/%ld/%d)"
++ msgstr "on%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:713
+++#: ../netstat.c:809
++ #, fuzzy, c-format
++ msgid "keepalive (%2.2f/%ld/%d)"
++ msgstr "on%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:718
+++#: ../netstat.c:814
++ #, fuzzy, c-format
++ msgid "timewait (%2.2f/%ld/%d)"
++ msgstr "on%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
+++#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
++ #, c-format
++ msgid "unkn-%d (%2.2f/%ld/%d)"
++ msgstr "unkn-%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:799
+++#: ../netstat.c:894
+++#, c-format
++ msgid "warning, got bogus udp line.\n"
++ msgstr "attention, ligne udp en erreur.\n"
++ 
++-#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
+++#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
++ msgid "UNKNOWN"
++ msgstr "INCONNU"
++ 
++-#: ../netstat.c:860 ../netstat.c:980
+++#: ../netstat.c:958 ../netstat.c:1080
++ #, c-format
++ msgid "on%d (%2.2f/%ld/%d)"
++ msgstr "on%d (%2.2f/%ld/%d)"
++ 
++-#: ../netstat.c:949
+++#: ../netstat.c:1046
+++#, c-format
++ msgid "warning, got bogus raw line.\n"
++ msgstr "attention, ligne raw en erreur.\n"
++ 
++-#: ../netstat.c:1028
+++#: ../netstat.c:1128
+++#, c-format
++ msgid "warning, got bogus unix line.\n"
++ msgstr "attention, ligne unix en erreur.\n"
++ 
++-#: ../netstat.c:1055
+++#: ../netstat.c:1155
++ msgid "STREAM"
++ msgstr "STREAM"
++ 
++-#: ../netstat.c:1059
+++#: ../netstat.c:1159
++ msgid "DGRAM"
++ msgstr "DGRAM"
++ 
++-#: ../netstat.c:1063
+++#: ../netstat.c:1163
++ msgid "RAW"
++ msgstr "RAW"
++ 
++-#: ../netstat.c:1067
+++#: ../netstat.c:1167
++ msgid "RDM"
++ msgstr "RDM"
++ 
++-#: ../netstat.c:1071
+++#: ../netstat.c:1171
++ msgid "SEQPACKET"
++ msgstr "SEQPACKET"
++ 
++-#: ../netstat.c:1080
+++#: ../netstat.c:1180
++ msgid "FREE"
++ msgstr "LIBRE"
++ 
++-#: ../netstat.c:1096
+++#: ../netstat.c:1196
++ msgid "CONNECTING"
++ msgstr "ENCONNEXION"
++ 
++-#: ../netstat.c:1100
+++#: ../netstat.c:1200
++ msgid "CONNECTED"
++ msgstr "CONNECTE"
++ 
++-#: ../netstat.c:1104
+++#: ../netstat.c:1204
++ msgid "DISCONNECTING"
++ msgstr "ENDECONNEXION"
++ 
++-#: ../netstat.c:1135
+++#: ../netstat.c:1235
+++#, c-format
++ msgid "Active UNIX domain sockets "
++ msgstr "Sockets du domaine UNIX actives"
++ 
++-#: ../netstat.c:1137 ../netstat.c:1666
+++#: ../netstat.c:1237 ../netstat.c:1756
+++#, c-format
++ msgid "(servers and established)"
++ msgstr "(serveurs et établies)"
++ 
++-#: ../netstat.c:1140 ../netstat.c:1669
+++#: ../netstat.c:1240 ../netstat.c:1759
+++#, c-format
++ msgid "(only servers)"
++ msgstr "(seulement serveurs)"
++ 
++-#: ../netstat.c:1142 ../netstat.c:1671
+++#: ../netstat.c:1242 ../netstat.c:1761
+++#, c-format
++ msgid "(w/o servers)"
++ msgstr "(sans serveurs)"
++ 
++-#: ../netstat.c:1145
+++#: ../netstat.c:1245
+++#, c-format
++ msgid ""
++ "\n"
++ "Proto RefCnt Flags       Type       State         I-Node"
++@@ -994,32 +906,36 @@ msgstr ""
++ "\n"
++ "Proto RefCpt Indicatrs   Type       Etat          I-Node"
++ 
++-#: ../netstat.c:1147
+++#: ../netstat.c:1247
+++#, c-format
++ msgid " Path\n"
++ msgstr " Chemin\n"
++ 
++-#: ../netstat.c:1167
+++#: ../netstat.c:1267
++ msgid "SABM SENT"
++ msgstr "SABM SENT"
++ 
++-#: ../netstat.c:1170
+++#: ../netstat.c:1270
++ msgid "RECOVERY"
++ msgstr "RECOVERY"
++ 
++-#: ../netstat.c:1184
+++#: ../netstat.c:1284
+++#, c-format
++ msgid "Active AX.25 sockets\n"
++ msgstr "Sockets AX.25 actives\n"
++ 
++-#: ../netstat.c:1185
+++#: ../netstat.c:1285
+++#, c-format
++ msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
++ msgstr "Dest       Source     Periph  Etat         Vr/Vs    Send-Q  Recv-Q\n"
++ 
++-#: ../netstat.c:1228
+++#: ../netstat.c:1328
++ #, c-format
++ msgid "problem reading data from %s\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1279
+++#: ../netstat.c:1379
+++#, c-format
++ msgid ""
++ "Active IPX sockets\n"
++ "Proto Recv-Q Send-Q Local Address              Foreign Address            "
++@@ -1029,55 +945,53 @@ msgstr ""
++ "Proto Recv-Q Send-Q Adresse locale             Adresse distante           "
++ "Etat"
++ 
++-#: ../netstat.c:1281
+++#: ../netstat.c:1381
+++#, c-format
++ msgid " User"
++ msgstr "Utilisatr"
++ 
++-#: ../netstat.c:1315
+++#: ../netstat.c:1415
++ msgid "ESTAB"
++ msgstr "ESTAB"
++ 
++-#: ../netstat.c:1323
+++#: ../netstat.c:1423
++ msgid "UNK."
++ msgstr "UNK."
++ 
++-#: ../netstat.c:1367
++-msgid "     - no statistics available -"
++-msgstr ""
++-
++-#: ../netstat.c:1370
++-msgid "[NO FLAGS]"
++-msgstr "[PAS INDICATEURS]"
++-
++-#: ../netstat.c:1400
+++#: ../netstat.c:1461
+++#, c-format
++ msgid "Kernel Interface table\n"
++ msgstr "Table d'interfaces noyau\n"
++ 
++-#: ../netstat.c:1401
+++#: ../netstat.c:1465
+++#, fuzzy, c-format
++ msgid ""
++-"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
+++"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Flg\n"
++ msgstr ""
++ "Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
++ "Indic\n"
++ 
++-#: ../netstat.c:1404
+++#: ../netstat.c:1469
++ msgid "missing interface information"
++ msgstr "informations d'interface manquantes"
++ 
++-#: ../netstat.c:1425
+++#: ../netstat.c:1492
+++#, c-format
++ msgid ""
++-"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ msgstr ""
++-"syntaxe: netstat [-veenNcCF] [<Af>] -r         netstat "
++-"{-V|--version|-h|--help}\n"
+++"syntaxe: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
+++"help}\n"
++ 
++-#: ../netstat.c:1426
+++#: ../netstat.c:1493
+++#, c-format
++ msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ msgstr "       netstat [-vnNcaeol] [<Socket> ...]\n"
++ 
++-#: ../netstat.c:1427
+++#: ../netstat.c:1494
+++#, c-format
++ msgid ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++@@ -1085,27 +999,30 @@ msgstr ""
++ "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
++ "\n"
++ 
++-#: ../netstat.c:1429
+++#: ../netstat.c:1496
+++#, c-format
++ msgid "        -r, --route              display routing table\n"
++ msgstr "        -r, --route              affiche la table de routage\n"
++ 
++-#: ../netstat.c:1430
+++#: ../netstat.c:1497
+++#, c-format
++ msgid "        -i, --interfaces         display interface table\n"
++ msgstr "        -i, --interfaces         affiche la table d'interfaces\n"
++ 
++-#: ../netstat.c:1431
+++#: ../netstat.c:1498
+++#, c-format
++ msgid "        -g, --groups             display multicast group memberships\n"
++ msgstr ""
++ "        -g, --groups             affiche les membres d'un groupe multicast\n"
++ 
++-#: ../netstat.c:1432
+++#: ../netstat.c:1499
+++#, c-format
++ msgid ""
++ "        -s, --statistics         display networking statistics (like SNMP)\n"
++-msgstr ""
++-"        -s, --statistics         affiche les statistiques réseau (comme "
++-"SNMP)\n"
+++msgstr "        -s, --statistics         affiche les statistiques réseau (comme SNMP)\n"
++ 
++-#: ../netstat.c:1434
+++#: ../netstat.c:1501
+++#, c-format
++ msgid ""
++ "        -M, --masquerade         display masqueraded connections\n"
++ "\n"
++@@ -1113,23 +1030,41 @@ msgstr ""
++ "        -M, --masquerade         affiche les connexions masquées\n"
++ "\n"
++ 
++-#: ../netstat.c:1438 ../route.c:87
+++#: ../netstat.c:1505
+++#, fuzzy, c-format
+++msgid "        --numeric-hosts          don't resolve host names\n"
+++msgstr "        -n, --numeric            ne résout pas les noms\n"
+++
+++#: ../netstat.c:1506
+++#, fuzzy, c-format
+++msgid "        --numeric-ports          don't resolve port names\n"
+++msgstr "        -n, --numeric            ne résout pas les noms\n"
+++
+++#: ../netstat.c:1507
+++#, fuzzy, c-format
+++msgid "        --numeric-users          don't resolve user names\n"
+++msgstr "        -n, --numeric            ne résout pas les noms\n"
+++
+++#: ../netstat.c:1508
+++#, c-format
++ msgid "        -N, --symbolic           resolve hardware names\n"
++ msgstr "        -N, --symbolic           résoud les noms matériels\n"
++ 
++-#: ../netstat.c:1439 ../route.c:88
++-#, fuzzy
+++#: ../netstat.c:1509 ../route.c:88
+++#, fuzzy, c-format
++ msgid "        -e, --extend             display other/more information\n"
++ msgstr ""
++ "        -e, --extend             affiche d'autres/plus d'informations\n"
++ 
++-#: ../netstat.c:1440
+++#: ../netstat.c:1510
+++#, c-format
++ msgid "        -p, --programs           display PID/Program name for sockets\n"
++ msgstr ""
++ "        -p, --programs           affiche le nom du programme/PID des "
++ "sockets\n"
++ 
++-#: ../netstat.c:1441
+++#: ../netstat.c:1511
+++#, c-format
++ msgid ""
++ "        -c, --continuous         continuous listing\n"
++ "\n"
++@@ -1137,32 +1072,31 @@ msgstr ""
++ "        -c, --continuous         listing continu\n"
++ "\n"
++ 
++-#: ../netstat.c:1442
+++#: ../netstat.c:1512
+++#, c-format
++ msgid "        -l, --listening          display listening server sockets\n"
++-msgstr ""
++-"        -l, --listening          affiche les sockets du serveur à l'écoute\n"
+++msgstr "        -l, --listening          affiche les sockets du serveur à l'écoute\n"
++ 
++-#: ../netstat.c:1443
+++#: ../netstat.c:1513
+++#, c-format
++ msgid ""
++ "        -a, --all, --listening   display all sockets (default: connected)\n"
++-msgstr ""
++-"        -a, --all, --listening   affiche toutes les prises (défaut: "
++-"connectés)\n"
+++msgstr "        -a, --all, --listening   affiche toutes les prises (défaut: connectés)\n"
++ 
++-#: ../netstat.c:1444
+++#: ../netstat.c:1514
+++#, c-format
++ msgid "        -o, --timers             display timers\n"
++ msgstr "        -o, --timers             affiche les timers\n"
++ 
++-#: ../netstat.c:1445 ../route.c:89
++-#, fuzzy
+++#: ../netstat.c:1515 ../route.c:89
+++#, fuzzy, c-format
++ msgid ""
++ "        -F, --fib                display Forwarding Information Base "
++ "(default)\n"
++-msgstr ""
++-"        -F, --fib                affiche la Forwarding Infomation Base "
++-"(défaut)\n"
+++msgstr "        -F, --fib                affiche la Forwarding Infomation Base (défaut)\n"
++ 
++-#: ../netstat.c:1446 ../route.c:90
+++#: ../netstat.c:1516 ../route.c:90
+++#, c-format
++ msgid ""
++ "        -C, --cache              display routing cache instead of FIB\n"
++ "\n"
++@@ -1170,110 +1104,118 @@ msgstr ""
++ "        -C, --cache              affiche le cache de routage au lieu de FIB\n"
++ "\n"
++ 
++-#: ../netstat.c:1448
+++#: ../netstat.c:1518
+++#, c-format
++ msgid ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ msgstr ""
++-"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
++-"--netrom\n"
+++"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
+++"netrom\n"
++ 
++-#: ../netstat.c:1449 ../route.c:92
++-#, c-format
++-msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
+++#: ../netstat.c:1519
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
++ msgstr "  <AF>=Utiliser '-A <af>' ou '--<af>' Défaut: %s\n"
++ 
++-#: ../netstat.c:1450 ../route.c:93
+++#: ../netstat.c:1520 ../route.c:93
+++#, c-format
++ msgid "  List of possible address families (which support routing):\n"
++ msgstr "  Liste les familles d'adresses possibles (supportant le routage):\n"
++ 
++-#: ../netstat.c:1663
+++#: ../netstat.c:1753
+++#, c-format
++ msgid "Active Internet connections "
++ msgstr "Connexions Internet actives "
++ 
++-#: ../netstat.c:1673
+++#: ../netstat.c:1763
+++#, c-format
++ msgid ""
++ "\n"
++-"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
++-"  "
+++"Proto Recv-Q Send-Q Local Address           Foreign Address         "
+++"State      "
++ msgstr ""
++ "\n"
++-"Proto Recv-Q Send-Q Adresse locale          Adresse distante        Etat     "
++-"  "
+++"Proto Recv-Q Send-Q Adresse locale          Adresse distante        "
+++"Etat       "
++ 
++-#: ../netstat.c:1675
+++#: ../netstat.c:1765
+++#, c-format
++ msgid " User       Inode     "
++ msgstr " Utilisatr  Inode     "
++ 
++-#: ../netstat.c:1678
+++#: ../netstat.c:1768
+++#, c-format
++ msgid " Timer"
++ msgstr " Timer"
++ 
++-#: ../netstat.c:1708
+++#: ../netstat.c:1798
+++#, c-format
++ msgid "IPv4 Group Memberships\n"
++ msgstr ""
++ 
++-#: ../netstat.c:1709
+++#: ../netstat.c:1799
+++#, c-format
++ msgid "Interface       RefCnt Group\n"
++ msgstr ""
++ 
++-#: ../rarp.c:43
+++#: ../rarp.c:44
++ msgid "This kernel does not support RARP.\n"
++ msgstr "Ce noyau ne supporte pas RARP.\n"
++ 
++-#: ../rarp.c:82
+++#: ../rarp.c:83
++ #, c-format
++ msgid "no RARP entry for %s.\n"
++ msgstr "pas d'entrée RARP pour %s.\n"
++ 
++-#: ../rarp.c:95
+++#: ../rarp.c:96
++ #, c-format
++ msgid "%s: bad hardware address\n"
++ msgstr "%s: mauvaise adresse matériel\n"
++ 
++-#: ../rarp.c:127
+++#: ../rarp.c:128
++ #, c-format
++ msgid "rarp: cannot open file %s:%s.\n"
++ msgstr "rarp: ne peut ouvrir le fichier %s:%s.\n"
++ 
++-#: ../rarp.c:139
+++#: ../rarp.c:140
++ #, c-format
++ msgid "rarp: format error at %s:%u\n"
++ msgstr "rarp: erreur de format à %s:%u\n"
++ 
++-#: ../rarp.c:143 ../rarp.c:287
+++#: ../rarp.c:144 ../rarp.c:289
++ #, c-format
++ msgid "rarp: %s: unknown host\n"
++ msgstr "rarp: %s: hôte inconnu\n"
++ 
++-#: ../rarp.c:146
+++#: ../rarp.c:147
++ #, c-format
++ msgid "rarp: cannot set entry from %s:%u\n"
++ msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n"
++ 
++-#: ../rarp.c:175
+++#: ../rarp.c:176
+++#, c-format
++ msgid "Usage: rarp -a                               list entries in cache.\n"
++-msgstr ""
++-"Usage: rarp -a                               liste les entrées en cache.\n"
+++msgstr "Usage: rarp -a                               liste les entrées en cache.\n"
++ 
++-#: ../rarp.c:176
+++#: ../rarp.c:177
+++#, c-format
++ msgid "       rarp -d <hostname>                    delete entry from cache.\n"
++-msgstr ""
++-"       rarp -d <hostname>                    supprime l'entrée du cache.\n"
+++msgstr "       rarp -d <hostname>                    supprime l'entrée du cache.\n"
++ 
++-#: ../rarp.c:177
+++#: ../rarp.c:178
+++#, c-format
++ msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
++-msgstr ""
++-"       rarp [<HW>] -s <hostname> <adrmat>    ajoute l'entrée au cache.\n"
+++msgstr "       rarp [<HW>] -s <hostname> <adrmat>    ajoute l'entrée au cache.\n"
++ 
++-#: ../rarp.c:178
+++#: ../rarp.c:179
+++#, c-format
++ msgid ""
++ "       rarp -f                               add entries from /etc/ethers.\n"
++-msgstr ""
++-"       rarp -f                               ajoute les entrées depuis "
++-"/etc/ethers.\n"
+++msgstr "       rarp -f                               ajoute les entrées depuis /etc/ethers.\n"
++ 
++-#: ../rarp.c:179
+++#: ../rarp.c:180
+++#, c-format
++ msgid ""
++ "       rarp -V                               display program version.\n"
++ "\n"
++@@ -1281,24 +1223,26 @@ msgstr ""
++ "       rarp -V                               affiche la version.\n"
++ "\n"
++ 
++-#: ../rarp.c:236
+++#: ../rarp.c:238
++ #, c-format
++ msgid "%s: illegal option mix.\n"
++ msgstr "%s: combinaison d'options illégales.\n"
++ 
++-#: ../rarp.c:267
+++#: ../rarp.c:269
++ #, c-format
++ msgid "rarp: %s: unknown hardware type.\n"
++ msgstr "rarp: %s: type de matériel inconnu.\n"
++ 
++-#: ../route.c:79
+++#: ../route.c:80
+++#, c-format
++ msgid ""
++ "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
++ msgstr ""
++ "Syntaxe: route [-nNvee] [-FC] [<AF>]           Liste les tables de routage "
++ "noyau\n"
++ 
++-#: ../route.c:80
+++#: ../route.c:81
+++#, c-format
++ msgid ""
++ "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
++ "\n"
++@@ -1307,15 +1251,15 @@ msgstr ""
++ "pour AF.\n"
++ "\n"
++ 
++-#: ../route.c:82
+++#: ../route.c:83
+++#, c-format
++ msgid ""
++ "       route {-h|--help} [<AF>]              Detailed usage syntax for "
++ "specified AF.\n"
++-msgstr ""
++-"       route {-h|--help} [<AF>]              Utilisation détaillée pour l'AF "
++-"spécifié.\n"
+++msgstr "       route {-h|--help} [<AF>]              Utilisation détaillée pour l'AF spécifié.\n"
++ 
++-#: ../route.c:83
+++#: ../route.c:84
+++#, c-format
++ msgid ""
++ "       route {-V|--version}                  Display version/author and "
++ "exit.\n"
++@@ -1325,16 +1269,23 @@ msgstr ""
++ "termine.\n"
++ "\n"
++ 
+++#: ../route.c:92
+++#, fuzzy, c-format
+++msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
+++msgstr "  <AF>=Utiliser '-A <af>' ou '--<af>' Défaut: %s\n"
+++
++ #: ../plipconfig.c:66
+++#, c-format
++ msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
++ msgstr "Syntaxe: plipconfig [-a] [-i] [-v] interface\n"
++ 
++ #: ../plipconfig.c:67
+++#, c-format
++ msgid "                  [nibble NN] [trigger NN]\n"
++ msgstr "                  [nibble NN] [trigger NN]\n"
++ 
++ #: ../plipconfig.c:68
++-#, fuzzy
+++#, fuzzy, c-format
++ msgid "       plipconfig -V | --version\n"
++ msgstr "       plipconfig -V\n"
++ 
++@@ -1343,474 +1294,763 @@ msgstr "       plipconfig -V\n"
++ msgid "%s\tnibble %lu  trigger %lu\n"
++ msgstr "%s\tnibble %lu  trigger %lu\n"
++ 
++-#: ../iptunnel.c:79
+++#: ../iptunnel.c:85
+++#, c-format
++ msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:80
+++#: ../iptunnel.c:86
+++#, c-format
++ msgid ""
++ "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:81
+++#: ../iptunnel.c:87
+++#, c-format
++ msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:82
+++#: ../iptunnel.c:88
+++#, c-format
++ msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:83
+++#: ../iptunnel.c:89
+++#, c-format
++ msgid ""
++ "       iptunnel -V | --version\n"
++ "\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:84
+++#: ../iptunnel.c:90
+++#, c-format
++ msgid "Where: NAME := STRING\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:85
+++#: ../iptunnel.c:91
+++#, c-format
++ msgid "       ADDR := { IP_ADDRESS | any }\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:86
+++#: ../iptunnel.c:92
+++#, c-format
++ msgid "       TOS  := { NUMBER | inherit }\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:87
+++#: ../iptunnel.c:93
+++#, c-format
++ msgid "       TTL  := { 1..255 | inherit }\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:88
+++#: ../iptunnel.c:94
+++#, c-format
++ msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:326
+++#: ../iptunnel.c:332
+++#, c-format
++ msgid "Keys are not allowed with ipip and sit.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:346
+++#: ../iptunnel.c:352
+++#, c-format
++ msgid "Broadcast tunnel requires a source address.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:361
+++#: ../iptunnel.c:367
+++#, c-format
++ msgid "ttl != 0 and noptmudisc are incompatible\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:373
+++#: ../iptunnel.c:379
+++#, c-format
++ msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:411
+++#: ../iptunnel.c:417
++ #, c-format
++ msgid "%s: %s/ip  remote %s  local %s "
++ msgstr ""
++ 
++-#: ../iptunnel.c:415
+++#: ../iptunnel.c:421
++ #, fuzzy
++ msgid "unknown"
++ msgstr "Inconnu"
++ 
++-#: ../iptunnel.c:447
+++#: ../iptunnel.c:453
+++#, c-format
++ msgid "  Drop packets out of sequence.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:449
+++#: ../iptunnel.c:455
+++#, c-format
++ msgid "  Checksum in received packet is required.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:451
+++#: ../iptunnel.c:457
+++#, c-format
++ msgid "  Sequence packets on output.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:453
+++#: ../iptunnel.c:459
+++#, c-format
++ msgid "  Checksum output packets.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:481
+++#: ../iptunnel.c:487
+++#, c-format
++ msgid "Wrong format of /proc/net/dev. Sorry.\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:494
+++#: ../iptunnel.c:500
++ #, c-format
++ msgid "Failed to get type of [%s]\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:510
+++#: ../iptunnel.c:516
+++#, c-format
++ msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
++ msgstr ""
++ 
++-#: ../iptunnel.c:513
+++#: ../iptunnel.c:519
+++#, c-format
++ msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
++ msgstr ""
++ 
++-#: ../statistics.c:45
+++#: ../statistics.c:47
++ msgid "ICMP input histogram:"
++ msgstr "Histogramme d'entrée ICMP"
++ 
++-#: ../statistics.c:46
+++#: ../statistics.c:48
++ msgid "ICMP output histogram:"
++ msgstr "Histogramme de sortie ICMP"
++ 
++-#: ../statistics.c:63
+++#: ../statistics.c:65
++ #, c-format
++ msgid "Forwarding is %s"
++ msgstr "Réacheminement est %s"
++ 
++-#: ../statistics.c:64
++-#, c-format
++-msgid "Default TTL is %d"
+++#: ../statistics.c:66
+++#, fuzzy, c-format
+++msgid "Default TTL is %u"
++ msgstr "TTL par défaut est %d"
++ 
++-#: ../statistics.c:65
++-#, c-format
++-msgid "%d total packets received"
+++#: ../statistics.c:67
+++#, fuzzy, c-format
+++msgid "%u total packets received"
++ msgstr "%d paquets totaux reçus"
++ 
++-#: ../statistics.c:66
++-#, c-format
++-msgid "%d with invalid headers"
+++#: ../statistics.c:68
+++#, fuzzy, c-format
+++msgid "%u with invalid headers"
++ msgstr "%d avec en-tête invalides"
++ 
++-#: ../statistics.c:67
++-#, c-format
++-msgid "%d with invalid addresses"
+++#: ../statistics.c:69
+++#, fuzzy, c-format
+++msgid "%u with invalid addresses"
++ msgstr "%d avec adresses invalides"
++ 
++-#: ../statistics.c:68
++-#, c-format
++-msgid "%d forwarded"
+++#: ../statistics.c:70
+++#, fuzzy, c-format
+++msgid "%u forwarded"
++ msgstr "%d réacheminées"
++ 
++-#: ../statistics.c:69
++-#, c-format
++-msgid "%d with unknown protocol"
+++#: ../statistics.c:71
+++#, fuzzy, c-format
+++msgid "%u with unknown protocol"
++ msgstr "%d avec protocole inconnu"
++ 
++-#: ../statistics.c:70
++-#, c-format
++-msgid "%d incoming packets discarded"
+++#: ../statistics.c:72
+++#, fuzzy, c-format
+++msgid "%u incoming packets discarded"
++ msgstr "%d paquets entrant jetés"
++ 
++-#: ../statistics.c:71
++-#, c-format
++-msgid "%d incoming packets delivered"
+++#: ../statistics.c:73
+++#, fuzzy, c-format
+++msgid "%u incoming packets delivered"
++ msgstr "%d paquets entrant délivrés"
++ 
++-#: ../statistics.c:72
++-#, c-format
++-msgid "%d requests sent out"
+++#: ../statistics.c:74
+++#, fuzzy, c-format
+++msgid "%u requests sent out"
++ msgstr "%d requêtes envoyées"
++ 
++ #. ?
++-#: ../statistics.c:73
++-#, c-format
++-msgid "%d outgoing packets dropped"
+++#: ../statistics.c:75
+++#, fuzzy, c-format
+++msgid "%u outgoing packets dropped"
++ msgstr "%d paquets sortant jetés"
++ 
++-#: ../statistics.c:74
++-#, c-format
++-msgid "%d dropped because of missing route"
+++#: ../statistics.c:76
+++#, fuzzy, c-format
+++msgid "%u dropped because of missing route"
++ msgstr "%d jetés pour cause de route manquante"
++ 
++-#: ../statistics.c:75
++-#, c-format
++-msgid "%d fragments dropped after timeout"
+++#: ../statistics.c:77
+++#, fuzzy, c-format
+++msgid "%u fragments dropped after timeout"
++ msgstr "%d fragments jetés après timeout"
++ 
++-#: ../statistics.c:76
++-#, c-format
++-msgid "%d reassemblies required"
+++#: ../statistics.c:78
+++#, fuzzy, c-format
+++msgid "%u reassemblies required"
++ msgstr "%d nécessitant un réassemblage"
++ 
++ #. ?
++-#: ../statistics.c:77
++-#, c-format
++-msgid "%d packets reassembled ok"
+++#: ../statistics.c:79
+++#, fuzzy, c-format
+++msgid "%u packets reassembled ok"
++ msgstr "%d paquets réassemblés correctement"
++ 
++-#: ../statistics.c:78
++-#, c-format
++-msgid "%d packet reassembles failed"
+++#: ../statistics.c:80
+++#, fuzzy, c-format
+++msgid "%u packet reassembles failed"
++ msgstr "%d paquets mal réassemblés"
++ 
++-#: ../statistics.c:79
++-#, c-format
++-msgid "%d fragments received ok"
+++#: ../statistics.c:81
+++#, fuzzy, c-format
+++msgid "%u fragments received ok"
++ msgstr "%d fragments reçus correctement"
++ 
++-#: ../statistics.c:80
++-#, c-format
++-msgid "%d fragments failed"
+++#: ../statistics.c:82
+++#, fuzzy, c-format
+++msgid "%u fragments failed"
++ msgstr "%d fragments en échec"
++ 
++-#: ../statistics.c:81
++-#, c-format
++-msgid "%d fragments created"
+++#: ../statistics.c:83
+++#, fuzzy, c-format
+++msgid "%u fragments created"
++ msgstr "%d fragments créés"
++ 
++-#: ../statistics.c:86
++-#, c-format
++-msgid "%d ICMP messages received"
+++#: ../statistics.c:88
+++#, fuzzy, c-format
+++msgid "%u ICMP messages received"
++ msgstr "%d messages ICMP reçus"
++ 
++-#: ../statistics.c:87
++-#, c-format
++-msgid "%d input ICMP message failed."
+++#: ../statistics.c:89
+++#, fuzzy, c-format
+++msgid "%u input ICMP message failed."
++ msgstr "%d messages d'entrée ICMP en échec"
++ 
++-#: ../statistics.c:88 ../statistics.c:101
++-#, c-format
++-msgid "destination unreachable: %d"
+++#: ../statistics.c:90 ../statistics.c:103
+++#, fuzzy, c-format
+++msgid "destination unreachable: %u"
++ msgstr "destination injoignable: %d"
++ 
++-#: ../statistics.c:89
++-#, c-format
++-msgid "timeout in transit: %d"
+++#: ../statistics.c:91
+++#, fuzzy, c-format
+++msgid "timeout in transit: %u"
++ msgstr "timeout en transmission: %d"
++ 
++-#: ../statistics.c:90 ../statistics.c:103
++-#, c-format
++-msgid "wrong parameters: %d"
+++#: ../statistics.c:92 ../statistics.c:105
+++#, fuzzy, c-format
+++msgid "wrong parameters: %u"
++ msgstr "mauvais paramètre: %d"
++ 
++ #. ?
++-#: ../statistics.c:91
++-#, c-format
++-msgid "source quenchs: %d"
+++#: ../statistics.c:93
+++#, fuzzy, c-format
+++msgid "source quenches: %u"
++ msgstr "Source Quenchs: %d"
++ 
++-#: ../statistics.c:92
++-#, c-format
++-msgid "redirects: %d"
+++#: ../statistics.c:94
+++#, fuzzy, c-format
+++msgid "redirects: %u"
++ msgstr "Redirections: %d"
++ 
++-#: ../statistics.c:93
++-#, c-format
++-msgid "echo requests: %d"
+++#: ../statistics.c:95
+++#, fuzzy, c-format
+++msgid "echo requests: %u"
++ msgstr "requêtes echo: %d"
++ 
++-#: ../statistics.c:94 ../statistics.c:107
++-#, c-format
++-msgid "echo replies: %d"
+++#: ../statistics.c:96 ../statistics.c:109
+++#, fuzzy, c-format
+++msgid "echo replies: %u"
++ msgstr "réponses echo: %d"
++ 
++-#: ../statistics.c:95
++-#, c-format
++-msgid "timestamp request: %d"
+++#: ../statistics.c:97
+++#, fuzzy, c-format
+++msgid "timestamp request: %u"
++ msgstr "requêtes datées: %d"
++ 
++-#: ../statistics.c:96
++-#, c-format
++-msgid "timestamp reply: %d"
+++#: ../statistics.c:98
+++#, fuzzy, c-format
+++msgid "timestamp reply: %u"
++ msgstr "réponses datées: %d"
++ 
++-#: ../statistics.c:97
++-#, c-format
++-msgid "address mask request: %d"
+++#: ../statistics.c:99
+++#, fuzzy, c-format
+++msgid "address mask request: %u"
++ msgstr "requêtes de masque d'adresse: %d"
++ 
++ #. ?
++-#: ../statistics.c:98
++-msgid "address mask replies"
++-msgstr "réponses de masque d'adresses"
+++#: ../statistics.c:100 ../statistics.c:113
+++#, fuzzy, c-format
+++msgid "address mask replies: %u"
+++msgstr "réponses de masque d'adresse: %d"
++ 
++ #. ?
++-#: ../statistics.c:99
++-#, c-format
++-msgid "%d ICMP messages sent"
+++#: ../statistics.c:101
+++#, fuzzy, c-format
+++msgid "%u ICMP messages sent"
++ msgstr "%d messages ICMP envoyés"
++ 
++-#: ../statistics.c:100
++-#, c-format
++-msgid "%d ICMP messages failed"
+++#: ../statistics.c:102
+++#, fuzzy, c-format
+++msgid "%u ICMP messages failed"
++ msgstr "%d messages ICMP en échec"
++ 
++-#: ../statistics.c:102
++-#, c-format
++-msgid "time exceeded: %d"
+++#: ../statistics.c:104
+++#, fuzzy, c-format
+++msgid "time exceeded: %u"
++ msgstr "temps dépassé: %d"
++ 
++ #. ?
++-#: ../statistics.c:104
++-#, c-format
++-msgid "source quench: %d"
+++#: ../statistics.c:106
+++#, fuzzy, c-format
+++msgid "source quench: %u"
++ msgstr "Source Quench: %d"
++ 
++-#: ../statistics.c:105
++-#, c-format
++-msgid "redirect: %d"
+++#: ../statistics.c:107
+++#, fuzzy, c-format
+++msgid "redirect: %u"
++ msgstr "redirection: %d"
++ 
++-#: ../statistics.c:106
++-#, c-format
++-msgid "echo request: %d"
+++#: ../statistics.c:108
+++#, fuzzy, c-format
+++msgid "echo request: %u"
++ msgstr "requête echo: %d"
++ 
++-#: ../statistics.c:108
++-#, c-format
++-msgid "timestamp requests: %d"
+++#: ../statistics.c:110
+++#, fuzzy, c-format
+++msgid "timestamp requests: %u"
++ msgstr "requêtes datées: %d"
++ 
++-#: ../statistics.c:109
++-#, c-format
++-msgid "timestamp replies: %d"
+++#: ../statistics.c:111
+++#, fuzzy, c-format
+++msgid "timestamp replies: %u"
++ msgstr "réponses datées: %d"
++ 
++-#: ../statistics.c:110
++-#, c-format
++-msgid "address mask requests: %d"
+++#: ../statistics.c:112
+++#, fuzzy, c-format
+++msgid "address mask requests: %u"
++ msgstr "requêtes de masque d'adresse: %d"
++ 
++-#: ../statistics.c:111
++-#, c-format
++-msgid "address mask replies: %d"
++-msgstr "réponses de masque d'adresse: %d"
++-
++-#: ../statistics.c:116
+++#: ../statistics.c:118
++ #, c-format
++ msgid "RTO algorithm is %s"
++ msgstr "algorithme RTO est %s"
++ 
++-#: ../statistics.c:120
++-#, c-format
++-msgid "%d active connections openings"
+++#: ../statistics.c:122
+++#, fuzzy, c-format
+++msgid "%u active connections openings"
++ msgstr "%d ouvertures de connexions actives"
++ 
++-#: ../statistics.c:121
++-#, c-format
++-msgid "%d passive connection openings"
+++#: ../statistics.c:123
+++#, fuzzy, c-format
+++msgid "%u passive connection openings"
++ msgstr "%d ouvertures de connexions passives"
++ 
++-#: ../statistics.c:122
++-#, c-format
++-msgid "%d failed connection attempts"
+++#: ../statistics.c:124
+++#, fuzzy, c-format
+++msgid "%u failed connection attempts"
++ msgstr "%d tentatives de connexion échouées"
++ 
++-#: ../statistics.c:123
++-#, c-format
++-msgid "%d connection resets received"
+++#: ../statistics.c:125
+++#, fuzzy, c-format
+++msgid "%u connection resets received"
++ msgstr "%d réinitialisations de connexions reçues"
++ 
++-#: ../statistics.c:124
++-#, c-format
++-msgid "%d connections established"
+++#: ../statistics.c:126
+++#, fuzzy, c-format
+++msgid "%u connections established"
++ msgstr "%d connexions établies"
++ 
++-#: ../statistics.c:125
++-#, c-format
++-msgid "%d segments received"
+++#: ../statistics.c:127
+++#, fuzzy, c-format
+++msgid "%u segments received"
++ msgstr "%d segments reçus"
++ 
++-#: ../statistics.c:126
++-#, c-format
++-msgid "%d segments send out"
+++#: ../statistics.c:128
+++#, fuzzy, c-format
+++msgid "%u segments send out"
++ msgstr "%d segments envoyés"
++ 
++-#: ../statistics.c:127
++-#, c-format
++-msgid "%d segments retransmited"
+++#: ../statistics.c:129
+++#, fuzzy, c-format
+++msgid "%u segments retransmited"
++ msgstr "%d segments retransmis"
++ 
++-#: ../statistics.c:128
++-#, c-format
++-msgid "%d bad segments received."
+++#: ../statistics.c:130
+++#, fuzzy, c-format
+++msgid "%u bad segments received."
++ msgstr "%d mauvais segments reçus."
++ 
++-#: ../statistics.c:129
++-#, c-format
++-msgid "%d resets sent"
+++#: ../statistics.c:131
+++#, fuzzy, c-format
+++msgid "%u resets sent"
++ msgstr "%d réinitialisations envoyées"
++ 
++-#: ../statistics.c:134
++-#, c-format
++-msgid "%d packets received"
+++#: ../statistics.c:136
+++#, fuzzy, c-format
+++msgid "%u packets received"
++ msgstr "%d paquets reçus"
++ 
++-#: ../statistics.c:135
++-#, c-format
++-msgid "%d packets to unknown port received."
+++#: ../statistics.c:137
+++#, fuzzy, c-format
+++msgid "%u packets to unknown port received."
++ msgstr "%d paquets reçus pour un port inconnu"
++ 
++-#: ../statistics.c:136
++-#, c-format
++-msgid "%d packet receive errors"
+++#: ../statistics.c:138
+++#, fuzzy, c-format
+++msgid "%u packet receive errors"
++ msgstr "%d erreurs en réception de paquets"
++ 
++-#: ../statistics.c:137
+++#: ../statistics.c:139
+++#, fuzzy, c-format
+++msgid "%u packets sent"
+++msgstr "%d paquets envoyés"
+++
+++#: ../statistics.c:144
+++#, fuzzy, c-format
+++msgid "%u SYN cookies sent"
+++msgstr "%d SYN-Cookies reçus"
+++
+++#: ../statistics.c:145
+++#, fuzzy, c-format
+++msgid "%u SYN cookies received"
+++msgstr "%d SYN-Cookies reçus"
+++
+++#: ../statistics.c:146
+++#, fuzzy, c-format
+++msgid "%u invalid SYN cookies received"
+++msgstr "%d SYN-Cookies reçus incorrects"
+++
+++#: ../statistics.c:148
+++#, fuzzy, c-format
+++msgid "%u resets received for embryonic SYN_RECV sockets"
+++msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires"
+++
+++#: ../statistics.c:150
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue because of socket buffer overrun"
+++msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein"
+++
+++#. obsolete: 2.2.0 doesn't do that anymore
+++#: ../statistics.c:153
+++#, fuzzy, c-format
+++msgid "%u packets pruned from receive queue"
+++msgstr "%d paquets supprimés de la file hors service"
+++
+++#: ../statistics.c:154
+++#, fuzzy, c-format
+++msgid ""
+++"%u packets dropped from out-of-order queue because of socket buffer overrun"
+++msgstr "%d paquets jetés de la file hors service en raison de tampon de sockets plein"
+++
+++#: ../statistics.c:156
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because they were out-of-window"
+++msgstr "%d ICMP paquets jetés car hors de la fenêtre"
+++
+++#: ../statistics.c:158
+++#, fuzzy, c-format
+++msgid "%u ICMP packets dropped because socket was locked"
+++msgstr "%d paquets ICMP jetés car la socket a été vérouillée"
+++
+++#: ../statistics.c:160
++ #, c-format
++-msgid "%d packets sent"
+++msgid "%u TCP sockets finished time wait in fast timer"
+++msgstr ""
+++
+++#: ../statistics.c:161
+++#, c-format
+++msgid "%u time wait sockets recycled by time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:162
+++#, c-format
+++msgid "%u TCP sockets finished time wait in slow timer"
+++msgstr ""
+++
+++#: ../statistics.c:163
+++#, c-format
+++msgid "%u passive connections rejected because of time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:165
+++#, c-format
+++msgid "%u active connections rejected because of time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:167
+++#, c-format
+++msgid "%u packets rejects in established connections because of timestamp"
+++msgstr ""
+++
+++#: ../statistics.c:169
+++#, fuzzy, c-format
+++msgid "%u delayed acks sent"
++ msgstr "%d paquets envoyés"
++ 
++-#: ../statistics.c:142
+++#: ../statistics.c:170
++ #, c-format
++-msgid "%d SYN cookies sent"
+++msgid "%u delayed acks further delayed because of locked socket"
++ msgstr ""
++ 
++-#: ../statistics.c:143
+++#: ../statistics.c:172
++ #, c-format
++-msgid "%d SYN cookies received"
++-msgstr "%d SYN-Cookies reçus"
+++msgid "Quick ack mode was activated %u times"
+++msgstr ""
++ 
++-#: ../statistics.c:144
+++#: ../statistics.c:173
++ #, c-format
++-msgid "%d invalid SYN cookies received"
++-msgstr "%d SYN-Cookies reçus incorrects"
+++msgid "%u times the listen queue of a socket overflowed"
+++msgstr ""
++ 
++-#: ../statistics.c:146
+++#: ../statistics.c:175
++ #, c-format
++-msgid "%d resets received for embryonic SYN_RECV sockets"
++-msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires"
+++msgid "%u SYNs to LISTEN sockets ignored"
+++msgstr ""
++ 
++-#: ../statistics.c:148
+++#: ../statistics.c:176
++ #, c-format
++-msgid "%d packets pruned from receive queue because of socket buffer overrun"
+++msgid "%u packets directly queued to recvmsg prequeue."
++ msgstr ""
++-"%d paquets supprimés de la file de réception en raison de tampon de sockets "
++-"plein"
++ 
++-#. obsolete: 2.2.0 doesn't do that anymore
++-#: ../statistics.c:151
+++#: ../statistics.c:178
+++#, c-format
+++msgid "%u of bytes directly received from backlog"
+++msgstr ""
+++
+++#: ../statistics.c:180
++ #, c-format
++-msgid "%d packets pruned from out-of-order queue"
+++msgid "%u of bytes directly received from prequeue"
+++msgstr ""
+++
+++#: ../statistics.c:182
+++#, fuzzy, c-format
+++msgid "%u packets dropped from prequeue"
++ msgstr "%d paquets supprimés de la file hors service"
++ 
++-#: ../statistics.c:152
+++#: ../statistics.c:183
+++#, fuzzy, c-format
+++msgid "%u packet headers predicted"
+++msgstr "%d paquets reçus"
+++
+++#: ../statistics.c:184
++ #, c-format
++-msgid ""
++-"%d packets dropped from out-of-order queue because of socket buffer overrun"
+++msgid "%u packets header predicted and directly queued to user"
++ msgstr ""
++-"%d paquets jetés de la file hors service en raison de tampon de sockets plein"
++ 
++-#: ../statistics.c:154
+++#: ../statistics.c:186
++ #, c-format
++-msgid "%d ICMP packets dropped because they were out-of-window"
++-msgstr "%d ICMP paquets jetés car hors de la fenêtre"
+++msgid "Ran %u times out of system memory during packet sending"
+++msgstr ""
++ 
++-#: ../statistics.c:156
+++#: ../statistics.c:188
+++#, fuzzy, c-format
+++msgid "%u acknowledgments not containing data received"
+++msgstr "%d paquets reçus pour un port inconnu"
+++
+++#: ../statistics.c:189
++ #, c-format
++-msgid "%d ICMP packets dropped because socket was locked"
++-msgstr "%d paquets ICMP jetés car la socket a été vérouillée"
+++msgid "%u predicted acknowledgments"
+++msgstr ""
+++
+++#: ../statistics.c:190
+++#, c-format
+++msgid "%u times recovered from packet loss due to fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:191
+++#, c-format
+++msgid "%u times recovered from packet loss due to SACK data"
+++msgstr ""
+++
+++#: ../statistics.c:192
+++#, fuzzy, c-format
+++msgid "%u bad SACKs received"
+++msgstr "%d mauvais segments reçus."
+++
+++#: ../statistics.c:193
+++#, c-format
+++msgid "Detected reordering %u times using FACK"
+++msgstr ""
+++
+++#: ../statistics.c:194
+++#, c-format
+++msgid "Detected reordering %u times using SACK"
+++msgstr ""
+++
+++#: ../statistics.c:195
+++#, c-format
+++msgid "Detected reordering %u times using time stamp"
+++msgstr ""
+++
+++#: ../statistics.c:196
+++#, c-format
+++msgid "Detected reordering %u times using reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:197
+++#, c-format
+++msgid "%u congestion windows fully recovered"
+++msgstr ""
+++
+++#: ../statistics.c:198
+++#, c-format
+++msgid "%u congestion windows partially recovered using Hoe heuristic"
+++msgstr ""
+++
+++#: ../statistics.c:199
+++#, c-format
+++msgid "%u congestion window recovered using DSACK"
+++msgstr ""
+++
+++#: ../statistics.c:200
+++#, c-format
+++msgid "%u congestion windows recovered after partial ack"
+++msgstr ""
+++
+++#: ../statistics.c:201
+++#, fuzzy, c-format
+++msgid "%u retransmits lost"
+++msgstr "%d réinitialisations envoyées"
+++
+++#: ../statistics.c:202
+++#, c-format
+++msgid "%u timeouts after reno fast retransmit"
+++msgstr ""
+++
+++#: ../statistics.c:203
+++#, c-format
+++msgid "%u timeouts after SACK recovery"
+++msgstr ""
+++
+++#: ../statistics.c:204
+++#, c-format
+++msgid "%u timeouts in loss state"
+++msgstr ""
+++
+++#: ../statistics.c:205
+++#, fuzzy, c-format
+++msgid "%u fast retransmits"
+++msgstr "%d segments retransmis"
+++
+++#: ../statistics.c:206
+++#, c-format
+++msgid "%u forward retransmits"
+++msgstr ""
+++
+++#: ../statistics.c:207
+++#, c-format
+++msgid "%u retransmits in slow start"
+++msgstr ""
+++
+++#: ../statistics.c:208
+++#, c-format
+++msgid "%u other TCP timeouts"
+++msgstr ""
+++
+++#: ../statistics.c:209
+++#, fuzzy, c-format
+++msgid "%u reno fast retransmits failed"
+++msgstr "%d segments retransmis"
+++
+++#: ../statistics.c:210
+++#, fuzzy, c-format
+++msgid "%u sack retransmits failed"
+++msgstr "%d paquets mal réassemblés"
+++
+++#: ../statistics.c:211
+++#, c-format
+++msgid "%u times receiver scheduled too late for direct processing"
+++msgstr ""
+++
+++#: ../statistics.c:212
+++#, fuzzy, c-format
+++msgid "%u packets collapsed in receive queue due to low socket buffer"
+++msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein"
+++
+++#: ../statistics.c:213
+++#, c-format
+++msgid "%u DSACKs sent for old packets"
+++msgstr ""
+++
+++#: ../statistics.c:214
+++#, c-format
+++msgid "%u DSACKs sent for out of order packets"
+++msgstr ""
+++
+++#: ../statistics.c:215
+++#, fuzzy, c-format
+++msgid "%u DSACKs received"
+++msgstr "%d paquets reçus"
+++
+++#: ../statistics.c:216
+++#, fuzzy, c-format
+++msgid "%u DSACKs for out of order packets received"
+++msgstr "%d paquets totaux reçus"
+++
+++#: ../statistics.c:217
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected SYN"
+++msgstr "%d réinitialisations de connexions reçues"
+++
+++#: ../statistics.c:218
+++#, fuzzy, c-format
+++msgid "%u connections reset due to unexpected data"
+++msgstr "%d réinitialisations de connexions reçues"
+++
+++#: ../statistics.c:219
+++#, fuzzy, c-format
+++msgid "%u connections reset due to early user close"
+++msgstr "%d réinitialisations de connexions reçues"
+++
+++#: ../statistics.c:220
+++#, c-format
+++msgid "%u connections aborted due to memory pressure"
+++msgstr ""
+++
+++#: ../statistics.c:221
+++#, fuzzy, c-format
+++msgid "%u connections aborted due to timeout"
+++msgstr "%d réinitialisations de connexions reçues"
++ 
++ #: ../statistics.c:222
+++#, c-format
+++msgid "%u connections aborted after user close in linger timeout"
+++msgstr ""
+++
+++#: ../statistics.c:223
+++#, c-format
+++msgid "%u times unabled to send RST due to no memory"
+++msgstr ""
+++
+++#: ../statistics.c:224
+++#, c-format
+++msgid "TCP ran low on memory %u times"
+++msgstr ""
+++
+++#: ../statistics.c:225
+++#, c-format
+++msgid "%u TCP data loss events"
+++msgstr ""
+++
+++#: ../statistics.c:292
++ msgid "enabled"
++ msgstr "activée"
++ 
++-#: ../statistics.c:222
+++#: ../statistics.c:292
++ msgid "disabled"
++ msgstr "désactivée"
++ 
++-#: ../statistics.c:272
++-#, c-format
++-msgid "unknown title %s\n"
++-msgstr "titre inconnu %s\n"
++-
++-#: ../statistics.c:298
+++#: ../statistics.c:375
++ msgid "error parsing /proc/net/snmp"
++ msgstr "erreur d'analyse de /proc/net/snmp"
++ 
++-#: ../statistics.c:311
+++#: ../statistics.c:388
++ msgid "cannot open /proc/net/snmp"
++ msgstr "ne peut ouvrir /proc/net/snmp"
++ 
++@@ -1824,89 +2064,95 @@ msgstr "Type de matériel `%s' pas suppor
++ msgid "Cannot change line discipline to `%s'.\n"
++ msgstr "Ne peut changer la discipline de ligne à `%s'.\n"
++ 
++-#: ../lib/af.c:145 ../lib/hw.c:148
+++#: ../lib/af.c:153 ../lib/hw.c:161
++ msgid "UNSPEC"
++ msgstr "UNSPEC"
++ 
++-#: ../lib/af.c:147
+++#: ../lib/af.c:155
++ msgid "UNIX Domain"
++ msgstr "Domaine UNIX"
++ 
++-#: ../lib/af.c:150
+++#: ../lib/af.c:158
++ msgid "DARPA Internet"
++ msgstr "DARPA Internet"
++ 
++-#: ../lib/af.c:153
+++#: ../lib/af.c:161
++ msgid "IPv6"
++ msgstr "IPv6"
++ 
++-#: ../lib/af.c:156 ../lib/hw.c:169
+++#: ../lib/af.c:164 ../lib/hw.c:182
++ msgid "AMPR AX.25"
++ msgstr "AMPR AX.25"
++ 
++-#: ../lib/af.c:159 ../lib/hw.c:175
+++#: ../lib/af.c:167 ../lib/hw.c:188
++ msgid "AMPR NET/ROM"
++ msgstr "AMPR NET/ROM"
++ 
++-#: ../lib/af.c:162
+++#: ../lib/af.c:170
++ msgid "Novell IPX"
++ msgstr ""
++ 
++-#: ../lib/af.c:165
+++#: ../lib/af.c:173
++ msgid "Appletalk DDP"
++ msgstr "Appletalk DDP"
++ 
++-#: ../lib/af.c:168 ../lib/hw.c:207
+++#: ../lib/af.c:176 ../lib/hw.c:223
++ msgid "Econet"
++ msgstr "Econet"
++ 
++-#: ../lib/af.c:171 ../lib/hw.c:172
+++#: ../lib/af.c:179
+++msgid "CCITT X.25"
+++msgstr ""
+++
+++#: ../lib/af.c:182 ../lib/hw.c:185
++ msgid "AMPR ROSE"
++ msgstr "AMPR ROSE"
++ 
++-#: ../lib/af.c:174 ../lib/hw.c:160
+++#: ../lib/af.c:185 ../lib/hw.c:173
++ msgid "Ash"
++ msgstr "Ash"
++ 
++-#: ../lib/af.c:232
+++#: ../lib/af.c:243
+++#, c-format
++ msgid "Please don't supply more than one address family.\n"
++ msgstr "Ne fournissez pas plus d'une famille d'adresses SVP.\n"
++ 
++-#: ../lib/af.c:293
+++#: ../lib/af.c:304
+++#, c-format
++ msgid "Too much address family arguments.\n"
++ msgstr "Trop d'arguments de familles d'adresses.\n"
++ 
++-#: ../lib/af.c:304
+++#: ../lib/af.c:315
++ #, c-format
++ msgid "Unknown address family `%s'.\n"
++ msgstr "Famille d'adresses inconnue `%s'.\n"
++ 
++-#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
++-#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
++-#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
++-#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
++-msgid "[NONE SET]"
++-msgstr "[INDEFINI]"
++-
++-#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
+++#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
++ #, c-format
++ msgid "in_arcnet(%s): invalid arcnet address!\n"
++ msgstr "in_arcnet(%s): adresse arcnet invalide !\n"
++ 
++-#: ../lib/arcnet.c:108
+++#: ../lib/arcnet.c:97
++ #, c-format
++ msgid "in_arcnet(%s): trailing : ignored!\n"
++ msgstr "in_arcnet(%s): restant : ignoré !\n"
++ 
++-#: ../lib/arcnet.c:120
+++#: ../lib/arcnet.c:109
++ #, c-format
++ msgid "in_arcnet(%s): trailing junk!\n"
++ msgstr "in_arcnet(%s): le restant à la poubelle !\n"
++ 
++ #: ../lib/ash.c:81
+++#, c-format
++ msgid "Malformed Ash address"
++ msgstr "Adresse Ash malformée"
++ 
+++#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
+++#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
+++#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
+++msgid "[NONE SET]"
+++msgstr "[INDEFINI]"
+++
++ #: ../lib/ax25.c:97 ../lib/netrom.c:100
++ msgid "Invalid callsign"
++ msgstr "Signal d'appel invalide"
++@@ -1916,22 +2162,21 @@ msgid "Callsign too long"
++ msgstr "Signal d'appel trop long"
++ 
++ #: ../lib/ax25_gr.c:47
+++#, c-format
++ msgid "AX.25 not configured in this system.\n"
++ msgstr "AX.25 pas configuré sur ce système.\n"
++ 
++ #: ../lib/ax25_gr.c:50
+++#, c-format
++ msgid "Kernel AX.25 routing table\n"
++ msgstr "Table de routage AX.25 du noyau\n"
++ 
++ #. xxx
++ #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
+++#, c-format
++ msgid "Destination  Iface    Use\n"
++ msgstr "Destination  Iface    Utilisation\n"
++ 
++-#: ../lib/ddp_gr.c:21
++-msgid "Routing table for `ddp' not yet supported.\n"
++-msgstr "Table de routage pour `ddp' pas encore supporté.\n"
++-
++ #: ../lib/ether.c:74 ../lib/ether.c:91
++ #, c-format
++ msgid "in_ether(%s): invalid ether address!\n"
++@@ -1947,153 +2192,171 @@ msgstr "in_ether(%s): restant ignoré !\n
++ msgid "in_ether(%s): trailing junk!\n"
++ msgstr "in_ether(%s): le restant à la poubelle !\n"
++ 
++-#: ../lib/fddi.c:95 ../lib/fddi.c:110
+++#: ../lib/fddi.c:84 ../lib/fddi.c:99
++ #, c-format
++ msgid "in_fddi(%s): invalid fddi address!\n"
++ msgstr "in_fddi(%s): adresse fddi invalide!\n"
++ 
++-#: ../lib/fddi.c:122
+++#: ../lib/fddi.c:111
++ #, c-format
++ msgid "in_fddi(%s): trailing : ignored!\n"
++ msgstr "in_fddi(%s): restant ignoré !\n"
++ 
++-#: ../lib/fddi.c:134
+++#: ../lib/fddi.c:123
++ #, c-format
++ msgid "in_fddi(%s): trailing junk!\n"
++ msgstr "in_fddi(%s): le restant à la poubelle !\n"
++ 
++-#: ../lib/getroute.c:97 ../lib/setroute.c:76
+++#: ../lib/getroute.c:101 ../lib/setroute.c:80
++ #, c-format
++ msgid "Address family `%s' not supported.\n"
++ msgstr "Famille d'adresses `%s' non supportée.\n"
++ 
++-#: ../lib/getroute.c:103 ../lib/setroute.c:80
+++#: ../lib/getroute.c:107 ../lib/setroute.c:84
++ #, c-format
++ msgid "No routing for address family `%s'.\n"
++ msgstr "Pas de routage pour la famille d'adresses `%s'.\n"
++ 
++-#: ../lib/hippi.c:96 ../lib/hippi.c:111
+++#: ../lib/hippi.c:84 ../lib/hippi.c:99
++ #, c-format
++ msgid "in_hippi(%s): invalid hippi address!\n"
++ msgstr "in_hippi(%s): adresse hippi invalide!\n"
++ 
++-#: ../lib/hippi.c:123
+++#: ../lib/hippi.c:111
++ #, c-format
++ msgid "in_hippi(%s): trailing : ignored!\n"
++ msgstr "in_hippi(%s): restant ignoré !\n"
++ 
++-#: ../lib/hippi.c:134
+++#: ../lib/hippi.c:122
++ #, c-format
++ msgid "in_hippi(%s): trailing junk!\n"
++ msgstr "in_hippi(%s): le restant à la poubelle !\n"
++ 
++-#: ../lib/hw.c:147
+++#: ../lib/hw.c:160
++ msgid "Local Loopback"
++ msgstr "Boucle locale"
++ 
++-#: ../lib/hw.c:150
+++#: ../lib/hw.c:163
++ msgid "Serial Line IP"
++ msgstr "IP ligne série"
++ 
++-#: ../lib/hw.c:151
+++#: ../lib/hw.c:164
++ msgid "VJ Serial Line IP"
++ msgstr "IP ligne série - VJ "
++ 
++-#: ../lib/hw.c:152
+++#: ../lib/hw.c:165
++ msgid "6-bit Serial Line IP"
++ msgstr "IP ligne série - 6 bits"
++ 
++-#: ../lib/hw.c:153
+++#: ../lib/hw.c:166
++ msgid "VJ 6-bit Serial Line IP"
++ msgstr "IP ligne série - 6 bits VJ"
++ 
++-#: ../lib/hw.c:154
+++#: ../lib/hw.c:167
++ msgid "Adaptive Serial Line IP"
++ msgstr "IP ligne série adaptative"
++ 
++-#: ../lib/hw.c:157
+++#: ../lib/hw.c:170
++ msgid "Ethernet"
++ msgstr "Ethernet"
++ 
++-#: ../lib/hw.c:163
+++#: ../lib/hw.c:176
++ msgid "Fiber Distributed Data Interface"
++ msgstr "Fiber Distributed Data Interface"
++ 
++-#: ../lib/hw.c:166
+++#: ../lib/hw.c:179
++ msgid "HIPPI"
++ msgstr "HIPPI"
++ 
++-#: ../lib/hw.c:178
+++#: ../lib/hw.c:191
+++msgid "generic X.25"
+++msgstr ""
+++
+++#: ../lib/hw.c:194
++ msgid "IPIP Tunnel"
++ msgstr "IPIP Tunnel"
++ 
++-#: ../lib/hw.c:181
+++#: ../lib/hw.c:197
++ msgid "Point-to-Point Protocol"
++ msgstr "Protocole Point-à-Point"
++ 
++-#: ../lib/hw.c:184
+++#: ../lib/hw.c:200
++ msgid "(Cisco)-HDLC"
++ msgstr "(Cisco)-HDLC"
++ 
++-#: ../lib/hw.c:185
+++#: ../lib/hw.c:201
++ msgid "LAPB"
++ msgstr "LAPB"
++ 
++-#: ../lib/hw.c:188
+++#: ../lib/hw.c:204
++ msgid "ARCnet"
++ msgstr "ARCnet"
++ 
++-#: ../lib/hw.c:191
+++#: ../lib/hw.c:207
++ msgid "Frame Relay DLCI"
++ msgstr "Frame Relay DLCI"
++ 
++-#: ../lib/hw.c:192
+++#: ../lib/hw.c:208
++ msgid "Frame Relay Access Device"
++ msgstr "Périphériue d'accès Frame Relay"
++ 
++-#: ../lib/hw.c:195
+++#: ../lib/hw.c:211
++ msgid "IPv6-in-IPv4"
++ msgstr "IPv6-dans-IPv4"
++ 
++-#: ../lib/hw.c:198
+++#: ../lib/hw.c:214
++ #, fuzzy
++ msgid "IrLAP"
++ msgstr "LAPB"
++ 
++-#: ../lib/hw.c:201
+++#: ../lib/hw.c:217
++ msgid "16/4 Mbps Token Ring"
++ msgstr ""
++ 
++-#: ../lib/hw.c:203
+++#: ../lib/hw.c:219
++ msgid "16/4 Mbps Token Ring (New)"
++ msgstr ""
++ 
+++#: ../lib/hw.c:226
+++msgid "Generic EUI-64"
+++msgstr ""
+++
++ #: ../lib/inet.c:153 ../lib/inet6.c:79
++ #, c-format
++ msgid "rresolve: unsupport address family %d !\n"
++ msgstr "rresolve: famille d'adresses non suportée %d !\n"
++ 
++-#: ../lib/inet6_gr.c:79
+++#: ../lib/inet6.c:131
+++#, fuzzy
+++msgid "[UNKNOWN]"
+++msgstr "INCONNU"
+++
+++#: ../lib/inet6_gr.c:71
+++#, c-format
++ msgid "INET6 (IPv6) not configured in this system.\n"
++ msgstr "INET6 (IPv6) pas configuré sur ce système.\n"
++ 
++-#: ../lib/inet6_gr.c:82
+++#: ../lib/inet6_gr.c:74
+++#, c-format
++ msgid "Kernel IPv6 routing table\n"
++ msgstr "Table de routage IPv6 du noyau\n"
++ 
++-#: ../lib/inet6_gr.c:84
+++#: ../lib/inet6_gr.c:76
+++#, c-format
++ msgid ""
++-"Destination                                 Next Hop                         "
++-"       Flags Metric Ref    Use Iface\n"
+++"Destination                                 Next "
+++"Hop                                Flags Metric Ref    Use Iface\n"
++ msgstr ""
++-"Destination                                 Prochain Hop                     "
++-"       Indic Metric Ref    Utilis. Iface\n"
+++"Destination                                 Prochain "
+++"Hop                            Indic Metric Ref    Utilis. Iface\n"
++ 
++-#: ../lib/inet6_gr.c:158
+++#: ../lib/inet6_gr.c:150
+++#, c-format
++ msgid "Kernel IPv6 Neighbour Cache\n"
++ msgstr "Cache voisin IPv6 du noyau\n"
++ 
++-#: ../lib/inet6_gr.c:161
+++#: ../lib/inet6_gr.c:153
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State\n"
++@@ -2101,39 +2364,45 @@ msgstr ""
++ "Voisin                                      Adresse MAT       Iface    Indic "
++ "Ref Etat\n"
++ 
++-#: ../lib/inet6_gr.c:165
+++#: ../lib/inet6_gr.c:157
+++#, c-format
++ msgid ""
++ "Neighbour                                   HW Address        Iface    Flags "
++ "Ref State            Stale(sec) Delete(sec)\n"
++-msgstr ""
++-"Voisin                                      Adresse MAT       Iface    Indic "
++-"Ref Etat             Bloqué(sec) Détuit(sec)\n"
+++msgstr "Voisin                                      Adresse MAT       Iface    Indic Ref Etat             Bloqué(sec) Détuit(sec)\n"
++ 
++ #: ../lib/inet6_sr.c:46
+++#, c-format
++ msgid "Usage: inet6_route [-vF] del Target\n"
++ msgstr "Syntaxe: inet6_route [-vF] del Cible\n"
++ 
++ #: ../lib/inet6_sr.c:47
+++#, c-format
++ msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
++ msgstr "       inet6_route [-vF] add Cible [gw Gw] [metric M] [[dev] If]\n"
++ 
++ #: ../lib/inet6_sr.c:48
+++#, c-format
++ msgid "       inet6_route [-FC] flush      NOT supported\n"
++ msgstr "       inet6_route [-FC] flush      PAS supporté\n"
++ 
++-#: ../lib/inet6_sr.c:182
+++#: ../lib/inet6_sr.c:188
+++#, c-format
++ msgid "Flushing `inet6' routing table not supported\n"
++ msgstr "Flush de table de routage `inet6' pas supporté\n"
++ 
++ #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
+++#, c-format
++ msgid "INET (IPv4) not configured in this system.\n"
++ msgstr "INET (IPv4) pas configuré sur ce système.\n"
++ 
++ #: ../lib/inet_gr.c:53
+++#, c-format
++ msgid "Kernel IP routing table\n"
++ msgstr "Table de routage IP du noyau\n"
++ 
++ #: ../lib/inet_gr.c:56
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2142,26 +2411,26 @@ msgstr ""
++ "Iface\n"
++ 
++ #: ../lib/inet_gr.c:59
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
++ "Iface\n"
++-msgstr ""
++-"Destination     Passerelle      Genmask         Indic   MSS Fenêtre irtt "
++-"Iface\n"
+++msgstr "Destination     Passerelle      Genmask         Indic   MSS Fenêtre irtt Iface\n"
++ 
++ #: ../lib/inet_gr.c:62
+++#, c-format
++ msgid ""
++ "Destination     Gateway         Genmask         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt\n"
++-msgstr ""
++-"Destination     Passerelle      Genmask         Indic Metric Ref    Use "
++-"Iface    MSS  Fenêtre irtt\n"
+++msgstr "Destination     Passerelle      Genmask         Indic Metric Ref    Use Iface    MSS  Fenêtre irtt\n"
++ 
++ #: ../lib/inet_gr.c:237
+++#, c-format
++ msgid "Kernel IP routing cache\n"
++ msgstr "cache de routage IP du noyau\n"
++ 
++ #: ../lib/inet_gr.c:258
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface\n"
++@@ -2170,30 +2439,28 @@ msgstr ""
++ "Iface\n"
++ 
++ #: ../lib/inet_gr.c:261
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags   MSS Window  irtt "
++ "Iface\n"
++-msgstr ""
++-"Source          Destination     Passerelle      Indic   MSS Fenêtre irtt "
++-"Iface\n"
+++msgstr "Source          Destination     Passerelle      Indic   MSS Fenêtre irtt Iface\n"
++ 
++ #: ../lib/inet_gr.c:266
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  HH  Arp\n"
++-msgstr ""
++-"Source          Destination     Passerelle      Indic Metric Ref    Use "
++-"Iface    MSS  Fenêtre irtt  HH  Arp\n"
+++msgstr "Source          Destination     Passerelle      Indic Metric Ref    Use Iface    MSS  Fenêtre irtt  HH  Arp\n"
++ 
++ #: ../lib/inet_gr.c:290
+++#, c-format
++ msgid ""
++ "Source          Destination     Gateway         Flags Metric Ref    Use "
++ "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
++-msgstr ""
++-"Source          Destination     Passerelle      Flags Metric Ref    Use "
++-"Iface    MSS  Fenêtre irtt  TOS HHRef HHUptod     SpecDst\n"
+++msgstr "Source          Destination     Passerelle      Flags Metric Ref    Use Iface    MSS  Fenêtre irtt  TOS HHRef HHUptod     SpecDst\n"
++ 
++-#: ../lib/inet_sr.c:50
+++#: ../lib/inet_sr.c:51
+++#, c-format
++ msgid ""
++ "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++@@ -2201,29 +2468,34 @@ msgstr ""
++ "Syntaxe: inet_route [-vF] del {-host|-net} Cible[/prefix] [gw Gw] [metric M] "
++ "[[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:51
+++#: ../lib/inet_sr.c:52
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
++ msgstr ""
++ "       inet_route [-vF] add {-host|-net} Cible[/prefix] [gw Gw] [metric M]\n"
++ 
++-#: ../lib/inet_sr.c:52
+++#: ../lib/inet_sr.c:53
+++#, c-format
++ msgid ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ msgstr ""
++ "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
++ 
++-#: ../lib/inet_sr.c:53
+++#: ../lib/inet_sr.c:54
+++#, c-format
++ msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
++ 
++-#: ../lib/inet_sr.c:54
+++#: ../lib/inet_sr.c:55
+++#, c-format
++ msgid ""
++ "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
++ msgstr ""
++ "       inet_route [-vF] add {-host|-net} Cible[/prefix] [metric M] reject\n"
++ 
++-#: ../lib/inet_sr.c:55
+++#: ../lib/inet_sr.c:56
+++#, c-format
++ msgid "       inet_route [-FC] flush      NOT supported\n"
++ msgstr "       inet_route [-FC] flush      PAS supporté\n"
++ 
++@@ -2233,15 +2505,17 @@ msgid "route: %s: cannot use a NETWORK a
++ msgstr "route: %s: ne peut utiliser un RESEAU comme passerelle!\n"
++ 
++ #: ../lib/inet_sr.c:174
++-#, fuzzy
+++#, fuzzy, c-format
++ msgid "route: Invalid MSS/MTU.\n"
++ msgstr "route: MSS invalide.\n"
++ 
++ #: ../lib/inet_sr.c:187
+++#, c-format
++ msgid "route: Invalid window.\n"
++ msgstr "route: fenêtre invalide.\n"
++ 
++ #: ../lib/inet_sr.c:203
+++#, c-format
++ msgid "route: Invalid initial rtt.\n"
++ msgstr "route: rtt initial invalide.\n"
++ 
++@@ -2256,75 +2530,92 @@ msgid "route: bogus netmask %s\n"
++ msgstr "route: netmask bogué %s\n"
++ 
++ #: ../lib/inet_sr.c:270
+++#, c-format
++ msgid "route: netmask doesn't match route address\n"
++ msgstr "route: netmask ne correspond pas à l'adresse de route\n"
++ 
++ #: ../lib/inet_sr.c:306
+++#, c-format
++ msgid "Flushing `inet' routing table not supported\n"
++ msgstr "Flush de table de routage `inet' pas supporté\n"
++ 
++ #: ../lib/inet_sr.c:310
+++#, c-format
++ msgid "Modifying `inet' routing cache not supported\n"
++ msgstr "Modification de cache de routage `inet' pas supporté\n"
++ 
++ #: ../lib/ipx_gr.c:52
+++#, c-format
++ msgid "IPX not configured in this system.\n"
++ msgstr "IPX pas configuré sur ce système.\n"
++ 
++ #: ../lib/ipx_gr.c:56
+++#, c-format
++ msgid "Kernel IPX routing table\n"
++ msgstr "Table de routage IPX du noyau\n"
++ 
++ #. xxx
++ #: ../lib/ipx_gr.c:57
+++#, c-format
++ msgid "Destination               Router Net                Router Node\n"
++ msgstr "Destination               Réseau Routeur            Noeud Routeur\n"
++ 
++ #: ../lib/ipx_sr.c:33
+++#, c-format
++ msgid "IPX: this needs to be written\n"
++ msgstr "IPX: ceci doit être écrit\n"
++ 
++-#: ../lib/masq_info.c:197
+++#: ../lib/masq_info.c:198
+++#, c-format
++ msgid "IP masquerading entries\n"
++ msgstr "Entrées IP Masquerade\n"
++ 
++-#: ../lib/masq_info.c:200
+++#: ../lib/masq_info.c:201
+++#, c-format
++ msgid "prot   expire source               destination          ports\n"
++ msgstr "prot   expire source               destination          ports\n"
++ 
++-#: ../lib/masq_info.c:203
+++#: ../lib/masq_info.c:204
+++#, c-format
++ msgid ""
++-"prot   expire    initseq delta prevd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta prevd source               "
+++"destination          ports\n"
++ msgstr ""
++-"prot   expire    initseq delta precd source               destination        "
++-"  ports\n"
+++"prot   expire    initseq delta precd source               "
+++"destination          ports\n"
++ 
++ #: ../lib/netrom_gr.c:48
+++#, c-format
++ msgid "NET/ROM not configured in this system.\n"
++ msgstr "NET/ROM pas configuré sur ce système.\n"
++ 
++ #: ../lib/netrom_gr.c:51
+++#, c-format
++ msgid "Kernel NET/ROM routing table\n"
++ msgstr "Table de routage NET/ROM du noyau\n"
++ 
++ #: ../lib/netrom_gr.c:52
+++#, c-format
++ msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
++ msgstr "Destination  Mnemoniq  Qualité  Voisin     Iface\n"
++ 
++ #: ../lib/netrom_sr.c:34
+++#, c-format
++ msgid "netrom usage\n"
++ msgstr "utilisation netrom\n"
++ 
++ #: ../lib/netrom_sr.c:44
+++#, c-format
++ msgid "NET/ROM: this needs to be written\n"
++ msgstr "NET/ROM: ceci doit être écrit\n"
++ 
++ #: ../lib/ppp.c:44
+++#, c-format
++ msgid "You cannot start PPP with this program.\n"
++ msgstr "Vous ne pouvez démarrer PPP avec ce programme.\n"
++ 
++ #: ../lib/ppp_ac.c:38
+++#, c-format
++ msgid "Sorry, use pppd!\n"
++ msgstr "Désolé, utilisez pppd !\n"
++ 
++@@ -2333,49 +2624,314 @@ msgid "Node address must be ten digits"
++ msgstr "L'adresse de noeud doit avoir 10 chiffres"
++ 
++ #: ../lib/rose_gr.c:51
+++#, c-format
++ msgid "ROSE not configured in this system.\n"
++ msgstr "ROSE pas configuré sur ce système.\n"
++ 
++ #: ../lib/rose_gr.c:54
+++#, c-format
++ msgid "Kernel ROSE routing table\n"
++ msgstr "Table de routage ROSE du noyau\n"
++ 
++-#: ../lib/tr.c:70 ../lib/tr.c:85
+++#: ../lib/tr.c:86 ../lib/tr.c:101
++ #, c-format
++ msgid "in_tr(%s): invalid token ring address!\n"
++ msgstr "in_tr(%s): adresse token-ring invalide !\n"
++ 
++-#: ../lib/tr.c:97
+++#: ../lib/tr.c:113
++ #, c-format
++ msgid "in_tr(%s): trailing : ignored!\n"
++ msgstr "in_tr(%s): restant : ignoré !\n"
++ 
++-#: ../lib/tr.c:109
+++#: ../lib/tr.c:125
++ #, c-format
++ msgid "in_tr(%s): trailing junk!\n"
++ msgstr "in_tr(%s): restant à la poubelle !\n"
++ 
++-#: ../lib/interface.c:124
+++#: ../lib/interface.c:176
++ #, c-format
++ msgid "warning: no inet socket available: %s\n"
++ msgstr "attention: pas de socket inet disponible: %s\n"
++ 
++-#: ../lib/interface.c:270
+++#: ../lib/interface.c:325
++ #, c-format
++ msgid "Warning: cannot open %s (%s). Limited output.\n"
++ msgstr ""
++ 
++ #. Give better error message for this case.
++-#: ../lib/interface.c:504
+++#: ../lib/interface.c:571
++ msgid "Device not found"
++ msgstr "Périphérique non trouvé"
++ 
++-#: ../lib/interface.c:508
+++#: ../lib/interface.c:575
++ #, c-format
++ msgid "%s: error fetching interface information: %s\n"
++ msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n"
++ 
++-#: ../lib/sockets.c:59
+++#: ../lib/interface.c:608
+++msgid "     - no statistics available -"
+++msgstr ""
+++
+++#: ../lib/interface.c:612
+++#, c-format
+++msgid "[NO FLAGS]"
+++msgstr "[PAS INDICATEURS]"
+++
+++#: ../lib/interface.c:688
+++#, c-format
+++msgid "%-9.9s Link encap:%s  "
+++msgstr "%-9.9s Lien encap:%s  "
+++
+++#: ../lib/interface.c:693
+++#, c-format
+++msgid "HWaddr %s  "
+++msgstr "HWaddr %s  "
+++
+++#: ../lib/interface.c:696
+++#, c-format
+++msgid "Media:%s"
+++msgstr "Media:%s"
+++
+++#: ../lib/interface.c:698
+++#, c-format
+++msgid "(auto)"
+++msgstr "(auto)"
+++
+++#: ../lib/interface.c:705
+++#, c-format
+++msgid "          %s addr:%s "
+++msgstr "          %s adr:%s "
+++
+++#: ../lib/interface.c:708
+++#, c-format
+++msgid " P-t-P:%s "
+++msgstr " P-t-P:%s "
+++
+++#: ../lib/interface.c:711
+++#, c-format
+++msgid " Bcast:%s "
+++msgstr " Bcast:%s "
+++
+++#: ../lib/interface.c:713
+++#, c-format
+++msgid " Mask:%s\n"
+++msgstr " Masque:%s\n"
+++
+++#: ../lib/interface.c:730
+++#, c-format
+++msgid "          inet6 addr: %s/%d"
+++msgstr "          adr inet6: %s/%d"
+++
+++#: ../lib/interface.c:732
+++#, c-format
+++msgid " Scope:"
+++msgstr " Scope:"
+++
+++#: ../lib/interface.c:735
+++#, c-format
+++msgid "Global"
+++msgstr "Global"
+++
+++#: ../lib/interface.c:738
+++#, c-format
+++msgid "Link"
+++msgstr "Lien"
+++
+++#: ../lib/interface.c:741
+++#, c-format
+++msgid "Site"
+++msgstr "Site"
+++
+++#: ../lib/interface.c:744
+++#, c-format
+++msgid "Compat"
+++msgstr "Compat"
+++
+++#: ../lib/interface.c:747
+++#, c-format
+++msgid "Host"
+++msgstr "Hôte"
+++
+++#: ../lib/interface.c:750
+++#, c-format
+++msgid "Unknown"
+++msgstr "Inconnu"
+++
+++#: ../lib/interface.c:765
+++#, c-format
+++msgid "          IPX/Ethernet II addr:%s\n"
+++msgstr "          adr IPX/Ethernet II:%s\n"
+++
+++#: ../lib/interface.c:768
+++#, c-format
+++msgid "          IPX/Ethernet SNAP addr:%s\n"
+++msgstr "          adr IPX/Ethernet SNAP:%s\n"
+++
+++#: ../lib/interface.c:771
+++#, c-format
+++msgid "          IPX/Ethernet 802.2 addr:%s\n"
+++msgstr "          adr IPX/Ethernet 802.2:%s\n"
+++
+++#: ../lib/interface.c:774
+++#, c-format
+++msgid "          IPX/Ethernet 802.3 addr:%s\n"
+++msgstr "          adr IPX/Ethernet 802.3:%s\n"
+++
+++#: ../lib/interface.c:784
+++#, c-format
+++msgid "          EtherTalk Phase 2 addr:%s\n"
+++msgstr "          adr EtherTalk Phase 2:%s\n"
+++
+++#: ../lib/interface.c:793
+++#, c-format
+++msgid "          econet addr:%s\n"
+++msgstr "          adr econet:%s\n"
+++
+++#: ../lib/interface.c:800
+++#, c-format
+++msgid "[NO FLAGS] "
+++msgstr "[PAS INDICATEURS] "
+++
+++#: ../lib/interface.c:802
+++#, c-format
+++msgid "UP "
+++msgstr "UP "
+++
+++#: ../lib/interface.c:804
+++#, c-format
+++msgid "BROADCAST "
+++msgstr "BROADCAST "
+++
+++#: ../lib/interface.c:806
+++#, c-format
+++msgid "DEBUG "
+++msgstr "DEBUG "
+++
+++#: ../lib/interface.c:808
+++#, c-format
+++msgid "LOOPBACK "
+++msgstr "LOOPBACK "
+++
+++#: ../lib/interface.c:810
+++#, c-format
+++msgid "POINTOPOINT "
+++msgstr "POINTOPOINT "
+++
+++#: ../lib/interface.c:812
+++#, c-format
+++msgid "NOTRAILERS "
+++msgstr "NOTRAILERS "
+++
+++#: ../lib/interface.c:814
+++#, c-format
+++msgid "RUNNING "
+++msgstr "RUNNING "
+++
+++#: ../lib/interface.c:816
+++#, c-format
+++msgid "NOARP "
+++msgstr "NOARP "
+++
+++#: ../lib/interface.c:818
+++#, c-format
+++msgid "PROMISC "
+++msgstr "PROMISC "
+++
+++#: ../lib/interface.c:820
+++#, c-format
+++msgid "ALLMULTI "
+++msgstr "ALLMULTI "
+++
+++#: ../lib/interface.c:822
+++#, c-format
+++msgid "SLAVE "
+++msgstr "SLAVE "
+++
+++#: ../lib/interface.c:824
+++#, c-format
+++msgid "MASTER "
+++msgstr "MASTER "
+++
+++#: ../lib/interface.c:826
+++#, c-format
+++msgid "MULTICAST "
+++msgstr "MULTICAST "
+++
+++#: ../lib/interface.c:829
+++#, c-format
+++msgid "DYNAMIC "
+++msgstr "DYNAMIC "
+++
+++#. DONT FORGET TO ADD THE FLAGS IN ife_print_short
+++#: ../lib/interface.c:832
+++#, c-format
+++msgid " MTU:%d  Metric:%d"
+++msgstr " MTU:%d  Metric:%d"
+++
+++#: ../lib/interface.c:836
+++#, c-format
+++msgid "  Outfill:%d  Keepalive:%d"
+++msgstr "  Outfill:%d  Keepalive:%d"
+++
+++#: ../lib/interface.c:850
+++#, fuzzy, c-format
+++msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
+++msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n"
+++
+++#: ../lib/interface.c:855
+++#, c-format
+++msgid "             compressed:%lu\n"
+++msgstr "             compressés:%lu\n"
+++
+++#: ../lib/interface.c:895
+++#, fuzzy, c-format
+++msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
+++msgstr "Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n"
+++
+++#: ../lib/interface.c:899
+++#, c-format
+++msgid "          collisions:%lu "
+++msgstr "          collisions:%lu "
+++
+++#: ../lib/interface.c:901
+++#, c-format
+++msgid "compressed:%lu "
+++msgstr "compressés:%lu "
+++
+++#: ../lib/interface.c:903
+++#, c-format
+++msgid "txqueuelen:%d "
+++msgstr "lg file transmission:%d "
+++
+++#: ../lib/interface.c:905
+++#, c-format
+++msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
+++msgstr ""
+++
+++#: ../lib/interface.c:916
+++#, c-format
+++msgid "Interrupt:%d "
+++msgstr "Interruption:%d "
+++
+++#. Only print devices using it for
+++#. I/O maps
+++#: ../lib/interface.c:919
+++#, c-format
+++msgid "Base address:0x%x "
+++msgstr "Adresse de base:0x%x "
+++
+++#: ../lib/interface.c:921
+++#, c-format
+++msgid "Memory:%lx-%lx "
+++msgstr "Mémoire:%lx-%lx "
+++
+++#: ../lib/interface.c:924
+++#, c-format
+++msgid "DMA chan:%x "
+++msgstr "Canal DMA:%x "
+++
+++#: ../lib/sockets.c:63
+++#, c-format
++ msgid "No usable address families found.\n"
++ msgstr "Pas de famille d'adresses utilisable trouvée.\n"
++ 
++@@ -2399,29 +2955,32 @@ msgstr "ip: %s est une adresse IPv4 inva
++ msgid "ip: argument is wrong: %s\n"
++ msgstr "ip: argument incorrect: %s\n"
++ 
++-#: ../ipmaddr.c:56
+++#: ../ipmaddr.c:61
+++#, c-format
++ msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
++ msgstr "Syntaxe: ipmaddr [ add | del ] MULTIADR dev CHAINE\n"
++ 
++-#: ../ipmaddr.c:57
+++#: ../ipmaddr.c:62
+++#, c-format
++ msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
++ msgstr "       ipmaddr show [ dev CHAINE ] [ ipv4 | ipv6 | link | all ]\n"
++ 
++-#: ../ipmaddr.c:58
+++#: ../ipmaddr.c:63
+++#, c-format
++ msgid "       ipmaddr -V | -version\n"
++ msgstr ""
++ 
++-#: ../ipmaddr.c:258
+++#: ../ipmaddr.c:263
++ #, c-format
++ msgid "family %d "
++ msgstr ""
++ 
++-#: ../ipmaddr.c:267
+++#: ../ipmaddr.c:272
++ #, c-format
++ msgid " users %d"
++ msgstr ""
++ 
++-#: ../ipmaddr.c:353
+++#: ../ipmaddr.c:358
++ msgid "Cannot create socket"
++ msgstr "Ne peut créer une socket"
++ 
++@@ -2436,6 +2995,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
++ msgstr ""
++ 
++ #: ../slattach.c:192
+++#, fuzzy, c-format
++ msgid "slattach: cannot write PID file\n"
++ msgstr "slattach: tty_lock: (%s): %s\n"
++ 
++@@ -2454,59 +3014,88 @@ msgstr "slattach: tty_hangup(DROP): %s\n
++ msgid "slattach: tty_hangup(RAISE): %s\n"
++ msgstr "slattach: tty_hangup(RAISE): %s\n"
++ 
++-#: ../slattach.c:486
+++#: ../slattach.c:468
+++#, fuzzy, c-format
+++msgid "slattach: tty name too long\n"
+++msgstr "%s: nom trop long\n"
+++
+++#: ../slattach.c:498
+++#, c-format
++ msgid "slattach: tty_open: cannot get current state!\n"
++ msgstr "slattach: tty_open: ne peut obtenir l'état courant !\n"
++ 
++-#: ../slattach.c:493
+++#: ../slattach.c:505
+++#, c-format
++ msgid "slattach: tty_open: cannot get current line disc!\n"
++ msgstr ""
++ "slattach: tty_open: ne peut obtenir la discipline de ligne actuelle !\n"
++ 
++-#: ../slattach.c:501
+++#: ../slattach.c:513
+++#, c-format
++ msgid "slattach: tty_open: cannot set RAW mode!\n"
++ msgstr "slattach: tty_open: ne peut activer le mode RAW !\n"
++ 
++-#: ../slattach.c:508
+++#: ../slattach.c:520
++ #, c-format
++ msgid "slattach: tty_open: cannot set %s bps!\n"
++ msgstr "slattach: tty_open: ne peut passer à %s bps!\n"
++ 
++-#: ../slattach.c:518
+++#: ../slattach.c:530
+++#, c-format
++ msgid "slattach: tty_open: cannot set 8N1 mode!\n"
++ msgstr "slattach: tty_open: ne peut activer le mode 8N1 !\n"
++ 
++-#: ../slattach.c:686
+++#: ../slattach.c:672
+++#, c-format
+++msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
+++msgstr ""
+++
+++#: ../slattach.c:704
++ #, c-format
++ msgid "%s started"
++ msgstr ""
++ 
++-#: ../slattach.c:687
+++#: ../slattach.c:705
++ #, c-format
++ msgid " on %s"
++ msgstr ""
++ 
++-#: ../slattach.c:688
+++#: ../slattach.c:706
++ #, fuzzy, c-format
++ msgid " interface %s\n"
++ msgstr "%s: interface inconnue: %s\n"
++ 
++ #~ msgid ""
++-#~ "   This comand can get or set the hostname or the NIS domainname. You can\n"
++-#~ msgstr ""
++-#~ "   Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine "
++-#~ "NIS. Vous pouvez\n"
+++#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
+++#~ "<-''-\n"
+++#~ msgstr "  arp [-v]   [<MAT>] [-i <if>] -s  <hôte> <adrmat> [netmask <nm>] pub  <-''-\n"
+++
+++#~ msgid "%s: unknown interface: %s\n"
+++#~ msgstr "%s: interface inconnue: %s\n"
+++
+++#~ msgid "address mask replies"
+++#~ msgstr "réponses de masque d'adresses"
+++
+++#~ msgid "unknown title %s\n"
+++#~ msgstr "titre inconnu %s\n"
+++
+++#~ msgid "Routing table for `ddp' not yet supported.\n"
+++#~ msgstr "Table de routage pour `ddp' pas encore supporté.\n"
+++
+++#~ msgid ""
+++#~ "   This comand can get or set the hostname or the NIS domainname. You "
+++#~ "can\n"
+++#~ msgstr "   Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine NIS. Vous pouvez\n"
++ 
++ #~ msgid ""
++ #~ "   also get the DNS domain or the FQDN (fully qualified domain name).\n"
++ #~ msgstr ""
++-#~ "   aussi obtenir le domaine DNS ou le FQDN (fully qualified domain name).\n"
+++#~ "   aussi obtenir le domaine DNS ou le FQDN (fully qualified domain "
+++#~ "name).\n"
++ 
++ #~ msgid ""
++ #~ "   Unless you are using bind or NIS for host lookups you can change the\n"
++-#~ msgstr ""
++-#~ "   Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous "
++-#~ "pouvez changer le\n"
+++#~ msgstr "   Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n"
++ 
++ #~ msgid ""
++ #~ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
+--- net-tools-1.60.orig/debian/patches/CVS-20030911-nameif.c_sync.patch
++++ net-tools-1.60/debian/patches/CVS-20030911-nameif.c_sync.patch
+@@ -0,0 +1,90 @@
++Sync with upstream CVS, complete log:
++
++Revision 1.4 - Thu Sep 11 03:46:49 2003 UTC by ak
++Fix off by one in name length checking
++
++Revision 1.3 - Thu Mar 6 23:26:52 2003 UTC by ecki
++Fix Debian Bug#178209, Fix RedHat Bug#85748: nameif segfaults
++
++Revision 1.2 - Sun Nov 25 06:55:06 2001 UTC by ecki
++fixed debian bug#111642 reported by Jonathan Amery <jdamery@pick.ucam.org>
++(newline missing in nameif usage)
++
++Index: net-tools/nameif.c
++===================================================================
++--- net-tools.orig/nameif.c
+++++ net-tools/nameif.c
++@@ -3,7 +3,7 @@
++  * Writen 2000 by Andi Kleen.
++  * Subject to the Gnu Public License, version 2.  
++  * TODO: make it support token ring etc.
++- * $Id: nameif.c,v 1.1 2000/10/18 17:26:29 ak Exp $
+++ * $Id: nameif.c,v 1.4 2003/09/11 03:46:49 ak Exp $
++  */ 
++ #ifndef _GNU_SOURCE 
++ #define _GNU_SOURCE
++@@ -117,7 +117,8 @@ int getmac(char *name, unsigned char *ma
++ }
++ 
++ struct change { 
++-	struct change *next,**pprev;
+++	struct change *next;
+++	int found;
++ 	char ifname[IFNAMSIZ+1];
++ 	unsigned char mac[6];
++ }; 
++@@ -139,10 +140,7 @@ int addchange(char *p, struct change *ch
++ 			ch->ifname, pos); 
++ 	if (parsemac(p,ch->mac) < 0) 
++ 		complain(_("cannot parse MAC `%s' at %s"), p, pos); 
++-	if (clist) 
++-		clist->pprev = &ch->next;
++ 	ch->next = clist;
++-	ch->pprev = &clist;
++ 	clist = ch;
++ 	return 0; 
++ }
++@@ -177,7 +175,7 @@ void readconf(void)
++ 		if (*p == '\0')
++ 			continue; 
++ 		n = strcspn(p, " \t"); 
++-		if (n > IFNAMSIZ) 
+++		if (n > IFNAMSIZ-1) 
++ 			complain(_("interface name too long at line %d"), line);  
++ 		memcpy(ch->ifname, p, n); 
++ 		ch->ifname[n] = 0; 
++@@ -200,7 +198,7 @@ struct option lopt[] = { 
++ 
++ void usage(void)
++ {
++-	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); 
+++	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); 
++ 	exit(1); 
++ }
++ 
++@@ -277,21 +275,21 @@ int main(int ac, char **av) 
++ 		ch = lookupmac(mac); 
++ 		if (!ch) 
++ 			continue;
++-			
++-		*ch->pprev = ch->next;
+++		
+++		ch->found = 1;	
++ 		if (strcmp(p, ch->ifname)) { 
++ 			if (setname(p, ch->ifname) < 0)  
++ 				complain(_("cannot change name of %s to %s: %s"),
++ 						p, ch->ifname, strerror(errno)); 
++ 		} 
++-		free(ch);
++ 	} 
++ 	fclose(ifh); 
++ 	
++ 	while (clist) { 
++ 		struct change *ch = clist;
++ 		clist = clist->next;
++-		warning(_("interface '%s' not found"), ch->ifname); 
+++		if (!ch->found)
+++			warning(_("interface '%s' not found"), ch->ifname); 
++ 		free(ch); 
++ 	}
++ 
+--- net-tools-1.60.orig/debian/patches/netstat.c-assorted_changes.patch
++++ net-tools-1.60/debian/patches/netstat.c-assorted_changes.patch
+@@ -0,0 +1,138 @@
++Unsyncable patches that are nevertheless already in upstream's CVS in the
++following revisions:
++
++* 1.57: Enable netstat -s for IPv6 (Debian Bug #453859 from Varun Chandramohan)
++* 1.55: use new page aliged proc_fopen for address families
++
++Index: net-tools/netstat.c
++===================================================================
++--- net-tools.orig/netstat.c
+++++ net-tools/netstat.c
++@@ -6,7 +6,7 @@
++  *              NET-3 Networking Distribution for the LINUX operating
++  *              system.
++  *
++- * Version:     $Id: netstat.c,v 1.54 2007/12/01 18:12:34 ecki Exp $
+++ * Version:     $Id: netstat.c,v 1.55 2007/12/01 19:00:40 ecki Exp $
++  *
++  * Authors:     Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de>
++  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
++@@ -94,6 +94,7 @@
++ #include "sockets.h"
++ #include "interface.h"
++ #include "util.h"
+++#include "proc.h"
++ 
++ #define PROGNAME_WIDTH 20
++ 
++@@ -104,6 +105,8 @@
++ /* prototypes for statistics.c */
++ void parsesnmp(int, int, int);
++ void inittab(void);
+++void parsesnmp6(int, int, int);
+++void inittab6(void);
++ 
++ typedef enum {
++     SS_FREE = 0,		/* not allocated                */
++@@ -153,7 +156,7 @@ int flag_ver = 0;
++ FILE *procinfo;
++ 
++ #define INFO_GUTS1(file,name,proc)			\
++-  procinfo = fopen((file), "r");			\
+++  procinfo = proc_fopen((file));			\
++   if (procinfo == NULL) {				\
++     if (errno != ENOENT) {				\
++       perror((file));					\
++@@ -174,7 +177,7 @@ FILE *procinfo;
++ #if HAVE_AFINET6
++ #define INFO_GUTS2(file,proc)				\
++   lnr = 0;						\
++-  procinfo = fopen((file), "r");		       	\
+++  procinfo = proc_fopen((file));		       	\
++   if (procinfo != NULL) {				\
++     do {						\
++       if (fgets(buffer, sizeof(buffer), procinfo))	\
++@@ -454,7 +457,7 @@ static int netrom_info(void)
++     char buffer[256], dev[16];
++     int st, vs, vr, sendq, recvq, ret;
++ 
++-    f = fopen(_PATH_PROCNET_NR, "r");
+++    f = proc_fopen(_PATH_PROCNET_NR);
++     if (f == NULL) {
++ 	if (errno != ENOENT) {
++ 	    perror(_PATH_PROCNET_NR);
++@@ -650,7 +653,7 @@ static void igmp_do_one(int lnr, const c
++ #if HAVE_AFX25
++ static int x25_info(void)
++ {
++-       FILE *f=fopen(_PATH_PROCNET_X25, "r");
+++       FILE *f=proc_fopen(_PATH_PROCNET_X25);
++        char buffer[256],dev[16];
++        int st,vs,vr,sendq,recvq,lci;
++        static char *x25_state[5]=
++@@ -661,7 +664,7 @@ static int x25_info(void)
++                "ESTABLISHED",
++                "RECOVERY"
++        };
++-       if(!(f=fopen(_PATH_PROCNET_X25, "r")))
+++       if(!(f=proc_fopen(_PATH_PROCNET_X25)))
++        {
++                if (errno != ENOENT) {
++                        perror(_PATH_PROCNET_X25);
++@@ -1269,7 +1272,7 @@ static int ax25_info(void)
++ 	N_("ESTABLISHED"),
++ 	N_("RECOVERY")
++     };
++-    if (!(f = fopen(_PATH_PROCNET_AX25, "r"))) {
+++    if (!(f = proc_fopen(_PATH_PROCNET_AX25))) {
++ 	if (errno != ENOENT) {
++ 	    perror(_PATH_PROCNET_AX25);
++ 	    return (-1);
++@@ -1365,13 +1368,13 @@ static int ipx_info(void)
++     unsigned sport = 0, dport = 0;
++     struct stat s;
++     
++-    f = fopen(_PATH_PROCNET_IPX_SOCKET1, "r");
+++    f = proc_fopen(_PATH_PROCNET_IPX_SOCKET1);
++     if (!f) {
++         if (errno != ENOENT) {
++             perror(_PATH_PROCNET_IPX_SOCKET1);
++             return (-1);
++         }
++-        f = fopen(_PATH_PROCNET_IPX_SOCKET2, "r");
+++        f = proc_fopen(_PATH_PROCNET_IPX_SOCKET2);
++ 
++         /* We need to check for directory */
++         if (f) {
++@@ -1728,9 +1731,28 @@ int main
++     }
++ 
++     if (flag_sta) {
++-        inittab();
++-	parsesnmp(flag_raw, flag_tcp, flag_udp);
++-	exit(0);
+++        char *tmp1, *tmp2;
+++        char buf[256];
+++        if (!afname[0]) {
+++            inittab();
+++            parsesnmp(flag_raw, flag_tcp, flag_udp);
+++        } else {
+++            safe_strncpy(buf, afname, sizeof(buf));
+++            tmp1 = buf;
+++            if ((tmp2 = index(tmp1, ',')))
+++                 printf("Multiple interface\n");
+++            else if(!strncmp(buf,"inet6",5)) {
+++#if HAVE_AFINET6
+++                 inittab6();
+++                 parsesnmp6(flag_raw, flag_tcp, flag_udp);
+++#else
+++                 printf("Address type not supported for stats\n");
+++#endif
+++            }
+++            else
+++                 printf("Address type not supported for stats\n");
+++        }
+++        exit(1);
++     }
++     
++     if (flag_rou) {
diff --git a/source/n/netdate/netdate.SlackBuild b/source/n/netdate/netdate.SlackBuild
index 3d13e75e7..f2fbe6a42 100755
--- a/source/n/netdate/netdate.SlackBuild
+++ b/source/n/netdate/netdate.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=bsd4
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netdate
diff --git a/source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild b/source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild
index 2beca1246..64cfafdf1 100755
--- a/source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild
+++ b/source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-bootparamd
diff --git a/source/n/netkit-ftp/netkit-ftp.SlackBuild b/source/n/netkit-ftp/netkit-ftp.SlackBuild
index b97888bbc..5ad8a1610 100755
--- a/source/n/netkit-ftp/netkit-ftp.SlackBuild
+++ b/source/n/netkit-ftp/netkit-ftp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-ftp
diff --git a/source/n/netkit-ntalk/netkit-ntalk.SlackBuild b/source/n/netkit-ntalk/netkit-ntalk.SlackBuild
index 9bc9937d5..9b41fa2d6 100755
--- a/source/n/netkit-ntalk/netkit-ntalk.SlackBuild
+++ b/source/n/netkit-ntalk/netkit-ntalk.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-ntalk
diff --git a/source/n/netkit-routed/netkit-routed.SlackBuild b/source/n/netkit-routed/netkit-routed.SlackBuild
index 326aa5ec1..8881ba418 100755
--- a/source/n/netkit-routed/netkit-routed.SlackBuild
+++ b/source/n/netkit-routed/netkit-routed.SlackBuild
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-routed
diff --git a/source/n/netkit-rsh/netkit-rsh.SlackBuild b/source/n/netkit-rsh/netkit-rsh.SlackBuild
index 009775f30..ee1e8ce54 100755
--- a/source/n/netkit-rsh/netkit-rsh.SlackBuild
+++ b/source/n/netkit-rsh/netkit-rsh.SlackBuild
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-rsh
diff --git a/source/n/netkit-rsh/slack-desc b/source/n/netkit-rsh/slack-desc
index 8c05f4812..8b5b7dc28 100644
--- a/source/n/netkit-rsh/slack-desc
+++ b/source/n/netkit-rsh/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-netkit-rsh: netket-rsh (the BSD rsh/rcp/rlogin clients and daemon)
+netkit-rsh: netkit-rsh (the BSD rsh/rcp/rlogin clients and daemon)
 netkit-rsh:
 netkit-rsh: The old BSD rsh suite.  Note that none of these programs provide
 netkit-rsh: encryption or strong authentication of network connections.  As such,
diff --git a/source/n/netkit-rusers/netkit-rusers.SlackBuild b/source/n/netkit-rusers/netkit-rusers.SlackBuild
index 2c87797cd..b8b79fb64 100755
--- a/source/n/netkit-rusers/netkit-rusers.SlackBuild
+++ b/source/n/netkit-rusers/netkit-rusers.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-rusers
diff --git a/source/n/netkit-rwall/netkit-rwall.SlackBuild b/source/n/netkit-rwall/netkit-rwall.SlackBuild
index 67e73c260..5561e4fe9 100755
--- a/source/n/netkit-rwall/netkit-rwall.SlackBuild
+++ b/source/n/netkit-rwall/netkit-rwall.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-rwall
diff --git a/source/n/netkit-rwho/netkit-rwho.SlackBuild b/source/n/netkit-rwho/netkit-rwho.SlackBuild
index e3b46a49d..e4ba49b25 100755
--- a/source/n/netkit-rwho/netkit-rwho.SlackBuild
+++ b/source/n/netkit-rwho/netkit-rwho.SlackBuild
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-rwho
diff --git a/source/n/netkit-timed/netkit-timed.SlackBuild b/source/n/netkit-timed/netkit-timed.SlackBuild
index 3e703f84f..bd511e30c 100755
--- a/source/n/netkit-timed/netkit-timed.SlackBuild
+++ b/source/n/netkit-timed/netkit-timed.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netkit-timed
diff --git a/source/n/netpipes/netpipes.SlackBuild b/source/n/netpipes/netpipes.SlackBuild
index 9dd2ebd87..17d81bbb5 100755
--- a/source/n/netpipes/netpipes.SlackBuild
+++ b/source/n/netpipes/netpipes.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=4.2
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-netpipes
diff --git a/source/n/netwatch/netwatch.SlackBuild b/source/n/netwatch/netwatch.SlackBuild
index 878269cc6..dd87b1d6c 100755
--- a/source/n/netwatch/netwatch.SlackBuild
+++ b/source/n/netwatch/netwatch.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,18 @@
 
 VERSION=1.3.0
 EXTRAVERSION=${EXTRAVERSION:-1}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -34,6 +43,8 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/n/netwrite/netwrite.SlackBuild b/source/n/netwrite/netwrite.SlackBuild
index edebb6cc1..c667d3aa3 100755
--- a/source/n/netwrite/netwrite.SlackBuild
+++ b/source/n/netwrite/netwrite.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
diff --git a/source/n/newspost/newspost.SlackBuild b/source/n/newspost/newspost.SlackBuild
index 99fee17e0..cd01269a6 100755
--- a/source/n/newspost/newspost.SlackBuild
+++ b/source/n/newspost/newspost.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=2.1.1
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
diff --git a/source/n/nfs-utils/doinst.sh b/source/n/nfs-utils/doinst.sh
new file mode 100644
index 000000000..214ff1b9e
--- /dev/null
+++ b/source/n/nfs-utils/doinst.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+config var/lib/nfs/etab.new
+config var/lib/nfs/rmtab.new
+config var/lib/nfs/state.new
+config var/lib/nfs/xtab.new
+rm -f var/lib/nfs/*.new
+if [ -x etc/rc.d/rc.nfsd ]; then
+  chmod 755 etc/rc.d/rc.nfsd.new
+else
+  chmod 644 etc/rc.d/rc.nfsd.new
+fi
+config etc/rc.d/rc.nfsd.new
+config etc/nfsmount.conf.new
+config etc/exports.new
+# If you already had your own /etc/exports, this one is probably useless...
+rm -f etc/exports.new
+( cd sbin ; rm -rf umount.nfs )
+( cd sbin ; ln -sf mount.nfs umount.nfs )
+( cd usr/man/man8 ; rm -rf rpc.mountd.8.gz )
+( cd usr/man/man8 ; ln -sf mountd.8.gz rpc.mountd.8.gz )
+( cd usr/man/man8 ; rm -rf rpc.nfsd.8.gz )
+( cd usr/man/man8 ; ln -sf nfsd.8.gz rpc.nfsd.8.gz )
+( cd usr/man/man8 ; rm -rf rpc.statd.8.gz )
+( cd usr/man/man8 ; ln -sf statd.8.gz rpc.statd.8.gz )
+( cd usr/man/man8 ; rm -rf rpc.sm-notify.8.gz )
+( cd usr/man/man8 ; ln -sf sm-notify.8.gz rpc.sm-notify.8.gz )
+( cd usr/sbin ; rm -rf rpc.statd )
+( cd usr/sbin ; ln -sf ../../sbin/rpc.statd rpc.statd )
diff --git a/source/n/nfs-utils/nfs-utils-1.2.2.tar.bz2.sign b/source/n/nfs-utils/nfs-utils-1.2.2.tar.bz2.sign
deleted file mode 100644
index a4b95a792..000000000
--- a/source/n/nfs-utils/nfs-utils-1.2.2.tar.bz2.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBLfTsAyGugalF9Dw4RAgLSAJ0TnlJLHcU7dEWZ80LA775ZuQnrigCgjnWB
-bxbY8o9jiBY9G422Fh6b8bA=
-=dG1E
------END PGP SIGNATURE-----
diff --git a/source/n/nfs-utils/nfs-utils-1.2.3.tar.sign b/source/n/nfs-utils/nfs-utils-1.2.3.tar.sign
new file mode 100644
index 000000000..f159e0b64
--- /dev/null
+++ b/source/n/nfs-utils/nfs-utils-1.2.3.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBMoeJcyGugalF9Dw4RApKyAJ91WfvKRivOd7XKaUXrNaIDlhwozACfacf5
+b0Maa5t3jk5Pnj+IQqvic+g=
+=cnNE
+-----END PGP SIGNATURE-----
diff --git a/source/n/nfs-utils/nfs-utils.SlackBuild b/source/n/nfs-utils/nfs-utils.SlackBuild
index 8f3e3ef88..2cf5a150c 100755
--- a/source/n/nfs-utils/nfs-utils.SlackBuild
+++ b/source/n/nfs-utils/nfs-utils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.2.2
-BUILD=${BUILD:-1}
+VERSION=1.2.3
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -64,7 +64,7 @@ chmod 644 $PKG/etc/rc.d/rc.nfsd.new
 
 cd $TMP
 rm -rf nfs-utils-$VERSION
-tar xvf $CWD/nfs-utils-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/nfs-utils-$VERSION.tar.xz || exit 1
 cd nfs-utils-$VERSION || exit 1
 
 zcat $CWD/nfs-utils.lwrap.needs.lnsl.diff.gz | patch -p1 --verbose || exit 1
@@ -84,6 +84,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --with-statedir=/var/lib/nfs \
   --enable-nfsv3 \
+  --enable-mountconfig \
   --enable-nfsv4=no \
   --enable-gss=no \
   --enable-tirpc=no \
@@ -94,6 +95,13 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Add nfsmount.conf and man page:
+cat ./utils/mount/nfsmount.conf > $PKG/etc/nfsmount.conf.new
+mkdir -p $PKG/usr/man/man5
+cat ./utils/mount/nfsmount.conf.man > $PKG/usr/man/man5/nfsmount.conf.5
+# Set default protocol version 3:
+sed -i "s/# Defaultvers=4/Defaultvers=3/g" $PKG/etc/nfsmount.conf.new
+
 # These might be in use:
 ( cd $PKG/var/lib/nfs
   for config_file in etab rmtab state xtab ; do
@@ -114,13 +122,21 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/nfs-utils-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS README \
+  AUTHORS COPYING* INSTALL NEWS README* \
   $PKG/usr/doc/nfs-utils-$VERSION
 mkdir -p $PKG/usr/doc/nfs-utils-$VERSION/statd
 cp -a \
   utils/statd/COPYING utils/statd/COPYRIGHT utils/statd/TODO \
   $PKG/usr/doc/nfs-utils-$VERSION/statd
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 # Compress and if needed symlink the man pages:
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man
@@ -138,38 +154,7 @@ fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat << EOF > $PKG/install/doinst.sh
-#!/bin/sh
-config() {
-  NEW="\$1"
-  OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r \$OLD ]; then
-    mv \$NEW \$OLD
-  elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then # toss the redundant copy
-    rm \$NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-EOF
-( cd $PKG/var/lib/nfs
-  for config_file in etab.new rmtab.new state.new xtab.new ; do
-    if [ -r ${config_file} ]; then
-      echo "config var/lib/nfs/${config_file}" >> $PKG/install/doinst.sh
-    fi
-  done
-)
-# If these aren't moved into place, they're junk:
-echo "rm -f var/lib/nfs/*.new" >> $PKG/install/doinst.sh
-cat << EOF >> $PKG/install/doinst.sh
-if [ -x etc/rc.d/rc.nfsd ]; then
-  chmod 755 etc/rc.d/rc.nfsd.new
-else
-  chmod 644 etc/rc.d/rc.nfsd.new
-fi
-config etc/rc.d/rc.nfsd.new
-config etc/exports.new
-EOF
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 # Build the package:
 cd $PKG
diff --git a/source/n/nfs-utils/rc.nfsd b/source/n/nfs-utils/rc.nfsd
index f21133829..b43bd3b8c 100644
--- a/source/n/nfs-utils/rc.nfsd
+++ b/source/n/nfs-utils/rc.nfsd
@@ -16,9 +16,9 @@ nfsd_start() {
     exit # no uncommented shares in /etc/exports
   fi
 
-  # First, make sure the nfsd kernel module is loaded.  You can comment this
-  # part out if you've built nfsd support directly into the kernel.
-  if [ -z "`/sbin/lsmod | grep "^nfsd "`" ]; then
+  # If we do not detect nfsd support built into the kernel (or previously
+  # loaded as a module), we will try to load the nfsd.ko kernel module:
+  if [ ! -r /proc/1/net/rpc/nfsd ]; then
     /sbin/modprobe nfsd
   fi
 
diff --git a/source/n/nmap/nmap.SlackBuild b/source/n/nmap/nmap.SlackBuild
index 747836ccf..d228e63aa 100755
--- a/source/n/nmap/nmap.SlackBuild
+++ b/source/n/nmap/nmap.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-5.21}
+VERSION=${VERSION:-5.51}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -75,7 +75,8 @@ find . \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-liblua=included \
   --mandir=/usr/man \
   --docdir=/usr/doc/nmap-$VERSION \
   --build=$ARCH-slackware-linux
@@ -84,7 +85,10 @@ make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/nmap-$VERSION
-cp -a COPYING* HACKING INSTALL $PKG/usr/doc/nmap-$VERSION
+cp -a COPYING* HACKING INSTALL \
+  docs/licenses/ \
+  docs/*.txt \
+  $PKG/usr/doc/nmap-$VERSION
 ( cd docs
   # It looks like all of these translations are gone from the 4.00+ tarball, and
   # most of them are not available on the web site.  Sorry -- I didn't do it.
diff --git a/source/n/ntp/ntp.conf b/source/n/ntp/ntp.conf
index b2476786e..74aae4c19 100644
--- a/source/n/ntp/ntp.conf
+++ b/source/n/ntp/ntp.conf
@@ -13,7 +13,10 @@
 #
 server	127.127.1.0	# local clock
 fudge	127.127.1.0 stratum 10	
-#server  pool.ntp.org
+
+#
+# NTP server (list one or more) to synchronize with:
+#server pool.ntp.org iburst
 
 #
 # Drift file.  Put this in a directory which the daemon can write to.
@@ -22,8 +25,12 @@ fudge	127.127.1.0 stratum 10
 # it to the file.
 #
 driftfile /etc/ntp/drift
-multicastclient			# listen on default 224.0.1.1
-broadcastdelay	0.008
+
+#
+# Uncomment to use a multicast NTP server on the local subnet:
+#multicastclient 224.0.1.1		# listen on default 224.0.1.1
+# Set an optional compensation for broadcast packet delay:
+#broadcastdelay	0.008
 
 #
 # Keys file.  If you want to diddle your server at run time, make a
@@ -37,8 +44,11 @@ broadcastdelay	0.008
 #requestkey	65535
 #controlkey	65535
 
+#
 # Don't serve time or stats to anyone else by default (more secure)
 restrict default noquery nomodify
+
+#
 # Trust ourselves.  :-)
 restrict 127.0.0.1
 
diff --git a/source/n/obex-data-server/obex-data-server.SlackBuild b/source/n/obex-data-server/obex-data-server.SlackBuild
index 512b0e0d2..e81a071a1 100755
--- a/source/n/obex-data-server/obex-data-server.SlackBuild
+++ b/source/n/obex-data-server/obex-data-server.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=obex-data-server
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/obexftp/obexftp.SlackBuild b/source/n/obexftp/obexftp.SlackBuild
index e2992d559..c6be7ccc4 100755
--- a/source/n/obexftp/obexftp.SlackBuild
+++ b/source/n/obexftp/obexftp.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 PKGNAM=obexftp
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-5}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild
index 3d0d1a986..89a968f92 100755
--- a/source/n/openssh/openssh.SlackBuild
+++ b/source/n/openssh/openssh.SlackBuild
@@ -2,7 +2,7 @@
 
 # Copyright 2000 BSDi, Inc. Concord, CA, USA
 # Copyright 2001, 2002, 2003, 2004  Slackware Linux, Inc. Concord, CA, USA
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/source/n/openssh/rc.sshd b/source/n/openssh/rc.sshd
index 8b496568e..cb2dfa410 100644
--- a/source/n/openssh/rc.sshd
+++ b/source/n/openssh/rc.sshd
@@ -12,6 +12,9 @@ sshd_start() {
   if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
     /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
   fi
+  if [ ! -f /etc/ssh/ssh_host_ecdsa_key ]; then
+    /usr/bin/ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N ''
+  fi
   /usr/sbin/sshd
 }
 
diff --git a/source/n/openssl/certwatch b/source/n/openssl/certwatch
index ac8d83403..8fef1509f 100644
--- a/source/n/openssl/certwatch
+++ b/source/n/openssl/certwatch
@@ -93,7 +93,7 @@ find $CERTDIR -type f -maxdepth 1 | while read certfile ; do
     continue
   fi
   echo "$certfile" | grep -q -i '\.der$'
-  if [ $? -eq 0 -o "$(file "$certfile" | grep ASCII)" == "" ]; then
+  if [ $? -eq 0 -o "$(file "$certfile" | egrep '(ASCII|PEM)')" == "" ]; then
     inform=DER
   fi
   # We wont use '-checkend' since it is not properly documented (as of
diff --git a/source/n/openssl/doinst.sh-openssl b/source/n/openssl/doinst.sh-openssl
index f73c5a514..c92e60763 100644
--- a/source/n/openssl/doinst.sh-openssl
+++ b/source/n/openssl/doinst.sh-openssl
@@ -9,7 +9,13 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
+
+# If there is a known buggy certwatch script with no local
+# modifications, just replace it:
+if [ "$(md5sum etc/cron.daily/certwatch 2> /dev/null)" = "32556321806f1850d56cb2ef8384b7a1  etc/cron.daily/certwatch" ]; then
+  cat etc/cron.daily/certwatch.new > etc/cron.daily/certwatch
+  touch -r etc/cron.daily/certwatch.new etc/cron.daily/certwatch
+fi
+
 config etc/ssl/openssl.cnf.new
 config etc/cron.daily/certwatch.new
-# If the admin has modified this in any way, no need to keep the sample.
-rm -f etc/cron.daily/certwatch.new
diff --git a/source/n/openssl/openssl.SlackBuild b/source/n/openssl/openssl.SlackBuild
index 82aa87f3c..f0e55b52c 100755
--- a/source/n/openssl/openssl.SlackBuild
+++ b/source/n/openssl/openssl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Copyright 2000 BSDi, Inc. Concord, CA, USA
 # Copyright 2001, 2002 Slackware Linux, Inc.  Concord, CA, USA
-# Copyright 2005, 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 
 VERSION=${VERSION:-$(echo openssl-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -65,6 +65,15 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+# OpenSSL has a (nasty?) habit of bumping the internal version number with
+# every release.  This wouldn't be so bad, but some applications are so
+# paranoid that they won't run against a different OpenSSL version than
+# what they were compiled against, whether or not the ABI has changed.
+#
+# So, we will use the OPENSSL_VERSION_NUMBER from openssl-0.9.8o unless ABI
+# breakage forces it to change.  Yes, we're finally using this old trick.  :)
+sed -i "s/#define OPENSSL_VERSION_NUMBER.*/\/* Use 0x009080efL (0.9.8o) below to avoid pointlessly breaking the ABI *\/\n#define OPENSSL_VERSION_NUMBER 0x009080efL/g" crypto/opensslv.h || exit 1
+
 chown -R root:root .
 mkdir -p $PKG1/usr/doc/openssl-$VERSION
 cp -a CHANGES CHANGES.SSLeay FAQ INSTALL INSTALL.MacOS INSTALL.VMS INSTALL.W32 \
diff --git a/source/n/openvpn/openvpn.SlackBuild b/source/n/openvpn/openvpn.SlackBuild
index 56e344c47..f0c78ce77 100755
--- a/source/n/openvpn/openvpn.SlackBuild
+++ b/source/n/openvpn/openvpn.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2006, Alan Hicks, Lizella, GA
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 
 
 PKGNAM=openvpn
-VERSION=2.1.1
-BUILD=${BUILD:-1}
+VERSION=2.1.4
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -83,6 +83,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/openvpn-${VERSION} \
   --enable-lzo \
+  --enable-iproute2 \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
@@ -124,8 +125,8 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a AUTHORS COPYING COPYRIGHT.GPL INSTALL INSTALL-win32.txt \
-  NEWS PORTS README sample-config-files sample-keys sample-scripts easy-rsa \
+cp -a AUTHORS COPYING* COPYRIGHT.GPL INSTALL INSTALL-win32.txt \
+  NEWS PORTS README* sample-config-files sample-keys sample-scripts easy-rsa \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/n/php/doinst.sh b/source/n/php/doinst.sh
index 15f611b52..eda8b0de9 100644
--- a/source/n/php/doinst.sh
+++ b/source/n/php/doinst.sh
@@ -4,5 +4,5 @@ elif [ "`cat etc/httpd/mod_php.conf 2> /dev/null`" = "" ]; then
   cp -a etc/httpd/mod_php.conf.example etc/httpd/mod_php.conf
 fi
 if [ ! -r etc/httpd/php.ini ]; then
-   cp -a etc/httpd/php.ini-recommended etc/httpd/php.ini
+   cp -a etc/httpd/php.ini-production etc/httpd/php.ini
 fi
diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh
new file mode 100755
index 000000000..5833da49c
--- /dev/null
+++ b/source/n/php/fetch-php.sh
@@ -0,0 +1 @@
+lftpget http://us2.php.net/distributions/php-5.3.6.tar.bz2 
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index dc0b74bbd..7a1fc1fd6 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -3,7 +3,7 @@
 # Build and package mod_php on Slackware.
 # by:  David Cantrell <david@slackware.com>
 # Modified for PHP 4-5 by volkerdi@slackware.com
-# Copyright 2007, 2008, 2009, 2010  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2011  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=5.2.13
+VERSION=5.3.6
 ALPINE=2.00
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -95,8 +95,8 @@ rm -rf php-$VERSION
 tar xvf $CWD/php-$VERSION.tar.?z* || exit 1
 cd php-$VERSION
 
-zcat $CWD/php.gmp5.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/php.gd_libpng-1.4.diff.gz | patch -p1 --verbose || exit 1
+# cleanup:
+find . -name "*.orig" -delete
 
 # Add missing(?) PEAR modules back:
 if [ -d php-$VERSION/pear/packages ]; then
@@ -124,12 +124,9 @@ find . -name "*.h" -exec chmod 644 {} \;
 find . -name "*.orig" -exec rm {} \;
 
 # Patch ini files:
-zcat $CWD/php.ini.diff.gz \
-  | sed -e "s#usr/lib/php#usr/lib${LIBDIRSUFFIX}/php#" \
-  | patch -p1 --verbose --backup --suffix=.orig || exit 1
-zcat $CWD/php.recommended.ini.diff.gz \
-  | sed -e "s#usr/lib/php#usr/lib${LIBDIRSUFFIX}/php#" \
-  | patch -p1 --verbose --backup --suffix=.orig || exit 1
+zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose php.ini-production || exit 1
+zcat $CWD/php.session.save_path.diff.gz | patch -p1 --verbose || exit 1
 
 # Generic "kitchen sink" configure function, with as many things as possible (and
 # maybe then some ;-) compiled as shared extensions:
@@ -155,7 +152,6 @@ CFLAGS="$SLKCFLAGS" \
   --enable-xml \
   --with-libxml-dir=/usr \
   --enable-simplexml \
-  --enable-spl \
   --enable-filter \
   --disable-debug \
   --with-openssl=shared \
@@ -171,7 +167,6 @@ CFLAGS="$SLKCFLAGS" \
   --enable-dba=shared \
   --with-gdbm=/usr \
   --with-db4=/usr \
-  --enable-dbase=shared \
   --enable-exif=shared \
   --enable-ftp=shared \
   --with-gd=shared \
@@ -191,19 +186,21 @@ CFLAGS="$SLKCFLAGS" \
   --with-ldap=shared \
   --enable-mbstring=shared \
   --enable-hash \
-  --with-mhash=shared,/usr \
-  --with-mysql=shared,/usr \
-  --with-mysqli=shared,/usr/bin/mysql_config \
+  --with-mysql=shared,mysqlnd \
+  --with-mysqli=shared,mysqlnd \
+  --with-mysql-sock=/var/run/mysql/mysql.sock \
   --enable-pdo=shared \
-  --with-pdo-mysql=shared,/usr \
+  --with-pdo-mysql=shared,mysqlnd \
   --with-pdo-sqlite=shared,/usr \
   --with-pspell=shared,/usr \
+  --with-enchant=shared,/usr \
   --with-mm=/usr \
   --enable-shmop=shared \
   --with-snmp=shared,/usr \
   --enable-soap=shared \
   --enable-sockets \
   --with-sqlite=shared \
+  --with-sqlite3=shared \
   --enable-sqlite-utf8 \
   --with-regex=php \
   --enable-sysvmsg \
@@ -232,44 +229,26 @@ php_configure \
 make $NUMJOBS || make || exit 1
 make install INSTALL_ROOT=$PKG || exit 1
 
-# Make the CLI version of PHP:
+# Make the CLI/CGI version of PHP:
 make distclean
 php_configure \
-  --enable-force-cgi-redirect \
   --enable-pcntl \
   --enable-sigchild
 make $NUMJOBS || make || exit 1
 mkdir -p $PKG/usr/bin
 cat ./sapi/cli/php > $PKG/usr/bin/php
+cat ./sapi/cgi/php-cgi > $PKG/usr/bin/php-cgi
 chmod 755 $PKG/usr/bin/php
-
-# Make the FastCGI interpreter:
-make distclean
-php_configure \
-  --enable-fastcgi \
-  --enable-pcntl \
-  --enable-sigchild
-make $NUMJOBS || make || exit 1
-mkdir -p $PKG/usr/bin
-cat sapi/cgi/php-cgi > $PKG/usr/bin/php-cgi
 chmod 755 $PKG/usr/bin/php-cgi
 
 # PHP (used to) install Pear with some strange permissions.
 chmod 755 $PKG/usr/bin/pear
-   
+
 # PHP sometimes puts junk in the root directory:
 ( cd $PKG
   rm -rf .channels .depdb .depdblock .filemap .lock .registry
 )
 
-## Fix a couple broken .reg files in php-5.2.10:
-#if ! grep -q Download $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pear.php.net.reg ; then
-#  cat $CWD/channels/pear.php.net.reg > $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pear.php.net.reg
-#fi
-#if ! grep -q Download $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pecl.php.net.reg ; then
-#  cat $CWD/channels/pecl.php.net.reg > $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pecl.php.net.reg
-#fi
-
 # Fix $PKG/usr/lib/php perms:
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}/php
   find . \
@@ -281,13 +260,14 @@ chmod 755 $PKG/usr/bin/pear
 
 mkdir -p $PKG/usr/doc/php-$VERSION
 cp -a \
-  CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README* TODO* \
+  CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README* TODO* UPGRADING* \
   sapi/cgi/README.FastCGI \
   $PKG/usr/doc/php-$VERSION
 chown -R root:root $PKG/usr/doc/php-$VERSION
+chmod 644 $PKG/usr/doc/php-$VERSION/UPGRADING*
 
 mkdir -p $PKG/etc/httpd
-cp -a php.ini-dist php.ini-recommended $PKG/etc/httpd
+cp -a php.ini-development php.ini-production $PKG/etc/httpd
 cat $CWD/mod_php.conf.example | sed -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" \
   > $PKG/etc/httpd/mod_php.conf.example
 chmod 644 $PKG/etc/httpd/*
diff --git a/source/n/php/php.gd_libpng-1.4.diff b/source/n/php/php.gd_libpng-1.4.diff
deleted file mode 100644
index a591b7331..000000000
--- a/source/n/php/php.gd_libpng-1.4.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru php-5.2.13.orig/ext/gd/libgd/gd_png.c php-5.2.13/ext/gd/libgd/gd_png.c
---- php-5.2.13.orig/ext/gd/libgd/gd_png.c	2009-03-14 12:48:42.000000000 -0500
-+++ php-5.2.13/ext/gd/libgd/gd_png.c	2010-03-21 02:17:03.000000000 -0500
-@@ -139,7 +139,7 @@
- 		return NULL;
- 	}
- 
--	if (!png_check_sig (sig, 8)) { /* bad signature */
-+	if (png_sig_cmp (sig, 0, 8)) { /* bad signature */
- 		return NULL;
- 	}
- 
diff --git a/source/n/php/php.gmp5.diff b/source/n/php/php.gmp5.diff
deleted file mode 100644
index f77dd33a1..000000000
--- a/source/n/php/php.gmp5.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./ext/gmp/gmp.c.orig	2010-01-03 03:23:27.000000000 -0600
-+++ ./ext/gmp/gmp.c	2010-03-05 21:27:46.000000000 -0600
-@@ -1396,7 +1396,7 @@
- 
- 		GMPG(rand_initialized) = 1;
- 	}
--	mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB);
-+	mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS);
- 
- 	ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp);
- }
diff --git a/source/n/php/php.ini-development.diff b/source/n/php/php.ini-development.diff
new file mode 100644
index 000000000..49b441e6b
--- /dev/null
+++ b/source/n/php/php.ini-development.diff
@@ -0,0 +1,47 @@
+--- ./php.ini-development.orig	2011-02-08 18:25:44.000000000 -0600
++++ ./php.ini-development	2011-04-01 22:42:50.000000000 -0500
+@@ -938,6 +938,44 @@
+ ; If you only provide the name of the extension, PHP will look for it in its
+ ; default extension directory.
+ ;
++
++; These are the extensions that are available for use on this PHP build.
++; If you do NOT need any of these extensions, you should comment them out.
++; That will probably increase both your security and performance.
++
++extension=bcmath.so
++extension=bz2.so
++extension=calendar.so
++extension=ctype.so
++extension=curl.so
++extension=dba.so
++extension=enchant.so
++extension=exif.so
++extension=ftp.so
++extension=gd.so
++extension=gettext.so
++extension=gmp.so
++extension=iconv.so
++extension=ldap.so
++extension=mbstring.so
++extension=mysql.so
++extension=mysqli.so
++extension=openssl.so
++extension=pdo.so
++extension=pdo_mysql.so
++extension=pdo_sqlite.so
++extension=pspell.so
++extension=shmop.so
++extension=snmp.so
++extension=soap.so
++extension=sqlite.so
++extension=sqlite3.so
++extension=tokenizer.so
++extension=wddx.so
++extension=xsl.so
++extension=zip.so
++extension=zlib.so
++
+ ; Windows Extensions
+ ; Note that ODBC support is built in, so no dll is needed for it.
+ ; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
diff --git a/source/n/php/php.ini.diff b/source/n/php/php.ini.diff
deleted file mode 100644
index fe01df22c..000000000
--- a/source/n/php/php.ini.diff
+++ /dev/null
@@ -1,114 +0,0 @@
---- ./php.ini-dist.orig	2007-05-27 13:04:10.000000000 -0500
-+++ ./php.ini-dist	2007-06-28 23:43:02.000000000 -0500
-@@ -473,7 +473,7 @@
- user_dir =
- 
- ; Directory in which the loadable extensions (modules) reside.
--extension_dir = "./"
-+extension_dir = "/usr/lib/php/extensions/"
- 
- ; Whether or not to enable the dl() function.  The dl() function does NOT work
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -585,58 +585,43 @@
- ; needs to go here.  Specify the location of the extension with the
- ; extension_dir directive above.
- 
-+; These are the extensions that are available for use on this PHP build.
-+; If you do NOT need any of these extensions, you should comment them out.
-+; That will probably increase both your security and performance.
-+
-+extension=bcmath.so
-+extension=bz2.so
-+extension=calendar.so
-+extension=ctype.so
-+extension=curl.so
-+extension=dba.so
-+extension=dbase.so
-+extension=exif.so
-+extension=ftp.so
-+extension=gettext.so
-+extension=gd.so
-+extension=gmp.so
-+extension=iconv.so
-+extension=ldap.so
-+extension=mbstring.so
-+extension=mhash.so
-+extension=mysql.so
-+extension=mysqli.so
-+extension=openssl.so
-+extension=pdo.so
-+extension=pdo_mysql.so
-+extension=pdo_sqlite.so
-+extension=pspell.so
-+extension=shmop.so
-+extension=snmp.so
-+extension=soap.so
-+extension=sqlite.so
-+extension=tokenizer.so
-+extension=wddx.so
-+extension=xsl.so
-+extension=zip.so
-+extension=zlib.so
- 
--; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
--; extension folders as well as the separate PECL DLL download (PHP 5).
--; Be sure to appropriately set the extension_dir directive.
--
--;extension=php_bz2.dll
--;extension=php_curl.dll
--;extension=php_dba.dll
--;extension=php_dbase.dll
--;extension=php_exif.dll
--;extension=php_fdf.dll
--;extension=php_gd2.dll
--;extension=php_gettext.dll
--;extension=php_gmp.dll
--;extension=php_ifx.dll
--;extension=php_imap.dll
--;extension=php_interbase.dll
--;extension=php_ldap.dll
--;extension=php_mbstring.dll
--;extension=php_mcrypt.dll
--;extension=php_mhash.dll
--;extension=php_mime_magic.dll
--;extension=php_ming.dll
--;extension=php_msql.dll
--;extension=php_mssql.dll
--;extension=php_mysql.dll
--;extension=php_mysqli.dll
--;extension=php_oci8.dll
--;extension=php_openssl.dll
--;extension=php_pdo.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_oci8.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_pspell.dll
--;extension=php_shmop.dll
--;extension=php_snmp.dll
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite.dll
--;extension=php_sybase_ct.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
--;extension=php_zip.dll
- 
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
-@@ -979,6 +964,7 @@
- ; where MODE is the octal representation of the mode. Note that this
- ; does not overwrite the process's umask.
- ;session.save_path = "/tmp"
-+session.save_path = "/var/lib/php"
- 
- ; Whether to use cookies.
- session.use_cookies = 1
diff --git a/source/n/php/php.recommended.ini.diff b/source/n/php/php.recommended.ini.diff
deleted file mode 100644
index 80469447f..000000000
--- a/source/n/php/php.recommended.ini.diff
+++ /dev/null
@@ -1,114 +0,0 @@
---- ./php.ini-recommended.orig	2007-05-27 13:04:10.000000000 -0500
-+++ ./php.ini-recommended	2007-06-29 00:14:12.000000000 -0500
-@@ -521,7 +521,7 @@
- user_dir =
- 
- ; Directory in which the loadable extensions (modules) reside.
--extension_dir = "./"
-+extension_dir = "/usr/lib/php/extensions/"
- 
- ; Whether or not to enable the dl() function.  The dl() function does NOT work
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -633,58 +633,43 @@
- ; needs to go here.  Specify the location of the extension with the
- ; extension_dir directive above.
- 
-+; These are the extensions that are available for use on this PHP build.
-+; If you do NOT need any of these extensions, you should comment them out.
-+; That will probably increase both your security and performance.
-+
-+extension=bcmath.so
-+extension=bz2.so
-+extension=calendar.so
-+extension=ctype.so
-+extension=curl.so
-+extension=dba.so
-+extension=dbase.so
-+extension=exif.so
-+extension=ftp.so
-+extension=gettext.so
-+extension=gd.so
-+extension=gmp.so
-+extension=iconv.so
-+extension=ldap.so
-+extension=mbstring.so
-+extension=mhash.so
-+extension=mysql.so
-+extension=mysqli.so
-+extension=openssl.so
-+extension=pdo.so
-+extension=pdo_mysql.so
-+extension=pdo_sqlite.so
-+extension=pspell.so
-+extension=shmop.so
-+extension=snmp.so
-+extension=soap.so
-+extension=sqlite.so
-+extension=tokenizer.so
-+extension=wddx.so
-+extension=xsl.so
-+extension=zip.so
-+extension=zlib.so
- 
--; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
--; extension folders as well as the separate PECL DLL download (PHP 5).
--; Be sure to appropriately set the extension_dir directive.
--
--;extension=php_bz2.dll
--;extension=php_curl.dll
--;extension=php_dba.dll
--;extension=php_dbase.dll
--;extension=php_exif.dll
--;extension=php_fdf.dll
--;extension=php_gd2.dll
--;extension=php_gettext.dll
--;extension=php_gmp.dll
--;extension=php_ifx.dll
--;extension=php_imap.dll
--;extension=php_interbase.dll
--;extension=php_ldap.dll
--;extension=php_mbstring.dll
--;extension=php_mcrypt.dll
--;extension=php_mhash.dll
--;extension=php_mime_magic.dll
--;extension=php_ming.dll
--;extension=php_msql.dll
--;extension=php_mssql.dll
--;extension=php_mysql.dll
--;extension=php_mysqli.dll
--;extension=php_oci8.dll
--;extension=php_openssl.dll
--;extension=php_pdo.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_oci8.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_pspell.dll
--;extension=php_shmop.dll
--;extension=php_snmp.dll
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite.dll
--;extension=php_sybase_ct.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
--;extension=php_zip.dll
- 
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
-@@ -1027,6 +1012,7 @@
- ; where MODE is the octal representation of the mode. Note that this
- ; does not overwrite the process's umask.
- ;session.save_path = "/tmp"
-+session.save_path = "/var/lib/php"
- 
- ; Whether to use cookies.
- session.use_cookies = 1
diff --git a/source/n/php/php.session.save_path.diff b/source/n/php/php.session.save_path.diff
new file mode 100644
index 000000000..60d6f072e
--- /dev/null
+++ b/source/n/php/php.session.save_path.diff
@@ -0,0 +1,22 @@
+--- ./php.ini-development.orig	2011-04-14 14:26:44.551000001 -0500
++++ ./php.ini-development	2011-04-14 14:38:48.591000954 -0500
+@@ -1506,7 +1506,7 @@
+ ; where MODE is the octal representation of the mode. Note that this
+ ; does not overwrite the process's umask.
+ ; http://php.net/session.save-path
+-;session.save_path = "/tmp"
++session.save_path = "/var/lib/php"
+ 
+ ; Whether to use cookies.
+ ; http://php.net/session.use-cookies
+--- ./php.ini-production.orig	2011-04-14 14:26:44.558000001 -0500
++++ ./php.ini-production	2011-04-14 14:39:09.598999155 -0500
+@@ -1513,7 +1513,7 @@
+ ; where MODE is the octal representation of the mode. Note that this
+ ; does not overwrite the process's umask.
+ ; http://php.net/session.save-path
+-;session.save_path = "/tmp"
++session.save_path = "/var/lib/php"
+ 
+ ; Whether to use cookies.
+ ; http://php.net/session.use-cookies
diff --git a/source/n/pidentd/pidentd.SlackBuild b/source/n/pidentd/pidentd.SlackBuild
index f14fbe530..051fdeb5f 100755
--- a/source/n/pidentd/pidentd.SlackBuild
+++ b/source/n/pidentd/pidentd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=3.0.19
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
diff --git a/source/n/popa3d/popa3d.SlackBuild b/source/n/popa3d/popa3d.SlackBuild
index 5d574df68..fbf88a4fd 100755
--- a/source/n/popa3d/popa3d.SlackBuild
+++ b/source/n/popa3d/popa3d.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.0.2
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
diff --git a/source/n/portmap/portmap.SlackBuild b/source/n/portmap/portmap.SlackBuild
index 3699bd9cf..544dc9af1 100755
--- a/source/n/portmap/portmap.SlackBuild
+++ b/source/n/portmap/portmap.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-6.0}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-portmap
diff --git a/source/n/procmail/procmail.SlackBuild b/source/n/procmail/procmail.SlackBuild
index 0d7456c2a..3e7ac6fd9 100755
--- a/source/n/procmail/procmail.SlackBuild
+++ b/source/n/procmail/procmail.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=3.22
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-procmail
@@ -66,8 +75,8 @@ cd ..
 
 mkdir -p $PKG/usr/doc/procmail-$VERSION
 cp -a \
-  Artistic COPYING FAQ FEATURES HISTORY INSTALL KNOWN_BUGS \
-  README examples \
+  Artistic COPYING* FAQ FEATURES HISTORY INSTALL KNOWN_BUGS \
+  README* examples \
   $PKG/usr/doc/procmail-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild
index e7227fda3..17b2c9088 100755
--- a/source/n/proftpd/proftpd.SlackBuild
+++ b/source/n/proftpd/proftpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.3.3
-DIRVER=1.3.3
-BUILD=${BUILD:-2}
+VERSION=1.3.3e
+DIRVER=1.3.3e
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -102,7 +102,7 @@ mkdir -p $PKG/home/ftp
 gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/proftpd-$VERSION
-cp -a COPYING CREDITS INSTALL NEWS README* \
+cp -a COPYING* CREDITS INSTALL NEWS README* \
   contrib/README.mod_wrap contrib/README.ratio \
   $PKG/usr/doc/proftpd-$VERSION
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/n/pssh/pssh.SlackBuild b/source/n/pssh/pssh.SlackBuild
index 25c19ae3c..d0870d785 100755
--- a/source/n/pssh/pssh.SlackBuild
+++ b/source/n/pssh/pssh.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,9 @@
 
 # required: package "python" version 2.2 or higher installed
 
-VERSION=2.1.1
+VERSION=2.2
 BUILD=1
 
-# Note that the package will be created as 'noarch' !
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -61,34 +60,38 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-for binary in bin/* ; do
-  # Fix an error from the author
-  sed -r "s|basedir\)|basedir + \"/lib${LIBDIRSUFFIX}\")|" \
-    < $binary > $binary.tmp
-  cp $binary.tmp $binary
-  rm -f $binary.tmp
-done
-
-mkdir -p $PKG/$PREFIX/bin
-cp -a bin/* $PKG/$PREFIX/bin/.
-
 for library in psshlib/* ; do
   # This will force removepkg to remove all runtime-compiled *.pyc files
   touch ${library}c
 done
 
-mkdir -p $PKG/$PREFIX/lib${LIBDIRSUFFIX}
-cp -a psshlib $PKG/$PREFIX/lib${LIBDIRSUFFIX}/.
+# Install:
+python setup.py build install --root=$PKG
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
 
 mkdir -p $PKG/$PREFIX/doc/pssh-$VERSION
 cp -a \
-  AUTHORS BUGS COPYING ChangeLog INSTALL PKG-INFO TODO \
+  AUTHORS BUGS COPYING* INSTALL PKG-INFO README* TODO \
   doc/pssh*html $PKG/$PREFIX/doc/pssh-$VERSION/.
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/pssh-$VERSION-noarch-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/pssh-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/n/pssh/slack-desc b/source/n/pssh/slack-desc
index 8b69ec685..0a4f043e5 100644
--- a/source/n/pssh/slack-desc
+++ b/source/n/pssh/slack-desc
@@ -16,4 +16,4 @@ pssh: kill command.
 pssh:
 pssh: Pssh has been written by Brent Chun <bnc at theether.org>, and is
 pssh: currently maintained by Andrew McNabb <amcnabb at mcnabbs.org>.
-pssh:
+pssh: Homepage:  http://parallel-ssh.googlecode.com
diff --git a/source/n/pth/pth.SlackBuild b/source/n/pth/pth.SlackBuild
index 1c2be6051..f6f791a37 100755
--- a/source/n/pth/pth.SlackBuild
+++ b/source/n/pth/pth.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2006  Robby Workman  (http://rlworkman.net) 
-# Copyright 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,16 +21,25 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=pth
-VERSION=2.0.7
-ARCH=${ARCH:-x86_64}
+PKGNAM=pth
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/pkg-$PRGNAM
+PKG=$TMP/pkg-$PKGNAM
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -41,14 +50,17 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG 
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -89,16 +101,23 @@ if [ -d $PKG/usr/info ]; then
   gzip -9 $PKG/usr/info/*.info
 fi
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ANNOUNCE AUTHORS COPYING HACKING HISTORY INSTALL NEWS PORTING \
-  README SUPPORT TESTS THANKS USERS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+  ANNOUNCE AUTHORS COPYING* HACKING HISTORY INSTALL NEWS PORTING \
+  README* SUPPORT TESTS THANKS USERS \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/n/rfkill/rfkill.SlackBuild b/source/n/rfkill/rfkill.SlackBuild
new file mode 100755
index 000000000..de337167e
--- /dev/null
+++ b/source/n/rfkill/rfkill.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for rfkill
+
+# Copyright 2010  Ray Gomez <ray.gomez{at}thetravelingcoder{dot}com>
+# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+# 
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+# 
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=rfkill
+VERSION=${VERSION:-0.4}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+make \
+  CFLAGS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  MANDIR=/usr/man || exit 1
+make install \
+  PREFIX=/usr \
+  MANDIR=/usr/man \
+  DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  COPYING* README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/n/rfkill/rfkill.url b/source/n/rfkill/rfkill.url
new file mode 100644
index 000000000..700aef457
--- /dev/null
+++ b/source/n/rfkill/rfkill.url
@@ -0,0 +1,2 @@
+http://linuxwireless.org/en/users/Documentation/rfkill
+http://wireless.kernel.org/download/rfkill/
diff --git a/source/n/rfkill/slack-desc b/source/n/rfkill/slack-desc
new file mode 100644
index 000000000..7055fc3b0
--- /dev/null
+++ b/source/n/rfkill/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+rfkill: rfkill (tool to query subsystem interfaces)
+rfkill:
+rfkill: rfkill is a small tool to query the state of the rfkill switches,
+rfkill: buttons and subsystem interfaces.
+rfkill:
+rfkill: http://linuxwireless.org/en/users/Documentation/rfkill
+rfkill:
+rfkill:
+rfkill:
+rfkill:
+rfkill:
diff --git a/source/n/rp-pppoe/rp-pppoe.SlackBuild b/source/n/rp-pppoe/rp-pppoe.SlackBuild
index 7dfa839c8..40fd4a01b 100755
--- a/source/n/rp-pppoe/rp-pppoe.SlackBuild
+++ b/source/n/rp-pppoe/rp-pppoe.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=3.10
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -32,6 +41,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/n/rsync/rsync.SlackBuild b/source/n/rsync/rsync.SlackBuild
index dadf3cd56..5c48629a5 100755
--- a/source/n/rsync/rsync.SlackBuild
+++ b/source/n/rsync/rsync.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-$(echo rsync-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+PKGNAM=rsync
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -81,7 +82,7 @@ cat rsyncd.conf.5 | gzip -9c > $PKG/usr/man/man5/rsyncd.conf.5.gz
 
 mkdir -p $PKG/usr/doc/rsync-$VERSION/popt
 cp -a \
-  COPYING* INSTALL NEWS README TODO tech_report.tex \
+  COPYING* INSTALL NEWS README* TODO tech_report.tex \
   $PKG/usr/doc/rsync-$VERSION
 ( cd popt
   cp -a CHANGES COPYING README README.rsync $PKG/usr/doc/rsync-$VERSION/popt
diff --git a/source/n/samba/prune-samba.sh b/source/n/samba/prune-samba.sh
new file mode 100755
index 000000000..a6106df33
--- /dev/null
+++ b/source/n/samba/prune-samba.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Copyright 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Pare down the Samba sources to just Samba3 for now, and drop redundant docs.
+# This script expects the samba sources to be unpacked in the current
+# directory.  It will then "pare" them.  You'll be expected to repack them
+# afterwards.
+
+cd samba-?.?.? || cd samba-?.?.?? || exit 1
+
+rm --verbose WHATSNEW4.txt howto-ol-backend-s4.txt howto4.txt prog_guide4.txt 
+rm -r --verbose docs-xml packaging4 source4 swat2*
+rm --verbose docs/*.pdf
+
diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild
index cf3918a19..b7cbeefdd 100755
--- a/source/n/samba/samba.SlackBuild
+++ b/source/n/samba/samba.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-$(echo samba-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo samba-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -42,7 +42,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf samba-$VERSION
-tar xvf $CWD/samba-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/samba-$VERSION.tar.xz || exit 1
 cd samba-$VERSION || exit 1
 
 if [ ! -d source3/lib/cmdline ]; then
@@ -69,6 +69,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 # Some of these options could be auto-detected, but declaring them
@@ -93,6 +96,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-swatdir=/usr/share/swat \
   --with-logfilebase=/var/log/samba \
   --enable-cups \
+  --enable-external-libtalloc=no \
   --enable-static=no \
   --enable-shared=yes \
   --with-acl-support=yes \
@@ -133,6 +137,12 @@ cp -a ../nsswitch/libnss_wins.so $PKG/lib${LIBDIRSUFFIX}/libnss_wins.so.2
   ln -sf libnss_wins.so.2 libnss_wins.so
 )
 
+# Install a pkgconfig file for libtalloc:
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+if [ ! -r $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/talloc.pc ]; then
+  cat $CWD/talloc.pc | sed -e "s/\/lib/\/lib${LIBDIRSUFFIX}/" > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/talloc.pc
+fi
+
 ## Make sure that other programs can link against libsmbclient:
 #( cd $PKG/usr/lib${LIBDIRSUFFIX}
 #  for FILE in samba/libsmbclient.so* ; do
diff --git a/source/n/samba/slack-desc b/source/n/samba/slack-desc
index dc42f2b6f..c06b485d9 100644
--- a/source/n/samba/slack-desc
+++ b/source/n/samba/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-samba: samba (SMB file and print server)
+samba: samba (SMB/CIFS file and print server)
 samba:
-samba: Samba is an SMB file and print server for SMB and CIFS clients.  It
-samba: allows you to make file space or printers on a Samba host available to
-samba: any PCs running SMB clients (such as PCs running Windows).
+samba: Samba is an SMB/CIFS file and print server for SMB and CIFS clients.
+samba: It allows you to make file space or printers on a Samba host
+samba: available to SMB/CIFS clients (such as PCs running Windows).
 samba:
-samba: If you have any SMB servers (such as Windows NT/2K Server), you may be
-samba: able to replace them by or supplement them with Samba. One of Samba's
-samba: big strengths is integration, so you can use it to tie together your
-samba: Linux hosts and Windows PC clients.
+samba: If you have any Windows file servers, you may be able to replace them
+samba: or supplement them with Samba.  One of Samba's big strengths is
+samba: integration, so you can use it to tie together your Linux hosts and
+samba: Windows PC clients.
 samba:
diff --git a/source/n/samba/talloc.pc b/source/n/samba/talloc.pc
new file mode 100644
index 000000000..7a23835ce
--- /dev/null
+++ b/source/n/samba/talloc.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: talloc 
+Description: A hierarchical pool based memory system with destructors
+Version: 2.0.1
+Libs: -L${libdir} -ltalloc
+Cflags: -I${includedir} 
+URL: http://talloc.samba.org/
diff --git a/source/n/tcp_wrappers/tcp_wrappers.SlackBuild b/source/n/tcp_wrappers/tcp_wrappers.SlackBuild
index a8cfbdcb9..7f9ad0d48 100755
--- a/source/n/tcp_wrappers/tcp_wrappers.SlackBuild
+++ b/source/n/tcp_wrappers/tcp_wrappers.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=7.6
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "x86_64" ]; then
diff --git a/source/n/tcpdump/libpcap.20-fix-any-intf.diff b/source/n/tcpdump/libpcap.20-fix-any-intf.diff
deleted file mode 100644
index 84afa6822..000000000
--- a/source/n/tcpdump/libpcap.20-fix-any-intf.diff
+++ /dev/null
@@ -1,159 +0,0 @@
-commit 8fa17a5a554aaeb85d3ec4118b45a31f1efd6808
-Author: guy <guy>
-Date:   Wed Nov 19 08:20:39 2008 +0000
-
-    Fix the handling of the "any" device, including making it reject
-    attempts to open it in monitor mode.
----
- pcap-linux.c |   68 ++++++++++++++++++++++++++++++++++++-----------------------
- 1 file changed, 42 insertions(+), 26 deletions(-)
-
---- a/pcap-linux.c
-+++ b/pcap-linux.c
-@@ -297,6 +297,12 @@
- {
- 	pcap_t *handle;
- 
-+	/*
-+	 * A null device name is equivalent to the "any" device.
-+	 */
-+	if (device == NULL)
-+		device = "any";
-+
- #ifdef HAVE_DAG_API
- 	if (strstr(device, "dag")) {
- 		return dag_create(device, ebuf);
-@@ -338,10 +344,9 @@
- 	struct iwreq ireq;
- #endif
- 
--	if (p->opt.source == NULL) {
-+	if (strcmp(p->opt.source, "any") == 0) {
- 		/*
--		 * This is equivalent to the "any" device, and we don't
--		 * support monitor mode on it.
-+		 * Monitor mode makes no sense on the "any" device.
- 		 */
- 		return 0;
- 	}
-@@ -518,12 +523,11 @@
- 	handle->stats_op = pcap_stats_linux;
- 
- 	/*
--	 * NULL and "any" are special devices which give us the hint to
--	 * monitor all devices.
-+	 * The "any" device is a special device which causes us not
-+	 * to bind to a particular device and thus to look at all
-+	 * devices.
- 	 */
--	if (!device || strcmp(device, "any") == 0) {
--		device			= NULL;
--		handle->md.device	= strdup("any");
-+	if (strcmp(device, "any") == 0) {
- 		if (handle->opt.promisc) {
- 			handle->opt.promisc = 0;
- 			/* Just a warning. */
-@@ -531,10 +535,9 @@
- 			    "Promiscuous mode not supported on the \"any\" device");
- 			status = PCAP_WARNING_PROMISC_NOTSUP;
- 		}
-+	}
- 
--	} else
--		handle->md.device	= strdup(device);
--
-+	handle->md.device	= strdup(device);
- 	if (handle->md.device == NULL) {
- 		snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "strdup: %s",
- 			 pcap_strerror(errno) );
-@@ -1657,19 +1660,21 @@
- activate_new(pcap_t *handle)
- {
- #ifdef HAVE_PF_PACKET_SOCKETS
-+	const char		*device = handle->opt.source;
-+	int			is_any_device = (strcmp(device, "any") == 0);
- 	int			sock_fd = -1, arptype, val;
- 	int			err = 0;
- 	struct packet_mreq	mr;
--	const char* device = handle->opt.source;
- 
- 	/*
--	 * Open a socket with protocol family packet. If a device is
--	 * given we try to open it in raw mode otherwise we use
--	 * the cooked interface.
--	 */
--	sock_fd = device ?
--		socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))
--	      : socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL));
-+	 * Open a socket with protocol family packet. If the
-+	 * "any" device was specified, we open a SOCK_DGRAM
-+	 * socket for the cooked interface, otherwise we first
-+	 * try a SOCK_RAW socket for the raw interface.
-+	 */
-+	sock_fd = is_any_device ?
-+		socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)) :
-+		socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
- 
- 	if (sock_fd == -1) {
- 		snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s",
-@@ -1704,7 +1709,7 @@
- 	 * to cooked mode if we have an unknown interface type
- 	 * or a type we know doesn't work well in raw mode.
- 	 */
--	if (device) {
-+	if (!is_any_device) {
- 		/* Assume for now we don't need cooked mode. */
- 		handle->md.cooked = 0;
- 
-@@ -1819,15 +1824,23 @@
- 		}
- 	} else {
- 		/*
--		 * This is cooked mode.
-+		 * The "any" device.
-+		 */
-+		if (handle->opt.rfmon) {
-+			/*
-+			 * It doesn't support monitor mode.
-+			 */
-+			return PCAP_ERROR_RFMON_NOTSUP;
-+		}
-+
-+		/*
-+		 * It uses cooked mode.
- 		 */
- 		handle->md.cooked = 1;
- 		handle->linktype = DLT_LINUX_SLL;
- 
- 		/*
- 		 * We're not bound to a device.
--		 * XXX - true?  Or true only if we're using
--		 * the "any" device?
- 		 * For now, we're using this as an indication
- 		 * that we can't transmit; stop doing that only
- 		 * if we figure out how to transmit in cooked
-@@ -1852,10 +1865,13 @@
- 
- 	/*
- 	 * Hmm, how can we set promiscuous mode on all interfaces?
--	 * I am not sure if that is possible at all.
-+	 * I am not sure if that is possible at all.  For now, we
-+	 * silently ignore attempts to turn promiscuous mode on
-+	 * for the "any" device (so you don't have to explicitly
-+	 * disable it in programs such as tcpdump).
- 	 */
- 
--	if (device && handle->opt.promisc) {
-+	if (!is_any_device && handle->opt.promisc) {
- 		memset(&mr, 0, sizeof(mr));
- 		mr.mr_ifindex = handle->md.ifindex;
- 		mr.mr_type    = PACKET_MR_PROMISC;
-@@ -3118,7 +3134,7 @@
- 
- 	/* Bind to the given device */
- 
--	if (!device) {
-+	if (strcmp(device, "any") == 0) {
- 		strncpy(handle->errbuf, "pcap_activate: The \"any\" device isn't supported on 2.0[.x]-kernel systems",
- 			PCAP_ERRBUF_SIZE);
- 		return PCAP_ERROR;
diff --git a/source/n/tcpdump/slack-desc b/source/n/tcpdump/slack-desc
index 47bab9e71..1adda180e 100644
--- a/source/n/tcpdump/slack-desc
+++ b/source/n/tcpdump/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-tcpdump: tcpdump (network monitor)
+tcpdump: tcpdump (network monitoring tool)
 tcpdump:
 tcpdump: Tcpdump is a tool for network monitoring and data acquisition.  You
 tcpdump: can use it to dump information on all the packets on a network that
 tcpdump: match a boolean expression.  Tcpdump uses libpcap, a system
 tcpdump: independent interface for user-level packet capture.
 tcpdump:
-tcpdump:
+tcpdump: Project homepage:          http://sourceforge.net/projects/tcpdump/
 tcpdump:
 tcpdump:
 tcpdump:
diff --git a/source/n/tcpdump/tcpdump.SlackBuild b/source/n/tcpdump/tcpdump.SlackBuild
index 15715c567..1ff4795f3 100755
--- a/source/n/tcpdump/tcpdump.SlackBuild
+++ b/source/n/tcpdump/tcpdump.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=4.0.0
-LIBVER=1.0.0
-BUILD=${BUILD:-2}
+PKGNAM=tcpdump
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -49,50 +49,6 @@ PKG=$TMP/package-tcpdump
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-echo "+================+"
-echo "| libpcap-$LIBVER |"
-echo "+================+"
-cd $TMP
-rm -rf libpcap-$LIBVER
-tar xvf $CWD/libpcap-$LIBVER.tar.gz || exit 1
-cd libpcap-$LIBVER || exit 1
-
-zcat $CWD/libpcap.20-fix-any-intf.diff.gz | patch -p1 --verbose || exit 1
-
-find . -type d -name CVS -depth -exec rm -rf {} \;
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-CFLAGS="$(getconf LFS_CFLAGS)" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/libpcap-$LIBVER \
-  --enable-ipv6 \
-  --build=$ARCH-slackware-linux
-make $NUMJOBS || make || exit 1
-make shared $NUMJOBS || make || exit 1
-mkdir -p $PKG/usr/bin  # otherwise it errors out on install
-make install DESTDIR=$PKG || exit 1
-strip --strip-debug libpcap.so.1.?.?
-cp libpcap.so.?.?.? $PKG/usr/lib${LIBDIRSUFFIX}
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -sf libpcap.so.1.?.? libpcap.so.1
-  ln -sf libpcap.so.1 libpcap.so.0
-  ln -sf libpcap.so.1 libpcap.so
-)
-mkdir -p $PKG/usr/doc/libpcap-$LIBVER
-cp -a \
-  CHANGES CREDITS FILES INSTALL.txt LICENSE README README.linux TODO VERSION \
-  $PKG/usr/doc/libpcap-$LIBVER
-
-echo "+================+"
-echo "| tcpdump-$VERSION |"
-echo "+================+"
 cd $TMP
 rm -rf tcpdump-$VERSION
 tar xvf $CWD/tcpdump-$VERSION.tar.gz || exit 1
@@ -104,6 +60,7 @@ find . \
   -exec chmod 755 {} \; -o \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
+
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -113,14 +70,16 @@ find . \
   --build=$ARCH-slackware-linux
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
+
 # Strange, two identical files:
 ( cd $PKG/usr/sbin
   rm -f tcpdump
   ln -s tcpdump.$VERSION tcpdump
 ) || exit 1
+
 mkdir -p $PKG/usr/doc/tcpdump-$VERSION
 cp -a \
-  CHANGES FILES INSTALL README \
+  CHANGES CREDITS FILES INSTALL.txt LICENSE README* VERSION \
   $PKG/usr/doc/tcpdump-$VERSION
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
diff --git a/source/n/telnet/telnet.SlackBuild b/source/n/telnet/telnet.SlackBuild
index e1b182a27..d52349300 100755
--- a/source/n/telnet/telnet.SlackBuild
+++ b/source/n/telnet/telnet.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=0.17
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-telnet
diff --git a/source/n/tin/tin-1.8.2.tar.bz2.sign b/source/n/tin/tin-1.8.2.tar.bz2.sign
deleted file mode 100644
index 29db525d8..000000000
--- a/source/n/tin/tin-1.8.2.tar.bz2.sign
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PGP MESSAGE-----
-Version: 2.6.3ia
-
-iQCVAwUARE4WY1pJVQ60kLTRAQFBSwQA1TZP/EcytcgrNvOmpsRqmOX/LBL7Pqt8
-8aviolzsXypalr71LmTZRK1y9TtrGNioHde1B7MEYCTWsoUV4t6r87RdSE2dgU+E
-/ieaHvTFOUK9vy8C3VmjvCm8rJGPNAnz7Pbh6xtpAmUIY9jKuPZ0et576gw4Fl1T
-YoyxRSmzb2E=
-=H2kb
------END PGP MESSAGE-----
diff --git a/source/n/tin/tin-1.8.3.tar.bz2.sign b/source/n/tin/tin-1.8.3.tar.bz2.sign
new file mode 100644
index 000000000..455fe0c82
--- /dev/null
+++ b/source/n/tin/tin-1.8.3.tar.bz2.sign
@@ -0,0 +1,9 @@
+-----BEGIN PGP MESSAGE-----
+Version: 2.6.3ia
+
+iQCVAwUARcHorlpJVQ60kLTRAQEqmwQA1i62sO941RPciwqfBIZiKbsoAUl/h/Mm
+WXSKPi+S6KzYEeHk7yOwCY+EP+2adL2eYGVTVZeWoT16YmlHGzYw8wsH2zUuDF4M
+sH6z2MyWv8IL5/ELlHnvg710SlkQQmJFHSxcXhiA2i0E7mKeJ1ozFmrwqo88kt4Y
+8S8uupIHbnE=
+=hwqI
+-----END PGP MESSAGE-----
diff --git a/source/n/tin/tin.SlackBuild b/source/n/tin/tin.SlackBuild
index 1339dc37b..a344150df 100755
--- a/source/n/tin/tin.SlackBuild
+++ b/source/n/tin/tin.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.8.2
-ARCH=${ARCH:-x86_64}
+PKGNAM=tin
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-tin
@@ -49,7 +59,7 @@ find . \
   --with-ispell=/usr/bin/ispell \
   --with-defaults-dir=/etc/tin \
   --with-libdir=/var/lib/news \
-  --with-ncurses
+  --with-screen=ncursesw
 make clean
 make build || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/source/n/trn/trn.SlackBuild b/source/n/trn/trn.SlackBuild
index ed9b3146d..4857e5141 100755
--- a/source/n/trn/trn.SlackBuild
+++ b/source/n/trn/trn.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=3.6
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-trn
diff --git a/source/n/uucp/uucp.SlackBuild b/source/n/uucp/uucp.SlackBuild
index 431bfd12b..c45109d64 100755
--- a/source/n/uucp/uucp.SlackBuild
+++ b/source/n/uucp/uucp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,15 +21,26 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.07
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
diff --git a/source/n/vlan/vlan.SlackBuild b/source/n/vlan/vlan.SlackBuild
index 1b1064a86..63f4d53f4 100755
--- a/source/n/vlan/vlan.SlackBuild
+++ b/source/n/vlan/vlan.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.9
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-vlan
diff --git a/source/n/vsftpd/vsftpd.SlackBuild b/source/n/vsftpd/vsftpd.SlackBuild
index 06b56763d..93582dbb9 100755
--- a/source/n/vsftpd/vsftpd.SlackBuild
+++ b/source/n/vsftpd/vsftpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +20,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-$(echo vsftpd-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+PKGNAM=vsftpd
+VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
diff --git a/source/n/whois/whois.SlackBuild b/source/n/whois/whois.SlackBuild
index 589b57dbd..4b024015e 100755
--- a/source/n/whois/whois.SlackBuild
+++ b/source/n/whois/whois.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -50,7 +50,7 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-make || exit
+make HAVE_LIBIDN=y || exit
 make install install-pos BASEDIR=$PKG || exit 1
 
 mv $PKG/usr/share/man $PKG/usr
@@ -61,7 +61,7 @@ find $PKG -iname "mkpasswd*" -exec rm -f {} \;
 
 mkdir -p $PKG/usr/doc/whois-$VERSION
 cp -a \
-  COPYING README \
+  COPYING* README* \
   $PKG/usr/doc/whois-$VERSION
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/source/n/wpa_supplicant/fi.epitest.hostap.WPASupplicant.service b/source/n/wpa_supplicant/fi.epitest.hostap.WPASupplicant.service
new file mode 100644
index 000000000..e8b4250b4
--- /dev/null
+++ b/source/n/wpa_supplicant/fi.epitest.hostap.WPASupplicant.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=fi.epitest.hostap.WPASupplicant
+Exec=/usr/sbin/wpa_supplicant -u
+User=root
diff --git a/source/n/wpa_supplicant/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch b/source/n/wpa_supplicant/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch
new file mode 100644
index 000000000..4c5002003
--- /dev/null
+++ b/source/n/wpa_supplicant/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch
@@ -0,0 +1,61 @@
+From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Fri, 17 Dec 2010 15:56:01 +0200
+Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes
+
+The supplicant was not emitting property changed events when the BSSs
+property changed.
+
+Signed-off-by: Dan Williams <dcbw@redhat.com>
+(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72)
+---
+ wpa_supplicant/dbus/dbus_new.c |    6 ++++++
+ wpa_supplicant/dbus/dbus_new.h |    1 +
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
+index bdfbbac..c66640a 100644
+--- a/wpa_supplicant/dbus/dbus_new.c
++++ b/wpa_supplicant/dbus/dbus_new.c
+@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
+ 			wpas_dbus_getter_current_network;
+ 		prop = "CurrentNetwork";
+ 		break;
++	case WPAS_DBUS_PROP_BSSS:
++		getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
++		prop = "BSSs";
++		break;
+ 	default:
+ 		wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
+ 			   __func__, property);
+@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
+ 	}
+ 
+ 	wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
++	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+ 
+ 	return 0;
+ }
+@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
+ 	}
+ 
+ 	wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
++	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+ 
+ 	return 0;
+ 
+diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
+index 80ea98c..9cdefcb 100644
+--- a/wpa_supplicant/dbus/dbus_new.h
++++ b/wpa_supplicant/dbus/dbus_new.h
+@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
+ 	WPAS_DBUS_PROP_STATE,
+ 	WPAS_DBUS_PROP_CURRENT_BSS,
+ 	WPAS_DBUS_PROP_CURRENT_NETWORK,
++	WPAS_DBUS_PROP_BSSS,
+ };
+ 
+ enum wpas_dbus_bss_prop {
+-- 
+1.7.4-rc1
+
diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
index b3acc5834..8bbf01db6 100755
--- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
+++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
@@ -23,7 +23,7 @@
 
 PKGNAM=wpa_supplicant
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -95,6 +95,8 @@ find . \
 #  "s/^#define VERSION_STR \"\(.*\)\"/#define VERSION_STR \"\1_$VERSION\"/" \
 #  src/common/version.h
 
+zcat $CWD/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch.gz | patch -p1 --verbose || exit 1
+
 # The source code has been re-organized:
 cd wpa_supplicant
 
@@ -146,8 +148,16 @@ cp wpa_gui-qt4/wpa_gui $PKG/usr/bin/
 
 # Install dbus configuration file:
 mkdir -p $PKG/etc/dbus-1/system.d/
-cp dbus-wpa_supplicant.conf \
-  $PKG/etc/dbus-1/system.d/dbus-wpa_supplicant.conf.new
+cp dbus/dbus-wpa_supplicant.conf \
+  $PKG/etc/dbus-1/system.d/dbus-wpa_supplicant.conf
+
+# This file should actually be shipped with Slackware's wpa_supplicant
+# package, but since we missed it there (just kidding), we'll do it here:
+mkdir -p $PKG/usr/share/dbus-1/system-services
+install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} \
+  $PKG/usr/share/dbus-1/system-services/
+sed -e 's#Exec=/sbin/wpa_supplicant#Exec=/usr/sbin/wpa_supplicant#g' \
+  -i $PKG/usr/share/dbus-1/system-services/*.service
 
 # Install a .desktop file for wpa_gui:
 mkdir -p $PKG/usr/share/applications
@@ -226,7 +236,6 @@ config() {
   done
 }
 config etc/wpa_supplicant.conf.new
-config etc/dbus-1/system.d/dbus-wpa_supplicant.conf.new
 
 EOINS
 
diff --git a/source/n/wpa_supplicant/wpa_supplicant.defconfig b/source/n/wpa_supplicant/wpa_supplicant.defconfig
index 4241be9f7..2c530fdc2 100644
--- a/source/n/wpa_supplicant/wpa_supplicant.defconfig
+++ b/source/n/wpa_supplicant/wpa_supplicant.defconfig
@@ -23,3 +23,5 @@ CONFIG_READLINE=y
 CONFIG_BACKEND=file
 CONFIG_PEERKEY=y
 CONFIG_CTRL_IFACE_DBUS=y
+CONFIG_CTRL_IFACE_DBUS_NEW=y
+CONFIG_CTRL_IFACE_DBUS_INTRO=y
diff --git a/source/n/yptools/ypbind-mt-1.31.tar.bz2.sign b/source/n/yptools/ypbind-mt-1.31.tar.bz2.sign
deleted file mode 100644
index 1e40e59de..000000000
--- a/source/n/yptools/ypbind-mt-1.31.tar.bz2.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD4DBQBLE+GAyGugalF9Dw4RAtllAJdwcdicAyMwnl/BtkHP+DnYseD9AJ4vS2ly
-HHNnyMFZ2A0tun7/Lt7Psw==
-=ob7L
------END PGP SIGNATURE-----
diff --git a/source/n/yptools/ypbind-mt-1.32.tar.sign b/source/n/yptools/ypbind-mt-1.32.tar.sign
new file mode 100644
index 000000000..4db7167ee
--- /dev/null
+++ b/source/n/yptools/ypbind-mt-1.32.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBMNHqQyGugalF9Dw4RAiHyAKCMjVXlCljwufPauK/O88jDzHZzsQCePyhN
+lqHDK8Fw5zaXPE4744ydtXY=
+=JpZO
+-----END PGP SIGNATURE-----
diff --git a/source/n/yptools/ypserv-2.23.tar.bz2.sign b/source/n/yptools/ypserv-2.23.tar.bz2.sign
deleted file mode 100644
index 9687e760a..000000000
--- a/source/n/yptools/ypserv-2.23.tar.bz2.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBLg+CRyGugalF9Dw4RAlGVAJ0Sokt5e5bQg6J8Hq4zUyrTY8g2kQCfaNyD
-sBJmO9Igqzku/yLWqtU2WKw=
-=dTwr
------END PGP SIGNATURE-----
diff --git a/source/n/yptools/ypserv-2.24.tar.sign b/source/n/yptools/ypserv-2.24.tar.sign
new file mode 100644
index 000000000..061f09789
--- /dev/null
+++ b/source/n/yptools/ypserv-2.24.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBMnHqzyGugalF9Dw4RAtUtAJ4gowJGR0cUlcNEhtLR1EOs6BDvcgCfRu0r
+yTGYZzi5YnUQctBC1d9qgs0=
+=r3GH
+-----END PGP SIGNATURE-----
diff --git a/source/n/yptools/yptools.SlackBuild b/source/n/yptools/yptools.SlackBuild
index 3c98a8e3a..6a213b2a6 100755
--- a/source/n/yptools/yptools.SlackBuild
+++ b/source/n/yptools/yptools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,12 @@
 
 # Package version number:
 VERSION=2.12
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 YPTOOLS=$VERSION
-YPBINDMT=1.31
+YPBINDMT=1.32
 #YPMAKE=0.11
-YPSERV=2.23
+YPSERV=2.24
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/ytalk/ytalk.SlackBuild b/source/n/ytalk/ytalk.SlackBuild
index 07c147b04..c50917e36 100755
--- a/source/n/ytalk/ytalk.SlackBuild
+++ b/source/n/ytalk/ytalk.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-3.3.0}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -32,6 +41,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
@@ -68,7 +79,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/ytalk-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL README \
+  AUTHORS COPYING* ChangeLog INSTALL README* \
   $PKG/usr/doc/ytalk-$VERSION
 
 gzip -9 $PKG/usr/man/man?/*.?